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

Merge remote-tracking branch 'origin/beetlsql3-dev' into beetlsql3-dev

Browse Source
beetlsql3-dev
wgf 2 years ago
parent cad52933e7 2ff269df79
commit d5b83ec2c7
2 changed files with 267 additions and 140 deletions
Show Stats Download Patch File Download Diff File

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

@ -65,19 +65,32 @@ import static java.util.stream.Collectors.joining;
@Slf4j
public class TeacherOpenCourseQuestionSettingService extends CoreBaseService<TeacherOpenCourseQuestionSetting> implements DeleteResourcesBy {
@Autowired private TeacherOpenCourseQuestionSettingDao teacherOpenCourseQuestionSettingDao;
@Autowired private ResourcesQuestionSnapshotDao resourcesQuestionSnapshotDao;
@Autowired private TeacherOpenCourseQuestionLogDao teacherOpenCourseQuestionLogDao;
@Autowired private QuestionLogSummaryDao questionLogSummaryDao;
@Autowired private StudentDao studentDao;
@Autowired private ResourcesQuestionSnapshotService resourcesQuestionSnapshotService;
@Autowired private TeacherOpenCourseQuestionLogService teacherOpenCourseQuestionLogService;
@Autowired private TeacherOpenCourseQuestionLogWrongService teacherOpenCourseQuestionLogWrongService;
@Autowired private ResourcesQuestionService resourcesQuestionService;
@Autowired private CourseInfoService courseInfoService;
@Autowired private TeacherOpenCourseMergeResourcesQuestionService teacherOpenCourseMergeResourcesQuestionService;
@Autowired private TeacherOpenCourseMergeCourseInfoService teacherOpenCourseMergeCourseInfoService;
@Autowired private QuestionSettingRedisDelayQueueImpl questionSettingRedisDelayQueue;
@Autowired
private TeacherOpenCourseQuestionSettingDao teacherOpenCourseQuestionSettingDao;
@Autowired
private ResourcesQuestionSnapshotDao resourcesQuestionSnapshotDao;
@Autowired
private TeacherOpenCourseQuestionLogDao teacherOpenCourseQuestionLogDao;
@Autowired
private QuestionLogSummaryDao questionLogSummaryDao;
@Autowired
private StudentDao studentDao;
@Autowired
private ResourcesQuestionSnapshotService resourcesQuestionSnapshotService;
@Autowired
private TeacherOpenCourseQuestionLogService teacherOpenCourseQuestionLogService;
@Autowired
private TeacherOpenCourseQuestionLogWrongService teacherOpenCourseQuestionLogWrongService;
@Autowired
private ResourcesQuestionService resourcesQuestionService;
@Autowired
private CourseInfoService courseInfoService;
@Autowired
private TeacherOpenCourseMergeResourcesQuestionService teacherOpenCourseMergeResourcesQuestionService;
@Autowired
private TeacherOpenCourseMergeCourseInfoService teacherOpenCourseMergeCourseInfoService;
@Autowired
private QuestionSettingRedisDelayQueueImpl questionSettingRedisDelayQueue;
@Autowired
private QuestionLogSummaryService questionLogSummaryService;
@ -129,7 +142,8 @@ public class TeacherOpenCourseQuestionSettingService extends CoreBaseService<Tea
} catch (Exception e) {
try {
teacherOpenCourseQuestionSettingList.add(JSONObject.parseObject(teacherOpenCourseQuestionSettingQuery.getTeacherOpenCourseQuestionSettingJsonStr(), TeacherOpenCourseQuestionSetting.class));
} catch (Exception e1) {}
} catch (Exception e1) {
}
}
ToolUtils.deleteNullList(teacherOpenCourseQuestionSettingList);
if (null != teacherOpenCourseQuestionSettingList && teacherOpenCourseQuestionSettingList.size() > 0) {
@ -176,7 +190,7 @@ public class TeacherOpenCourseQuestionSettingService extends CoreBaseService<Tea
/**
* 根据开课ID + 章节名称
* 判断章节练习时候，的题目配置 唯一性
*
* <p>
* 数据库设计稍微有点不严谨，暂时用名字来作为关联的条件，所以这里只能保证同一个开课ID下的名字是唯一的
*
* @param teacherOpenCourseId
@ -199,7 +213,7 @@ public class TeacherOpenCourseQuestionSettingService extends CoreBaseService<Tea
/**
* 根据开课ID + 章节名称
* 判断章节练习时候，的题目配置 唯一性
*
* <p>
* 数据库设计稍微有点不严谨，暂时用名字来作为关联的条件，所以这里只能保证同一个开课ID下的名字是唯一的
*
* @param query
@ -250,6 +264,7 @@ public class TeacherOpenCourseQuestionSettingService extends CoreBaseService<Tea
/**
* 设置题目的分数和完成时间
*
* @param list
* @param student
*/
@ -344,7 +359,7 @@ public class TeacherOpenCourseQuestionSettingService extends CoreBaseService<Tea
* 根据开课的课程信息，添加题目配置和题目
* 这里不区分节点是什么类型的。
* 严格要求：
*
* <p>
* 添加主表
* 任务一：添加主表
* 任务二：添加到题目配置主表；
@ -377,9 +392,10 @@ public class TeacherOpenCourseQuestionSettingService extends CoreBaseService<Tea
/**
* 增加题目类型的数据 从开课端拉取
*
* <p>
* 任务一；添加题目配置主表
* 任务二：添加题目快照表
*
* @param settingQuery
* @return
*/
@ -423,7 +439,9 @@ public class TeacherOpenCourseQuestionSettingService extends CoreBaseService<Tea
}
});
if (ObjectUtil.isNotEmpty(map)) { settingDTOList = map.values(); }
if (ObjectUtil.isNotEmpty(map)) {
settingDTOList = map.values();
}
}
// 随机抽取题目的方式
@ -459,11 +477,12 @@ public class TeacherOpenCourseQuestionSettingService extends CoreBaseService<Tea
/**
* 根据开课的课程信息，添加题目配置和题目
*
* <p>
* 添加主表
* 任务一：添加主表
* 任务二：添加到题目配置主表；
* 任务二：也可以添加题目快照（非必选）
*
* @param teacherOpenCourseId 开课ID
* @param courseInfoIdWithQuestionSettingOptions Key：课程名称，Value：题型和题目ID的组合列表
*/
@ -503,18 +522,20 @@ public class TeacherOpenCourseQuestionSettingService extends CoreBaseService<Tea
settingQuery.setTeacherOpenCourseQuestionSettingName(courseInfo.getCourseInfoName());
addSettingByOpenCourse(settingQuery, courseInfoIdPair);
}
} catch (Exception e) { }
} catch (Exception e) {
}
});
}
/**
* 根据开课的课程信息，添加题目配置和题目
*
* <p>
* 添加主表
* 任务一：添加主表
* 任务二：添加到题目配置主表；
* 任务二：也可以添加题目快照（非必选）
*
* @param teacherOpenCourseId 开课ID
* @param courseInfoIdWithQuestionSettingOptions Key：课程名称，Value：题型和题目ID的组合列表
*/
@ -553,7 +574,8 @@ public class TeacherOpenCourseQuestionSettingService extends CoreBaseService<Tea
settingQuery.setTeacherOpenCourseQuestionSettingName(courseInfo.getCourseInfoName());
addSettingBySystemCourse(settingQuery, courseInfoIdPair);
}
} catch (Exception e) { }
} catch (Exception e) {
}
});
}
@ -574,6 +596,7 @@ public class TeacherOpenCourseQuestionSettingService extends CoreBaseService<Tea
/**
* 可以删除子表数据的方法
* 根据名称
*
* @param teacherOpenCourseId
* @param teacherOpenCourseQuestionSettingName （可为空，为空则不指定名称删除）
*/
@ -713,6 +736,7 @@ public class TeacherOpenCourseQuestionSettingService extends CoreBaseService<Tea
/**
* 根据题目配置ID查询当前时间，是否可以参加进行题目测试
*
* @param questionSettingId
* @return
*/
@ -728,6 +752,7 @@ public class TeacherOpenCourseQuestionSettingService extends CoreBaseService<Tea
/**
* 根据题目配置ID查询当前时间，是否可以参加进行题目测试
* 抛出异常
*
* @param questionSettingId
* @return
*/
@ -1003,6 +1028,7 @@ public class TeacherOpenCourseQuestionSettingService extends CoreBaseService<Tea
/**
* 填充选中的题目，和该课程下的总题目
*
* @param list
*/
public void fullQuestionSettingOptions(List<TeacherOpenCourseQuestionSetting> list) {

105
web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionSettingController.java
Unescape Escape View File

@ -1,10 +1,13 @@
package com.ibeetl.jlw.web;
import cn.hutool.core.util.StrUtil;
import cn.jlw.Interceptor.SCoreUser;
import cn.jlw.validate.ValidateConfig;
import com.ibeetl.admin.core.annotation.Function;
import com.ibeetl.admin.core.entity.CoreUser;
import com.ibeetl.admin.core.file.FileService;
import com.ibeetl.admin.core.util.BeanCopyUtil;
import com.ibeetl.admin.core.util.PlatformException;
import com.ibeetl.admin.core.web.JsonResult;
import com.ibeetl.jlw.entity.TeacherOpenCourseQuestionSetting;
import com.ibeetl.jlw.enums.GlobalPushStatusEnum;
@ -22,10 +25,16 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import static cn.jlw.util.CacheUserUtil.getStudent;
import static com.ibeetl.admin.core.util.ExcelUtil.convertData;
import static com.ibeetl.admin.core.util.ExcelUtil.write;
/**
* 题目配置 我的课程-题目-设置 接口
@ -40,9 +49,11 @@ public class TeacherOpenCourseQuestionSettingController{
private static final String API = "/api/teacherOpenCourseQuestionSetting";
@Autowired private TeacherOpenCourseQuestionSettingService teacherOpenCourseQuestionSettingService;
@Autowired
private TeacherOpenCourseQuestionSettingService teacherOpenCourseQuestionSettingService;
@Autowired FileService fileService;
@Autowired
FileService fileService;
/* 前端接口 */
@ -67,6 +78,86 @@ public class TeacherOpenCourseQuestionSettingController{
}
}
@GetMapping(API + "/exportPageList.do")
public void exportPageList(TeacherOpenCourseQuestionSettingQuery condition, HttpServletResponse response, @SCoreUser CoreUser coreUser) throws IOException {
if (null == coreUser) {
throw new PlatformException("请登录后再操作");
} else {
if (condition.getTeacherOpenCourseQuestionSettingType() == null) {
throw new PlatformException("参数错误");
}
if (coreUser.isStudent()) {
condition.setTeacherOpenCourseQuestionSettingPushStatus(GlobalPushStatusEnum.PUSH);
condition.setTeacherOpenCourseQuestionSettingStatus(1);
}
condition.setPage(1);
condition.setLimit(Long.MAX_VALUE);
PageQuery page = condition.getPageQuery();
teacherOpenCourseQuestionSettingService.queryByConditionQuery(page);
String baseName = "";
for (Object o : page.getList()) {
TeacherOpenCourseQuestionSetting setting = (TeacherOpenCourseQuestionSetting) o;
GlobalPushStatusEnum teacherOpenCourseQuestionSettingPushStatus = setting.getTeacherOpenCourseQuestionSettingPushStatus();
setting.set("teacherOpenCourseQuestionSettingPushStatusText",teacherOpenCourseQuestionSettingPushStatus.getText());
}
/** 构建表头 */
Map<String, String> header = new LinkedHashMap<>(11);
switch (condition.getTeacherOpenCourseQuestionSettingType()) {
case EXAM:
header.put("teacherOpenCourseQuestionSettingName", "考试名称");
header.put("teacherOpenCourseQuestionSettingSchoolClassNames", "考试班级");
header.put("teacherOpenCourseQuestionStartTime", "考试开始时间");
header.put("teacherOpenCourseQuestionEndTime", "考试结束时间");
header.put("avgSuccessCount", "平均答对数量");
header.put("avgErrorCount", "平均答错数量");
header.put("avgSuccessRate", "平均正确率");
header.put("avgScore", "平均得分");
header.put("teacherOpenCourseQuestionSettingPushStatusText", "状态");
baseName = "考试记录-导出";
break;
case HOMEWORK_QUESTION:
header.put("teacherOpenCourseQuestionSettingName", "题库作业名称");
header.put("teacherOpenCourseQuestionSettingSchoolClassNames", "考试班级");
header.put("teacherOpenCourseQuestionStartTime", "作业开始时间");
header.put("teacherOpenCourseQuestionEndTime", "作业结束时间");
header.put("avgPassRate", "及格率");
header.put("avgScore", "平均得分");
header.put("teacherOpenCourseQuestionSettingPushStatusText", "状态");
baseName = "题库作业-导出";
break;
case HOMEWORK_FILE:
header.put("teacherOpenCourseQuestionSettingName", "题库作业名称");
header.put("teacherOpenCourseQuestionSettingSchoolClassNames", "作业班级");
header.put("messageAddTime", "作业附件");
header.put("avgScore", "平均得分");
header.put("avgPassRate", "及格率");
header.put("teacherOpenCourseQuestionStartTime", "作业开始时间");
header.put("teacherOpenCourseQuestionEndTime", "作业结束时间");
header.put("teacherOpenCourseQuestionSettingPushStatusText", "状态");
baseName = "附件作业-导出";
break;
default:
throw new PlatformException("参数错误");
}
List<Map<String, Object>> maps = BeanCopyUtil.baseEntity2MapWithParallel(page.getList());
String filename = StrUtil.format("{} {}.xlsx", baseName, System.currentTimeMillis());
write(response, filename, "Sheet1", header.values(), convertData(header.keySet(), maps));
}
}
@GetMapping(API + "/getInfo.do")
public JsonResult<TeacherOpenCourseQuestionSetting> getInfo(TeacherOpenCourseQuestionSettingQuery param, @SCoreUser CoreUser coreUser) {
@ -95,6 +186,7 @@ public class TeacherOpenCourseQuestionSettingController{
/**
* 教师端-根据类型添加作业（支持章节练习、考试、作业等）
*
* @param teacherOpenCourseQuestionSettingQuery
* @param result
* @param coreUser
@ -146,6 +238,7 @@ public class TeacherOpenCourseQuestionSettingController{
/**
* 编辑发布状态
*
* @param ids
* @param pushStatus
* @return
@ -158,6 +251,7 @@ public class TeacherOpenCourseQuestionSettingController{
/**
* 题目配置，统计分析接口
*
* @param teacherOpenCourseId 开课ID
* @param questionSettingId 题目配置ID
* @param questionSettingType 题目配置类型
@ -170,6 +264,7 @@ public class TeacherOpenCourseQuestionSettingController{
/**
* 题目配置，统计分析接口
*
* @param teacherOpenCourseId 开课ID
* @param questionSettingType 题目配置类型
* @return
@ -181,6 +276,7 @@ public class TeacherOpenCourseQuestionSettingController{
/**
* 逻辑删除
*
* @param ids
* @return
*/
@ -192,6 +288,7 @@ public class TeacherOpenCourseQuestionSettingController{
/**
* 真删除
*
* @param ids
* @return
*/
@ -310,6 +407,7 @@ public class TeacherOpenCourseQuestionSettingController{
/**
* 逻辑删除
*
* @param ids
* @return
*/
@ -323,6 +421,7 @@ public class TeacherOpenCourseQuestionSettingController{
/**
* 真删除
*
* @param ids
* @return
*/
@ -336,6 +435,7 @@ public class TeacherOpenCourseQuestionSettingController{
/**
* 编辑发布状态
*
* @param ids
* @param pushStatus
* @return
@ -351,6 +451,7 @@ public class TeacherOpenCourseQuestionSettingController{
/**
* 题目配置，统计分析接口
*
* @param teacherOpenCourseId 开课ID
* @param questionSettingId 题目配置ID
* @param questionSettingType 题目配置类型

Write Preview
Loading…
Cancel
Save