tianzeOrg
/
tianze-pro
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复章节练习题目同步错误的问题

Browse Source
beetlsql3-dev
yaodan 2 years ago
parent 486b313958
commit 352be4edb1
4 changed files with 148 additions and 129 deletions
Show Stats Download Patch File Download Diff File

8
web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseQuestionSetting.java
Unescape Escape View File

@ -181,9 +181,9 @@ public class TeacherOpenCourseQuestionSetting extends BaseEntity {
) )
private Integer questionCount; private Integer questionCount;
@UpdateIgnore //@UpdateIgnore
@InsertIgnore //@InsertIgnore
@FetchSql("select count(1) from teacher_open_course_merge_resources_question t where t.teacher_open_course_merge_course_info_id = #teacherOpenCourseMergeCourseInfoId# and t.question_status = 1") //@FetchSql("select count(1) from teacher_open_course_merge_resources_question t where t.teacher_open_course_merge_course_info_id = #teacherOpenCourseMergeCourseInfoId# and t.question_status = 1")
private Integer allQuestionCount; //private Integer allQuestionCount;
} }

256
web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeResourcesInfoService.java
Unescape Escape View File

@ -63,43 +63,45 @@ import static org.apache.commons.lang3.StringUtils.join;
@Slf4j @Slf4j
public class TeacherOpenCourseMergeResourcesInfoService extends CoreBaseService<TeacherOpenCourseMergeResourcesInfo> implements DeleteResourcesBy { public class TeacherOpenCourseMergeResourcesInfoService extends CoreBaseService<TeacherOpenCourseMergeResourcesInfo> implements DeleteResourcesBy {
@Autowired private TeacherOpenCourseMergeResourcesInfoDao teacherOpenCourseMergeResourcesInfoDao; @Autowired
private TeacherOpenCourseMergeResourcesInfoDao teacherOpenCourseMergeResourcesInfoDao;
@Autowired @Autowired
private ResourcesInfoService resourcesInfoService; private ResourcesInfoService resourcesInfoService;
@Autowired @Autowired
private TeacherOpenCourseMergeCourseInfoService teacherOpenCourseMergeCourseInfoService; private TeacherOpenCourseMergeCourseInfoService teacherOpenCourseMergeCourseInfoService;
public PageQuery<TeacherOpenCourseMergeResourcesInfo>queryByCondition(PageQuery query){ public PageQuery<TeacherOpenCourseMergeResourcesInfo> queryByCondition(PageQuery query) {
PageQuery ret = teacherOpenCourseMergeResourcesInfoDao.queryByCondition(query); PageQuery ret = teacherOpenCourseMergeResourcesInfoDao.queryByCondition(query);
queryListAfter(ret.getList()); queryListAfter(ret.getList());
return ret; return ret;
} }
public PageQuery<TeacherOpenCourseMergeResourcesInfo>queryByConditionQuery(PageQuery query){ public PageQuery<TeacherOpenCourseMergeResourcesInfo> queryByConditionQuery(PageQuery query) {
PageQuery ret = teacherOpenCourseMergeResourcesInfoDao.queryByConditionQuery(query); PageQuery ret = teacherOpenCourseMergeResourcesInfoDao.queryByConditionQuery(query);
queryListAfter(ret.getList()); queryListAfter(ret.getList());
return ret; return ret;
} }
public void deleteByList(List list){ public void deleteByList(List list) {
String ids = ""; String ids = "";
ToolUtils.deleteNullList(list); ToolUtils.deleteNullList(list);
for(int i=0;null != list && i<list.size();i++){ for (int i = 0; null != list && i < list.size(); i++) {
ids += list.get(i).toString()+(i==list.size()-1?"":","); ids += list.get(i).toString() + (i == list.size() - 1 ? "" : ",");
} }
if(StringUtils.isNotBlank(ids)){ if (StringUtils.isNotBlank(ids)) {
teacherOpenCourseMergeResourcesInfoDao.deleteTeacherOpenCourseMergeResourcesInfoByIds(ids); teacherOpenCourseMergeResourcesInfoDao.deleteTeacherOpenCourseMergeResourcesInfoByIds(ids);
} }
} }
public void deleteTeacherOpenCourseMergeResourcesInfo(String ids){ public void deleteTeacherOpenCourseMergeResourcesInfo(String ids) {
try { try {
teacherOpenCourseMergeResourcesInfoDao.deleteTeacherOpenCourseMergeResourcesInfoByIds(ids); teacherOpenCourseMergeResourcesInfoDao.deleteTeacherOpenCourseMergeResourcesInfoByIds(ids);
} catch (Exception e) { } catch (Exception e) {
throw new PlatformException("批量删除开课资源拉取失败", e); throw new PlatformException("批量删除开课资源拉取失败", e);
} }
} }
public void logicDeleteTeacherOpenCourseMergeResourcesInfo(String ids){
public void logicDeleteTeacherOpenCourseMergeResourcesInfo(String ids) {
try { try {
teacherOpenCourseMergeResourcesInfoDao.logicDeleteTeacherOpenCourseMergeResourcesInfo(ids); teacherOpenCourseMergeResourcesInfoDao.logicDeleteTeacherOpenCourseMergeResourcesInfo(ids);
} catch (Exception e) { } catch (Exception e) {
@ -107,7 +109,7 @@ public class TeacherOpenCourseMergeResourcesInfoService extends CoreBaseService<
} }
} }
public String addAll(TeacherOpenCourseMergeResourcesInfoQuery teacherOpenCourseMergeResourcesInfoQuery){ public String addAll(TeacherOpenCourseMergeResourcesInfoQuery teacherOpenCourseMergeResourcesInfoQuery) {
String msg = ""; String msg = "";
List<TeacherOpenCourseMergeResourcesInfo> teacherOpenCourseMergeResourcesInfoList = new ArrayList<>(); List<TeacherOpenCourseMergeResourcesInfo> teacherOpenCourseMergeResourcesInfoList = new ArrayList<>();
try { try {
@ -115,11 +117,12 @@ public class TeacherOpenCourseMergeResourcesInfoService extends CoreBaseService<
} catch (Exception e) { } catch (Exception e) {
try { try {
teacherOpenCourseMergeResourcesInfoList.add(JSONObject.parseObject(teacherOpenCourseMergeResourcesInfoQuery.getTeacherOpenCourseMergeResourcesInfoJsonStr(), TeacherOpenCourseMergeResourcesInfo.class)); teacherOpenCourseMergeResourcesInfoList.add(JSONObject.parseObject(teacherOpenCourseMergeResourcesInfoQuery.getTeacherOpenCourseMergeResourcesInfoJsonStr(), TeacherOpenCourseMergeResourcesInfo.class));
} catch (Exception e1) {} } catch (Exception e1) {
}
} }
ToolUtils.deleteNullList(teacherOpenCourseMergeResourcesInfoList); ToolUtils.deleteNullList(teacherOpenCourseMergeResourcesInfoList);
if(null != teacherOpenCourseMergeResourcesInfoList && teacherOpenCourseMergeResourcesInfoList.size()>0){ if (null != teacherOpenCourseMergeResourcesInfoList && teacherOpenCourseMergeResourcesInfoList.size() > 0) {
for(int i=0;i<teacherOpenCourseMergeResourcesInfoList.size();i++){ for (int i = 0; i < teacherOpenCourseMergeResourcesInfoList.size(); i++) {
TeacherOpenCourseMergeResourcesInfo teacherOpenCourseMergeResourcesInfo = teacherOpenCourseMergeResourcesInfoList.get(i); TeacherOpenCourseMergeResourcesInfo teacherOpenCourseMergeResourcesInfo = teacherOpenCourseMergeResourcesInfoList.get(i);
teacherOpenCourseMergeResourcesInfo.setUserId(teacherOpenCourseMergeResourcesInfoQuery.getUserId()); teacherOpenCourseMergeResourcesInfo.setUserId(teacherOpenCourseMergeResourcesInfoQuery.getUserId());
teacherOpenCourseMergeResourcesInfo.setOrgId(teacherOpenCourseMergeResourcesInfoQuery.getOrgId()); teacherOpenCourseMergeResourcesInfo.setOrgId(teacherOpenCourseMergeResourcesInfoQuery.getOrgId());
@ -129,7 +132,7 @@ public class TeacherOpenCourseMergeResourcesInfoService extends CoreBaseService<
return msg; return msg;
} }
public JsonResult add(TeacherOpenCourseMergeResourcesInfoQuery teacherOpenCourseMergeResourcesInfoQuery){ public JsonResult add(TeacherOpenCourseMergeResourcesInfoQuery teacherOpenCourseMergeResourcesInfoQuery) {
String msg = ""; String msg = "";
TeacherOpenCourseMergeResourcesInfo teacherOpenCourseMergeResourcesInfo = teacherOpenCourseMergeResourcesInfoQuery.pojo(); TeacherOpenCourseMergeResourcesInfo teacherOpenCourseMergeResourcesInfo = teacherOpenCourseMergeResourcesInfoQuery.pojo();
@ -151,7 +154,7 @@ public class TeacherOpenCourseMergeResourcesInfoService extends CoreBaseService<
return jsonResult; return jsonResult;
} }
public String edit(TeacherOpenCourseMergeResourcesInfoQuery teacherOpenCourseMergeResourcesInfoQuery){ public String edit(TeacherOpenCourseMergeResourcesInfoQuery teacherOpenCourseMergeResourcesInfoQuery) {
String msg = ""; String msg = "";
TeacherOpenCourseMergeResourcesInfo teacherOpenCourseMergeResourcesInfo = teacherOpenCourseMergeResourcesInfoQuery.pojo(); TeacherOpenCourseMergeResourcesInfo teacherOpenCourseMergeResourcesInfo = teacherOpenCourseMergeResourcesInfoQuery.pojo();
teacherOpenCourseMergeResourcesInfoDao.updateTemplateById(teacherOpenCourseMergeResourcesInfo); teacherOpenCourseMergeResourcesInfoDao.updateTemplateById(teacherOpenCourseMergeResourcesInfo);
@ -161,69 +164,69 @@ public class TeacherOpenCourseMergeResourcesInfoService extends CoreBaseService<
return msg; return msg;
} }
public String updateGivenByIds(TeacherOpenCourseMergeResourcesInfoQuery teacherOpenCourseMergeResourcesInfoQuery){ public String updateGivenByIds(TeacherOpenCourseMergeResourcesInfoQuery teacherOpenCourseMergeResourcesInfoQuery) {
String msg = ""; String msg = "";
if(StringUtils.isNotBlank(teacherOpenCourseMergeResourcesInfoQuery.get_given())){ if (StringUtils.isNotBlank(teacherOpenCourseMergeResourcesInfoQuery.get_given())) {
boolean flag = teacherOpenCourseMergeResourcesInfoDao.updateGivenByIds(teacherOpenCourseMergeResourcesInfoQuery) > 0; boolean flag = teacherOpenCourseMergeResourcesInfoDao.updateGivenByIds(teacherOpenCourseMergeResourcesInfoQuery) > 0;
if(!flag){ if (!flag) {
msg = "更新指定参数失败"; msg = "更新指定参数失败";
} }
}else{ } else {
msg = "指定参数为空"; msg = "指定参数为空";
} }
return msg; return msg;
} }
public List<TeacherOpenCourseMergeResourcesInfo> getValues (Object paras){ public List<TeacherOpenCourseMergeResourcesInfo> getValues(Object paras) {
return sqlManager.select(SqlId.of("jlw.teacherOpenCourseMergeResourcesInfo.getTeacherOpenCourseMergeResourcesInfoValues"), TeacherOpenCourseMergeResourcesInfo.class, paras); return sqlManager.select(SqlId.of("jlw.teacherOpenCourseMergeResourcesInfo.getTeacherOpenCourseMergeResourcesInfoValues"), TeacherOpenCourseMergeResourcesInfo.class, paras);
} }
public List<TeacherOpenCourseMergeResourcesInfo> getValuesByQuery (TeacherOpenCourseMergeResourcesInfoQuery teacherOpenCourseMergeResourcesInfoQuery){ public List<TeacherOpenCourseMergeResourcesInfo> getValuesByQuery(TeacherOpenCourseMergeResourcesInfoQuery teacherOpenCourseMergeResourcesInfoQuery) {
return teacherOpenCourseMergeResourcesInfoDao.getValuesByQuery(teacherOpenCourseMergeResourcesInfoQuery); return teacherOpenCourseMergeResourcesInfoDao.getValuesByQuery(teacherOpenCourseMergeResourcesInfoQuery);
} }
public List<TeacherOpenCourseMergeResourcesInfo> getValuesByQueryNotWithPermission (TeacherOpenCourseMergeResourcesInfoQuery teacherOpenCourseMergeResourcesInfoQuery){ public List<TeacherOpenCourseMergeResourcesInfo> getValuesByQueryNotWithPermission(TeacherOpenCourseMergeResourcesInfoQuery teacherOpenCourseMergeResourcesInfoQuery) {
return teacherOpenCourseMergeResourcesInfoDao.getValuesByQueryNotWithPermission(teacherOpenCourseMergeResourcesInfoQuery); return teacherOpenCourseMergeResourcesInfoDao.getValuesByQueryNotWithPermission(teacherOpenCourseMergeResourcesInfoQuery);
} }
public TeacherOpenCourseMergeResourcesInfo getInfo (Long teacherOpenCourseMergeResourcesInfoId){ public TeacherOpenCourseMergeResourcesInfo getInfo(Long teacherOpenCourseMergeResourcesInfoId) {
TeacherOpenCourseMergeResourcesInfoQuery teacherOpenCourseMergeResourcesInfoQuery = new TeacherOpenCourseMergeResourcesInfoQuery(); TeacherOpenCourseMergeResourcesInfoQuery teacherOpenCourseMergeResourcesInfoQuery = new TeacherOpenCourseMergeResourcesInfoQuery();
teacherOpenCourseMergeResourcesInfoQuery.setTeacherOpenCourseMergeResourcesInfoId(teacherOpenCourseMergeResourcesInfoId); teacherOpenCourseMergeResourcesInfoQuery.setTeacherOpenCourseMergeResourcesInfoId(teacherOpenCourseMergeResourcesInfoId);
List<TeacherOpenCourseMergeResourcesInfo> list = teacherOpenCourseMergeResourcesInfoDao.getValuesByQuery(teacherOpenCourseMergeResourcesInfoQuery); List<TeacherOpenCourseMergeResourcesInfo> list = teacherOpenCourseMergeResourcesInfoDao.getValuesByQuery(teacherOpenCourseMergeResourcesInfoQuery);
if(null != list && list.size()>0){ if (null != list && list.size() > 0) {
return list.get(0); return list.get(0);
}else{ } else {
return null; return null;
} }
} }
public TeacherOpenCourseMergeResourcesInfo getInfo (TeacherOpenCourseMergeResourcesInfoQuery teacherOpenCourseMergeResourcesInfoQuery){ public TeacherOpenCourseMergeResourcesInfo getInfo(TeacherOpenCourseMergeResourcesInfoQuery teacherOpenCourseMergeResourcesInfoQuery) {
List<TeacherOpenCourseMergeResourcesInfo> list = teacherOpenCourseMergeResourcesInfoDao.getValuesByQuery(teacherOpenCourseMergeResourcesInfoQuery); List<TeacherOpenCourseMergeResourcesInfo> list = teacherOpenCourseMergeResourcesInfoDao.getValuesByQuery(teacherOpenCourseMergeResourcesInfoQuery);
if(null != list && list.size()>0){ if (null != list && list.size() > 0) {
return list.get(0); return list.get(0);
}else{ } else {
return null; return null;
} }
} }
public JsonResult importTemplate(List<FileEntity> fileEntityList,List<Long>list,CoreUser coreUser){ public JsonResult importTemplate(List<FileEntity> fileEntityList, List<Long> list, CoreUser coreUser) {
List<String[]>errMsg = new ArrayList<>(); List<String[]> errMsg = new ArrayList<>();
String msg =""; String msg = "";
int count = 0; int count = 0;
Date date = new Date(); Date date = new Date();
for(int item=0;null != fileEntityList && item<fileEntityList.size();item++){ for (int item = 0; null != fileEntityList && item < fileEntityList.size(); item++) {
FileEntity fileEntity = fileEntityList.get(item); FileEntity fileEntity = fileEntityList.get(item);
if(null != fileEntity){ if (null != fileEntity) {
File file = new File(fileEntity.getAbsoluteUrl()); File file = new File(fileEntity.getAbsoluteUrl());
if(file.exists() && file.isFile() && file.canRead() && ToolUtils.findInSet("xls,xlsx",fileEntity.getFormat())){ if (file.exists() && file.isFile() && file.canRead() && ToolUtils.findInSet("xls,xlsx", fileEntity.getFormat())) {
Workbook wb = null; Workbook wb = null;
InputStream is = null; InputStream is = null;
try { try {
is = new FileInputStream(fileEntity.getAbsoluteUrl()); is = new FileInputStream(fileEntity.getAbsoluteUrl());
if("xls".equals(fileEntity.getFormat())){ if ("xls".equals(fileEntity.getFormat())) {
wb = new HSSFWorkbook(is); wb = new HSSFWorkbook(is);
}else if("xlsx".equals(fileEntity.getFormat())){ } else if ("xlsx".equals(fileEntity.getFormat())) {
wb = new XSSFWorkbook(is); wb = new XSSFWorkbook(is);
} }
} catch (FileNotFoundException e) { } catch (FileNotFoundException e) {
@ -232,13 +235,13 @@ public class TeacherOpenCourseMergeResourcesInfoService extends CoreBaseService<
e.printStackTrace(); e.printStackTrace();
} }
try { try {
if(null != is){ if (null != is) {
is.close(); is.close();
} }
}catch (Exception e){ } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
if(wb != null){ if (wb != null) {
//获取Sheet1 //获取Sheet1
Sheet sheet = wb.getSheet("Sheet1"); Sheet sheet = wb.getSheet("Sheet1");
//获取最大行数 //获取最大行数
@ -249,44 +252,44 @@ public class TeacherOpenCourseMergeResourcesInfoService extends CoreBaseService<
int colNum = firstRow.getPhysicalNumberOfCells(); int colNum = firstRow.getPhysicalNumberOfCells();
String[] columns = { String[] columns = {
"开课课程", "开课课程",
"教师开课", "教师开课",
"资源名称", "资源名称",
"资源类型 数据字典", "资源类型 数据字典",
"资源内容", "资源内容",
}; };
Map<String,Integer> map = new HashMap<>();//获取需要的表头的列 Map<String, Integer> map = new HashMap<>();//获取需要的表头的列
//从第一列找到需要的表头 //从第一列找到需要的表头
for (int i=0; i<colNum; i++){ for (int i = 0; i < colNum; i++) {
String cellData = getCellFormatValue(firstRow.getCell(i)); String cellData = getCellFormatValue(firstRow.getCell(i));
for(int j=0;j<columns.length;j++){ for (int j = 0; j < columns.length; j++) {
if(columns[j].equals(cellData)){ if (columns[j].equals(cellData)) {
map.put(columns[j],i); map.put(columns[j], i);
} }
} }
} }
//验证所需要的表头是否全 //验证所需要的表头是否全
Integer flag = 0; Integer flag = 0;
for(int i=0;i<columns.length;i++){ for (int i = 0; i < columns.length; i++) {
if(null != map.get(columns[i])){ if (null != map.get(columns[i])) {
flag ++; flag++;
} }
} }
if(flag != columns.length){ if (flag != columns.length) {
String str = " "; String str = " ";
for(int i=0;i<columns.length;i++){ for (int i = 0; i < columns.length; i++) {
str += "\""+columns[i]+"\""+(i == columns.length-1?"":", "); str += "\"" + columns[i] + "\"" + (i == columns.length - 1 ? "" : ", ");
} }
return JsonResult.failMessage("导入失败，表格表头应包含"+str); return JsonResult.failMessage("导入失败，表格表头应包含" + str);
} }
for (int i = 1; i<rowNum; i++) { for (int i = 1; i < rowNum; i++) {
Row row = sheet.getRow(i); Row row = sheet.getRow(i);
if(null == row){ if (null == row) {
errMsg.add(new String[]{"第"+(i+1)+"数据为空"}); errMsg.add(new String[]{"第" + (i + 1) + "数据为空"});
continue; continue;
} }
@ -296,38 +299,33 @@ public class TeacherOpenCourseMergeResourcesInfoService extends CoreBaseService<
String resourcesInfoType = getCellFormatValue(row.getCell(map.get(columns[3]))); String resourcesInfoType = getCellFormatValue(row.getCell(map.get(columns[3])));
String resourcesInfoContent = getCellFormatValue(row.getCell(map.get(columns[4]))); String resourcesInfoContent = getCellFormatValue(row.getCell(map.get(columns[4])));
//TODO 判断（如重复等复杂判断要额外写） //TODO 判断（如重复等复杂判断要额外写）
if(StringUtils.isBlank(teacherOpenCourseMergeCourseInfoId)){ if (StringUtils.isBlank(teacherOpenCourseMergeCourseInfoId)) {
errMsg.add(new String[]{"第"+ToolUtils.numberToLetter(map.get(columns[0])+1)+"列，第"+(i+1)+"行开课课程为空"}); errMsg.add(new String[]{"第" + ToolUtils.numberToLetter(map.get(columns[0]) + 1) + "列，第" + (i + 1) + "行开课课程为空"});
continue; continue;
}else } else if (StringUtils.isBlank(teacherOpenCourseId)) {
if(StringUtils.isBlank(teacherOpenCourseId)){ errMsg.add(new String[]{"第" + ToolUtils.numberToLetter(map.get(columns[1]) + 1) + "列，第" + (i + 1) + "行教师开课为空"});
errMsg.add(new String[]{"第"+ToolUtils.numberToLetter(map.get(columns[1])+1)+"列，第"+(i+1)+"行教师开课为空"});
continue; continue;
}else } else if (StringUtils.isBlank(resourcesInfoName)) {
if(StringUtils.isBlank(resourcesInfoName)){ errMsg.add(new String[]{"第" + ToolUtils.numberToLetter(map.get(columns[2]) + 1) + "列，第" + (i + 1) + "行资源名称为空"});
errMsg.add(new String[]{"第"+ToolUtils.numberToLetter(map.get(columns[2])+1)+"列，第"+(i+1)+"行资源名称为空"});
continue; continue;
}else } else if (StringUtils.isBlank(resourcesInfoType)) {
if(StringUtils.isBlank(resourcesInfoType)){ errMsg.add(new String[]{"第" + ToolUtils.numberToLetter(map.get(columns[3]) + 1) + "列，第" + (i + 1) + "行资源类型 数据字典为空"});
errMsg.add(new String[]{"第"+ToolUtils.numberToLetter(map.get(columns[3])+1)+"列，第"+(i+1)+"行资源类型 数据字典为空"});
continue; continue;
}else } else if (StringUtils.isBlank(resourcesInfoContent)) {
if(StringUtils.isBlank(resourcesInfoContent)){ errMsg.add(new String[]{"第" + ToolUtils.numberToLetter(map.get(columns[4]) + 1) + "列，第" + (i + 1) + "行资源内容为空"});
errMsg.add(new String[]{"第"+ToolUtils.numberToLetter(map.get(columns[4])+1)+"列，第"+(i+1)+"行资源内容为空"});
continue; continue;
}else } else {
{ //TODO 保存
//TODO 保存 TeacherOpenCourseMergeResourcesInfo teacherOpenCourseMergeResourcesInfo = new TeacherOpenCourseMergeResourcesInfo();
TeacherOpenCourseMergeResourcesInfo teacherOpenCourseMergeResourcesInfo = new TeacherOpenCourseMergeResourcesInfo(); teacherOpenCourseMergeResourcesInfo.setTeacherOpenCourseMergeCourseInfoId(Long.parseLong(teacherOpenCourseMergeCourseInfoId));
teacherOpenCourseMergeResourcesInfo.setTeacherOpenCourseMergeCourseInfoId(Long.parseLong(teacherOpenCourseMergeCourseInfoId)); teacherOpenCourseMergeResourcesInfo.setTeacherOpenCourseId(Long.parseLong(teacherOpenCourseId));
teacherOpenCourseMergeResourcesInfo.setTeacherOpenCourseId(Long.parseLong(teacherOpenCourseId)); teacherOpenCourseMergeResourcesInfo.setResourcesInfoName(resourcesInfoName);
teacherOpenCourseMergeResourcesInfo.setResourcesInfoName(resourcesInfoName); teacherOpenCourseMergeResourcesInfo.setResourcesInfoType(Integer.parseInt(resourcesInfoType));
teacherOpenCourseMergeResourcesInfo.setResourcesInfoType(Integer.parseInt(resourcesInfoType)); teacherOpenCourseMergeResourcesInfo.setResourcesInfoContent(resourcesInfoContent);
teacherOpenCourseMergeResourcesInfo.setResourcesInfoContent(resourcesInfoContent); teacherOpenCourseMergeResourcesInfo.setOrgId(coreUser.getOrgId());
teacherOpenCourseMergeResourcesInfo.setOrgId(coreUser.getOrgId()); teacherOpenCourseMergeResourcesInfo.setUserId(coreUser.getId());
teacherOpenCourseMergeResourcesInfo.setUserId(coreUser.getId());
count++;
count++;
} }
} }
} }
@ -335,22 +333,22 @@ public class TeacherOpenCourseMergeResourcesInfoService extends CoreBaseService<
} }
} }
JsonResult jsonResult = new JsonResult(); JsonResult jsonResult = new JsonResult();
jsonResult.setCode(count>0?JsonReturnCode.SUCCESS.getCode():JsonReturnCode.FAIL.getCode()); jsonResult.setCode(count > 0 ? JsonReturnCode.SUCCESS.getCode() : JsonReturnCode.FAIL.getCode());
jsonResult.setData(errMsg); jsonResult.setData(errMsg);
jsonResult.setMsg((count>0?"导入成功,共导入"+count+"条":"导入失败")+(StringUtils.isNotBlank(msg)?"<br>"+msg:"")); jsonResult.setMsg((count > 0 ? "导入成功,共导入" + count + "条" : "导入失败") + (StringUtils.isNotBlank(msg) ? "<br>" + msg : ""));
return jsonResult; return jsonResult;
} }
public List<Map<String,Object>> getExcelValues (TeacherOpenCourseMergeResourcesInfoQuery teacherOpenCourseMergeResourcesInfoQuery){ public List<Map<String, Object>> getExcelValues(TeacherOpenCourseMergeResourcesInfoQuery teacherOpenCourseMergeResourcesInfoQuery) {
return teacherOpenCourseMergeResourcesInfoDao.getExcelValues(teacherOpenCourseMergeResourcesInfoQuery); return teacherOpenCourseMergeResourcesInfoDao.getExcelValues(teacherOpenCourseMergeResourcesInfoQuery);
} }
/** /**
* 根据指定的课程ID和章节ID集合，去从系统资源拷贝到开课资源库 * 根据指定的课程ID和章节ID集合，去从系统资源拷贝到开课资源库
* *
* @param teacherOpenCourseId 开课ID * @param teacherOpenCourseId 开课ID
* @param allCourseInfo 指定的所有课程章节 * @param allCourseInfo 指定的所有课程章节
* @param courseInfoIdPair 拷贝过来的ID段，旧ID和新ID的一个映射关系（非必填） * @param courseInfoIdPair 拷贝过来的ID段，旧ID和新ID的一个映射关系（非必填）
*/ */
public void copySystemResourcesInfoToOpenCourse(@NotNull(message = "开课ID不能为空！") Long teacherOpenCourseId, public void copySystemResourcesInfoToOpenCourse(@NotNull(message = "开课ID不能为空！") Long teacherOpenCourseId,
Collection<CourseInfo> allCourseInfo, @Nullable Map<Long, Long> courseInfoIdPair) { Collection<CourseInfo> allCourseInfo, @Nullable Map<Long, Long> courseInfoIdPair) {
@ -369,9 +367,9 @@ public class TeacherOpenCourseMergeResourcesInfoService extends CoreBaseService<
/** /**
* 根据指定的课程ID和章节ID集合，去从系统资源拷贝到开课资源库 * 根据指定的课程ID和章节ID集合，去从系统资源拷贝到开课资源库
* *
* @param teacherOpenCourseId 开课ID * @param teacherOpenCourseId 开课ID
* @param allCourseInfoIdsJoin 指定的所有课程章节ID * @param allCourseInfoIdsJoin 指定的所有课程章节ID
* @param courseInfoIdPair 拷贝过来的ID段，旧ID和新ID的一个映射关系（非必填） * @param courseInfoIdPair 拷贝过来的ID段，旧ID和新ID的一个映射关系（非必填）
*/ */
public void copySystemResourcesInfoToOpenCourse(@NotNull(message = "开课ID不能为空！") Long teacherOpenCourseId, public void copySystemResourcesInfoToOpenCourse(@NotNull(message = "开课ID不能为空！") Long teacherOpenCourseId,
String allCourseInfoIdsJoin, @Nullable Map<Long, Long> courseInfoIdPair) { String allCourseInfoIdsJoin, @Nullable Map<Long, Long> courseInfoIdPair) {
@ -399,11 +397,15 @@ public class TeacherOpenCourseMergeResourcesInfoService extends CoreBaseService<
public void copyFromResourcesInfo(Set<Long> resourcesInfoIds, public void copyFromResourcesInfo(Set<Long> resourcesInfoIds,
@NotNull(message = "开课ID不能为空！") final Long teacherOpenCourseId, Map<Long, Long> courseInfoIdPair) { @NotNull(message = "开课ID不能为空！") final Long teacherOpenCourseId, Map<Long, Long> courseInfoIdPair) {
if (ObjectUtil.isEmpty(resourcesInfoIds)) { return; } if (ObjectUtil.isEmpty(resourcesInfoIds)) {
return;
}
ResourcesInfoQuery resourcesInfoQuery = new ResourcesInfoQuery(); ResourcesInfoQuery resourcesInfoQuery = new ResourcesInfoQuery();
resourcesInfoQuery.setResourcesInfoIds(join(resourcesInfoIds.toArray(), ",")); resourcesInfoQuery.setResourcesInfoIds(join(resourcesInfoIds.toArray(), ","));
List<ResourcesInfo> resourcesInfoList = resourcesInfoService.getValuesByQuery(resourcesInfoQuery); List<ResourcesInfo> resourcesInfoList = resourcesInfoService.getValuesByQuery(resourcesInfoQuery);
if (ObjectUtil.isEmpty(resourcesInfoList)) { return; } if (ObjectUtil.isEmpty(resourcesInfoList)) {
return;
}
// 拷贝部分字段映射 // 拷贝部分字段映射
CopyOptions copyOptions = CopyOptions.create().setFieldMapping(MapUtil.of("courseInfoId", "teacherOpenCourseMergeCourseInfoId")); CopyOptions copyOptions = CopyOptions.create().setFieldMapping(MapUtil.of("courseInfoId", "teacherOpenCourseMergeCourseInfoId"));
@ -422,13 +424,15 @@ public class TeacherOpenCourseMergeResourcesInfoService extends CoreBaseService<
/** /**
* 重置开课课程ID。需要拿到新旧改变的关系 * 重置开课课程ID。需要拿到新旧改变的关系
*
* @param copyToList * @param copyToList
* @param courseInfoIdPair * @param courseInfoIdPair
*/ */
public void resetNewId(List<TeacherOpenCourseMergeResourcesInfo> copyToList, Map<Long, Long> courseInfoIdPair) { public void resetNewId(List<TeacherOpenCourseMergeResourcesInfo> copyToList, Map<Long, Long> courseInfoIdPair) {
if (ObjectUtil.isEmpty(courseInfoIdPair)) {return;} if (ObjectUtil.isEmpty(courseInfoIdPair)) {
return;
}
copyToList.forEach(item -> { copyToList.forEach(item -> {
item.setTeacherOpenCourseMergeResourcesInfoId(null);
item.setTeacherOpenCourseMergeCourseInfoId(courseInfoIdPair.get(item.getTeacherOpenCourseMergeCourseInfoId())); item.setTeacherOpenCourseMergeCourseInfoId(courseInfoIdPair.get(item.getTeacherOpenCourseMergeCourseInfoId()));
}); });
@ -455,6 +459,7 @@ public class TeacherOpenCourseMergeResourcesInfoService extends CoreBaseService<
/** /**
* 验证操作的数据，是否是教师本人上传的 * 验证操作的数据，是否是教师本人上传的
*
* @param resourcesInfoIds * @param resourcesInfoIds
* @param coreUser * @param coreUser
*/ */
@ -470,6 +475,7 @@ public class TeacherOpenCourseMergeResourcesInfoService extends CoreBaseService<
/** /**
* 位置移动 * 位置移动
* 小于0的数字，是代表置顶。大于0代表非置顶 * 小于0的数字，是代表置顶。大于0代表非置顶
*
* @param id * @param id
* @param moveType * @param moveType
*/ */
@ -502,7 +508,8 @@ public class TeacherOpenCourseMergeResourcesInfoService extends CoreBaseService<
BigDecimal minLinkOrder = minOrderClientLink.getOrderIndex(); BigDecimal minLinkOrder = minOrderClientLink.getOrderIndex();
// 置顶就现有的最小值减1。但是需要确保结果小于0 // 置顶就现有的最小值减1。但是需要确保结果小于0
calcedOrder = NumberUtil.sub(min(minLinkOrder.floatValue(), 0), 1); calcedOrder = NumberUtil.sub(min(minLinkOrder.floatValue(), 0), 1);
} break; }
break;
case MOVE_LEFT: { case MOVE_LEFT: {
@ -532,7 +539,8 @@ public class TeacherOpenCourseMergeResourcesInfoService extends CoreBaseService<
// 左移位后的值 // 左移位后的值
calcedOrder = RandomUtil.randomDouble(min.doubleValue(), max.doubleValue(), 6, RoundingMode.HALF_UP); calcedOrder = RandomUtil.randomDouble(min.doubleValue(), max.doubleValue(), 6, RoundingMode.HALF_UP);
} break; }
break;
case MOVE_RIGHT: { case MOVE_RIGHT: {
@ -561,7 +569,8 @@ public class TeacherOpenCourseMergeResourcesInfoService extends CoreBaseService<
// 右移位后的值 // 右移位后的值
calcedOrder = RandomUtil.randomDouble(min.doubleValue(), max.doubleValue(), 6, RoundingMode.HALF_UP); calcedOrder = RandomUtil.randomDouble(min.doubleValue(), max.doubleValue(), 6, RoundingMode.HALF_UP);
} break; }
break;
default: default:
log.error("不支持的移动类型！"); log.error("不支持的移动类型！");
break; break;
@ -583,22 +592,21 @@ public class TeacherOpenCourseMergeResourcesInfoService extends CoreBaseService<
* 只传右元素ID，表示：拖动元素 在 右元素的右侧； * 只传右元素ID，表示：拖动元素 在 右元素的右侧；
* 左右元素ID都传，则拖动元素放置在两个元素的中间。 * 左右元素ID都传，则拖动元素放置在两个元素的中间。
* *
* @param id 拖动元素的ID * @param id 拖动元素的ID
* @param leftId 左元素ID 偏小数值对应的元素ID * @param leftId 左元素ID 偏小数值对应的元素ID
* @param rightId 右元素ID 偏大数值对应的元素ID * @param rightId 右元素ID 偏大数值对应的元素ID
* * <p>
* 左侧（上） ==> 右侧（下） * 左侧（上） ==> 右侧（下）
* 小数值 ==> 大数值 * 小数值 ==> 大数值
* * <p>
* 数值越小，越靠前 * 数值越小，越靠前
*
* @Author: 87966 * @Author: 87966
* @Date: 2023/1/9 16:44 * @Date: 2023/1/9 16:44
*/ */
public void drag(@NotNull(message = "要移动的元素 ID不能为空！") final Long id, final Long leftId, final Long rightId) { public void drag(@NotNull(message = "要移动的元素 ID不能为空！") final Long id, final Long leftId, final Long rightId) {
// 查询出来所有元素 // 查询出来所有元素
List<TeacherOpenCourseMergeResourcesInfo> allElement = teacherOpenCourseMergeResourcesInfoDao.getByIds(ArrayUtil.join(new Long[]{ id, leftId, rightId }, ",")); List<TeacherOpenCourseMergeResourcesInfo> allElement = teacherOpenCourseMergeResourcesInfoDao.getByIds(ArrayUtil.join(new Long[]{id, leftId, rightId}, ","));
// 自身ID是否存在 // 自身ID是否存在
boolean hasSelf = allElement.stream().anyMatch(item -> item.getTeacherOpenCourseMergeCourseInfoId().equals(id)); boolean hasSelf = allElement.stream().anyMatch(item -> item.getTeacherOpenCourseMergeCourseInfoId().equals(id));
@ -666,12 +674,13 @@ public class TeacherOpenCourseMergeResourcesInfoService extends CoreBaseService<
updateTemplate(updatePO); updateTemplate(updatePO);
} }
} }
/** /**
* 根据指定的课程ID和章节ID集合，去从系统资源拷贝到开课资源库 * 根据指定的课程ID和章节ID集合，去从系统资源拷贝到开课资源库
* *
* @param teacherOpenCourseId 开课ID * @param teacherOpenCourseId 开课ID
* @param allCourseInfo 指定的所有课程章节 * @param allCourseInfo 指定的所有课程章节
* @param courseInfoIdPair 拷贝过来的ID段，旧ID和新ID的一个映射关系（非必填） * @param courseInfoIdPair 拷贝过来的ID段，旧ID和新ID的一个映射关系（非必填）
*/ */
public void copyOpenCourseResourcesInfoToOpenCourse(@NotNull(message = "开课ID不能为空！") Long teacherOpenCourseId, public void copyOpenCourseResourcesInfoToOpenCourse(@NotNull(message = "开课ID不能为空！") Long teacherOpenCourseId,
Collection<TeacherOpenCourseMergeCourseInfo> allCourseInfo, @Nullable Map<Long, Long> courseInfoIdPair) { Collection<TeacherOpenCourseMergeCourseInfo> allCourseInfo, @Nullable Map<Long, Long> courseInfoIdPair) {
@ -692,15 +701,17 @@ public class TeacherOpenCourseMergeResourcesInfoService extends CoreBaseService<
* <p> * <p>
* 从开课资源库拉取到教师开课的资源中。 * 从开课资源库拉取到教师开课的资源中。
* *
* @param resourcesInfoList 资源信息集合 * @param resourcesInfoList 资源信息集合
* @param teacherOpenCourseId 开课ID * @param teacherOpenCourseId 开课ID
* @param courseInfoIdPair * @param courseInfoIdPair
* @return * @return
*/ */
public void copyFromOpenCourseResourcesInfo(List<TeacherOpenCourseMergeResourcesInfo> resourcesInfoList, public void copyFromOpenCourseResourcesInfo(List<TeacherOpenCourseMergeResourcesInfo> resourcesInfoList,
@NotNull(message = "开课ID不能为空！") final Long teacherOpenCourseId, Map<Long, Long> courseInfoIdPair) { @NotNull(message = "开课ID不能为空！") final Long teacherOpenCourseId, Map<Long, Long> courseInfoIdPair) {
if (CollectionUtil.isEmpty(resourcesInfoList)) { return; } if (CollectionUtil.isEmpty(resourcesInfoList)) {
return;
}
resourcesInfoList.forEach(item -> { resourcesInfoList.forEach(item -> {
item.setTeacherOpenCourseId(teacherOpenCourseId); item.setTeacherOpenCourseId(teacherOpenCourseId);
@ -708,6 +719,7 @@ public class TeacherOpenCourseMergeResourcesInfoService extends CoreBaseService<
}); });
resetNewId(resourcesInfoList, courseInfoIdPair); resetNewId(resourcesInfoList, courseInfoIdPair);
resourcesInfoList.forEach(item -> item.setTeacherOpenCourseMergeResourcesInfoId(null));
// 批量插入资源和开课关联表 // 批量插入资源和开课关联表
insertBatch(resourcesInfoList); insertBatch(resourcesInfoList);

11
web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeResourcesQuestionService.java
Unescape Escape View File

@ -705,7 +705,7 @@ public class TeacherOpenCourseMergeResourcesQuestionService extends CoreBaseServ
List<TeacherOpenCourseMergeResourcesQuestion> questionList = getValuesByQuery(teacherOpenCourseMergeResourcesQuestionQuery); List<TeacherOpenCourseMergeResourcesQuestion> questionList = getValuesByQuery(teacherOpenCourseMergeResourcesQuestionQuery);
// 拷贝其他开课题目目库到教师开课 // 拷贝其他开课题目目库到教师开课
copyFromOpenCourseQuestion(questionList, teacherOpenCourseId, courseInfoIdPair); copyFromOpenCourseQuestion(questionList, teacherOpenCourseId, courseInfoIdPair);
} }
} }
@ -735,10 +735,15 @@ public class TeacherOpenCourseMergeResourcesQuestionService extends CoreBaseServ
// 重置开课课程ID // 重置开课课程ID
resetNewId(questionList, courseInfoIdPair); resetNewId(questionList, courseInfoIdPair);
// 设置开课ID // 设置开课ID
questionList.forEach(item -> item.setTeacherOpenCourseId(teacherOpenCourseId)); questionList.forEach(item -> {
item.setTeacherOpenCourseId(teacherOpenCourseId);
item.setTeacherOpenCourseMergeResourcesQuestionId(null);
}
);
// 批量插入 // 批量插入
teacherOpenCourseMergeResourcesQuestionDao.insertBatch(convertedList); teacherOpenCourseMergeResourcesQuestionDao.insertBatch(questionList);
} }

2
web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionSettingService.java
Unescape Escape View File

@ -647,6 +647,7 @@ public class TeacherOpenCourseQuestionSettingService extends CoreBaseService<Tea
* @param courseInfoIdPair * @param courseInfoIdPair
*/ */
public void copyOpenQuestionChapterTestQuestionToOpenCourse(@NotNull(message = "开课ID不能为空！") Long teacherOpenCourseId, Map<Long, Long> courseInfoIdPair) { public void copyOpenQuestionChapterTestQuestionToOpenCourse(@NotNull(message = "开课ID不能为空！") Long teacherOpenCourseId, Map<Long, Long> courseInfoIdPair) {
//resources_question_snapshot
TeacherOpenCourseMergeCourseInfoQuery query = new TeacherOpenCourseMergeCourseInfoQuery(); TeacherOpenCourseMergeCourseInfoQuery query = new TeacherOpenCourseMergeCourseInfoQuery();
query.setTeacherOpenCourseId(teacherOpenCourseId); query.setTeacherOpenCourseId(teacherOpenCourseId);
query.setCourseInfoStatus(1); query.setCourseInfoStatus(1);
@ -665,6 +666,7 @@ public class TeacherOpenCourseQuestionSettingService extends CoreBaseService<Tea
// 章下面所有小节,包含章节点 // 章下面所有小节,包含章节点
Set<TeacherOpenCourseMergeCourseInfo> result = new ConcurrentHashSet<>(12); Set<TeacherOpenCourseMergeCourseInfo> result = new ConcurrentHashSet<>(12);
//循环章节
for (TeacherOpenCourseMergeCourseInfo chapter : chapterSet) { for (TeacherOpenCourseMergeCourseInfo chapter : chapterSet) {
result.clear(); result.clear();
Long teacherOpenCourseMergeCourseInfoId = chapter.getTeacherOpenCourseMergeCourseInfoId(); Long teacherOpenCourseMergeCourseInfoId = chapter.getTeacherOpenCourseMergeCourseInfoId();

Write Preview
Loading…
Cancel
Save