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

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

Browse Source
beetlsql3-dev
yaodan
parent 486b313958
commit 352be4edb1
4 changed files with 148 additions and 129 deletions

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;
@UpdateIgnore
@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")
private Integer allQuestionCount;
//@UpdateIgnore
//@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")
//private Integer allQuestionCount;
}

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

@ -63,7 +63,8 @@ import static org.apache.commons.lang3.StringUtils.join;
@Slf4j
public class TeacherOpenCourseMergeResourcesInfoService extends CoreBaseService<TeacherOpenCourseMergeResourcesInfo> implements DeleteResourcesBy {
@Autowired private TeacherOpenCourseMergeResourcesInfoDao teacherOpenCourseMergeResourcesInfoDao;
@Autowired
private TeacherOpenCourseMergeResourcesInfoDao teacherOpenCourseMergeResourcesInfoDao;
@Autowired
private ResourcesInfoService resourcesInfoService;
@Autowired
@ -99,6 +100,7 @@ public class TeacherOpenCourseMergeResourcesInfoService extends CoreBaseService<
throw new PlatformException("批量删除开课资源拉取失败", e);
}
}
public void logicDeleteTeacherOpenCourseMergeResourcesInfo(String ids) {
try {
teacherOpenCourseMergeResourcesInfoDao.logicDeleteTeacherOpenCourseMergeResourcesInfo(ids);
@ -115,7 +117,8 @@ public class TeacherOpenCourseMergeResourcesInfoService extends CoreBaseService<
} catch (Exception e) {
try {
teacherOpenCourseMergeResourcesInfoList.add(JSONObject.parseObject(teacherOpenCourseMergeResourcesInfoQuery.getTeacherOpenCourseMergeResourcesInfoJsonStr(), TeacherOpenCourseMergeResourcesInfo.class));
} catch (Exception e1) {}
} catch (Exception e1) {
}
}
ToolUtils.deleteNullList(teacherOpenCourseMergeResourcesInfoList);
if (null != teacherOpenCourseMergeResourcesInfoList && teacherOpenCourseMergeResourcesInfoList.size() > 0) {
@ -299,24 +302,19 @@ public class TeacherOpenCourseMergeResourcesInfoService extends CoreBaseService<
if (StringUtils.isBlank(teacherOpenCourseMergeCourseInfoId)) {
errMsg.add(new String[]{"第" + ToolUtils.numberToLetter(map.get(columns[0]) + 1) + "列，第" + (i + 1) + "行开课课程为空"});
continue;
}else
if(StringUtils.isBlank(teacherOpenCourseId)){
} else if (StringUtils.isBlank(teacherOpenCourseId)) {
errMsg.add(new String[]{"第" + ToolUtils.numberToLetter(map.get(columns[1]) + 1) + "列，第" + (i + 1) + "行教师开课为空"});
continue;
}else
if(StringUtils.isBlank(resourcesInfoName)){
} else if (StringUtils.isBlank(resourcesInfoName)) {
errMsg.add(new String[]{"第" + ToolUtils.numberToLetter(map.get(columns[2]) + 1) + "列，第" + (i + 1) + "行资源名称为空"});
continue;
}else
if(StringUtils.isBlank(resourcesInfoType)){
} else if (StringUtils.isBlank(resourcesInfoType)) {
errMsg.add(new String[]{"第" + ToolUtils.numberToLetter(map.get(columns[3]) + 1) + "列，第" + (i + 1) + "行资源类型 数据字典为空"});
continue;
}else
if(StringUtils.isBlank(resourcesInfoContent)){
} else if (StringUtils.isBlank(resourcesInfoContent)) {
errMsg.add(new String[]{"第" + ToolUtils.numberToLetter(map.get(columns[4]) + 1) + "列，第" + (i + 1) + "行资源内容为空"});
continue;
}else
{
} else {
//TODO 保存
TeacherOpenCourseMergeResourcesInfo teacherOpenCourseMergeResourcesInfo = new TeacherOpenCourseMergeResourcesInfo();
teacherOpenCourseMergeResourcesInfo.setTeacherOpenCourseMergeCourseInfoId(Long.parseLong(teacherOpenCourseMergeCourseInfoId));
@ -399,11 +397,15 @@ public class TeacherOpenCourseMergeResourcesInfoService extends CoreBaseService<
public void copyFromResourcesInfo(Set<Long> resourcesInfoIds,
@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.setResourcesInfoIds(join(resourcesInfoIds.toArray(), ","));
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"));
@ -422,13 +424,15 @@ public class TeacherOpenCourseMergeResourcesInfoService extends CoreBaseService<
/**
* 重置开课课程ID。需要拿到新旧改变的关系
*
* @param copyToList
* @param courseInfoIdPair
*/
public void resetNewId(List<TeacherOpenCourseMergeResourcesInfo> copyToList, Map<Long, Long> courseInfoIdPair) {
if (ObjectUtil.isEmpty(courseInfoIdPair)) {return;}
if (ObjectUtil.isEmpty(courseInfoIdPair)) {
return;
}
copyToList.forEach(item -> {
item.setTeacherOpenCourseMergeResourcesInfoId(null);
item.setTeacherOpenCourseMergeCourseInfoId(courseInfoIdPair.get(item.getTeacherOpenCourseMergeCourseInfoId()));
});
@ -455,6 +459,7 @@ public class TeacherOpenCourseMergeResourcesInfoService extends CoreBaseService<
/**
* 验证操作的数据，是否是教师本人上传的
*
* @param resourcesInfoIds
* @param coreUser
*/
@ -470,6 +475,7 @@ public class TeacherOpenCourseMergeResourcesInfoService extends CoreBaseService<
/**
* 位置移动
* 小于0的数字，是代表置顶。大于0代表非置顶
*
* @param id
* @param moveType
*/
@ -502,7 +508,8 @@ public class TeacherOpenCourseMergeResourcesInfoService extends CoreBaseService<
BigDecimal minLinkOrder = minOrderClientLink.getOrderIndex();
// 置顶就现有的最小值减1。但是需要确保结果小于0
calcedOrder = NumberUtil.sub(min(minLinkOrder.floatValue(), 0), 1);
} break;
}
break;
case MOVE_LEFT: {
@ -532,7 +539,8 @@ public class TeacherOpenCourseMergeResourcesInfoService extends CoreBaseService<
// 左移位后的值
calcedOrder = RandomUtil.randomDouble(min.doubleValue(), max.doubleValue(), 6, RoundingMode.HALF_UP);
} break;
}
break;
case MOVE_RIGHT: {
@ -561,7 +569,8 @@ public class TeacherOpenCourseMergeResourcesInfoService extends CoreBaseService<
// 右移位后的值
calcedOrder = RandomUtil.randomDouble(min.doubleValue(), max.doubleValue(), 6, RoundingMode.HALF_UP);
} break;
}
break;
default:
log.error("不支持的移动类型！");
break;
@ -586,12 +595,11 @@ public class TeacherOpenCourseMergeResourcesInfoService extends CoreBaseService<
* @param id 拖动元素的ID
* @param leftId 左元素ID 偏小数值对应的元素ID
* @param rightId 右元素ID 偏大数值对应的元素ID
*
* <p>
* 左侧（上） ==> 右侧（下）
* 小数值 ==> 大数值
*
* <p>
* 数值越小，越靠前
*
* @Author: 87966
* @Date: 2023/1/9 16:44
*/
@ -666,6 +674,7 @@ public class TeacherOpenCourseMergeResourcesInfoService extends CoreBaseService<
updateTemplate(updatePO);
}
}
/**
* 根据指定的课程ID和章节ID集合，去从系统资源拷贝到开课资源库
*
@ -700,7 +709,9 @@ public class TeacherOpenCourseMergeResourcesInfoService extends CoreBaseService<
public void copyFromOpenCourseResourcesInfo(List<TeacherOpenCourseMergeResourcesInfo> resourcesInfoList,
@NotNull(message = "开课ID不能为空！") final Long teacherOpenCourseId, Map<Long, Long> courseInfoIdPair) {
if (CollectionUtil.isEmpty(resourcesInfoList)) { return; }
if (CollectionUtil.isEmpty(resourcesInfoList)) {
return;
}
resourcesInfoList.forEach(item -> {
item.setTeacherOpenCourseId(teacherOpenCourseId);
@ -708,6 +719,7 @@ public class TeacherOpenCourseMergeResourcesInfoService extends CoreBaseService<
});
resetNewId(resourcesInfoList, courseInfoIdPair);
resourcesInfoList.forEach(item -> item.setTeacherOpenCourseMergeResourcesInfoId(null));
// 批量插入资源和开课关联表
insertBatch(resourcesInfoList);

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

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

Write Preview
Loading…
Cancel
Save