From 6c660ede118b1d53ba5308e09d2b27a018372381 Mon Sep 17 00:00:00 2001 From: Mlxa0324 Date: Tue, 29 Nov 2022 01:05:55 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=88=A4=E6=96=AD=EF=BC=8C?= =?UTF-8?q?=E6=94=BE=E5=9C=A8=E5=85=AC=E5=85=B1=E6=8E=A5=E5=8F=A3=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../codeTemplate/java/controller.java | 2 +- ...TeacherOpenCourseQuestionLogScoreInfo.java | 28 +++++----- .../ResourcesQuestionSnapshotService.java | 10 +--- .../ibeetl/jlw/web/CoreUserWxController.java | 54 +++---------------- .../jlw/web/GeneralQuestionLogController.java | 4 +- .../web/GeneralQuestionSettingController.java | 4 +- ...alResourcesQuestionSnapshotController.java | 2 +- ...OnSimulationTasksAssessmentController.java | 47 +++------------- .../ResourcesQuestionSnapshotController.java | 2 +- .../ibeetl/jlw/web/SchoolClassController.java | 3 +- .../TeacherOpenCourseChatLogController.java | 8 +-- ...OnSimulationTasksAssessmentController.java | 47 +++------------- ...erOpenCourseMergeCourseInfoController.java | 2 +- ...ourseMergeResourcesQuestionController.java | 2 +- ...eacherOpenCourseQuestionLogController.java | 4 +- ...erOpenCourseQuestionSettingController.java | 3 +- 16 files changed, 56 insertions(+), 166 deletions(-) diff --git a/admin-core/src/main/resources/codeTemplate/java/controller.java b/admin-core/src/main/resources/codeTemplate/java/controller.java index 69dfcb38..fca76d82 100644 --- a/admin-core/src/main/resources/codeTemplate/java/controller.java +++ b/admin-core/src/main/resources/codeTemplate/java/controller.java @@ -185,7 +185,7 @@ public class ${entity.name}Controller{ if(result.hasErrors()){ return JsonResult.failMessage(result); }else{ - Assert.notNull(coreUser, "请登录后再操作"); + @if(entity.existAddTime){ ${entity.code}Query.set${upperFirst(entity.addTime)}(new Date()); @} diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseQuestionLogScoreInfo.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseQuestionLogScoreInfo.java index 057d1645..ede1a4e5 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseQuestionLogScoreInfo.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseQuestionLogScoreInfo.java @@ -1,14 +1,12 @@ package com.ibeetl.jlw.entity; import cn.hutool.core.util.NumberUtil; -import com.ibeetl.admin.core.annotation.DictDeep; import com.ibeetl.admin.core.entity.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; import org.beetl.sql.annotation.entity.Auto; import org.beetl.sql.annotation.entity.Table; import org.beetl.sql.fetch.annotation.Fetch; -import org.beetl.sql.fetch.annotation.FetchOne; import org.beetl.sql.fetch.annotation.FetchSql; import java.util.List; @@ -38,9 +36,9 @@ public class TeacherOpenCourseQuestionLogScoreInfo extends BaseEntity { // 学生ID private Long studentId; - @FetchOne("studentId") - @DictDeep - private Student studentInfo; +// @FetchOne("studentId") +// @DictDeep +// private Student studentInfo; /** ========================================================================= */ @@ -56,12 +54,14 @@ public class TeacherOpenCourseQuestionLogScoreInfo extends BaseEntity { @FetchSql("select count(1) from teacher_open_course_question_log t " + "left join resources_question_snapshot ta on ta.resources_question_snapshot_id = t.resources_question_snapshot_id " + - "where t.teacher_open_course_question_log_status = 1 \n" + + "where 1 = 1 " + + "and t.teacher_open_course_question_log_status = 1 \n" + + "and ta.question_status = 1 \n" + "@if(!isEmpty(studentId)) { \n" + "and t.student_id = #studentId# \n" + "@} \n" + "and t.teacher_open_course_question_setting_id = #teacherOpenCourseQuestionSettingId# " + - "and CONCAT(t.teacher_open_course_question_log_answer, ',') = ta.question_answer" + "and (CONCAT(t.teacher_open_course_question_log_answer, ',') = ta.question_answer or t.teacher_open_course_question_log_answer = ta.question_answer)" ) private int correctCount; @@ -69,7 +69,7 @@ public class TeacherOpenCourseQuestionLogScoreInfo extends BaseEntity { @FetchSql("select count(1) from teacher_open_course_question_log t " + "left join resources_question_snapshot ta on ta.resources_question_snapshot_id = t.resources_question_snapshot_id " + "where t.teacher_open_course_question_log_status = 1 \n" + - "@if(!isEmpty(studentId)) { " + + "@if(!isEmpty(studentId)) { \n" + "and t.student_id = #studentId# \n" + "@} \n" + "and t.teacher_open_course_question_setting_id = #teacherOpenCourseQuestionSettingId# " + @@ -94,12 +94,7 @@ public class TeacherOpenCourseQuestionLogScoreInfo extends BaseEntity { // 自动计算得到 private int correctRate; - @FetchSql(value = "SELECT t.*, ta.question_answer, " + - "(CASE " + - "WHEN CONCAT(t.teacher_open_course_question_log_answer, ',') = ta.question_answer THEN " + - "ta.question_score " + - "ELSE 0 END " + - ") AS my_score " + + @FetchSql(value = "SELECT t.* " + "FROM teacher_open_course_question_log t " + "LEFT JOIN resources_question_snapshot ta ON ta.resources_question_snapshot_id = t.resources_question_snapshot_id " + "WHERE t.teacher_open_course_question_log_status = 1 \n" + @@ -108,7 +103,7 @@ public class TeacherOpenCourseQuestionLogScoreInfo extends BaseEntity { "@} \n" + "and t.teacher_open_course_question_setting_id = #teacherOpenCourseQuestionSettingId# " ) - private List questionLogList; + private List questionLogList; public void setCorrectCount(int correctCount) { this.correctCount = correctCount; @@ -130,6 +125,9 @@ public class TeacherOpenCourseQuestionLogScoreInfo extends BaseEntity { */ private void tryCalcCorrectRate() { int sumTotalCount = getCorrectCount() + getWrongCount(); + if (sumTotalCount == 0) { + this.setCorrectRate(0); return; + } if (getQuestionTotalCount() == sumTotalCount) { // 计算正确率, 取小数点后2位数 // 计算规则：正确率 = 正确数量 / (正确数量 + 错误数量) * 100 diff --git a/web/src/main/java/com/ibeetl/jlw/service/ResourcesQuestionSnapshotService.java b/web/src/main/java/com/ibeetl/jlw/service/ResourcesQuestionSnapshotService.java index 41049001..9da3cb5e 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/ResourcesQuestionSnapshotService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/ResourcesQuestionSnapshotService.java @@ -6,7 +6,6 @@ import cn.hutool.core.util.ObjectUtil; import cn.jlw.util.ToolUtils; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.ibeetl.admin.core.entity.CoreUser; import com.ibeetl.admin.core.service.CoreBaseService; import com.ibeetl.admin.core.util.PlatformException; import com.ibeetl.admin.core.web.JsonResult; @@ -43,8 +42,6 @@ import java.util.stream.Collectors; import static cn.hutool.core.util.ArrayUtil.join; import static cn.jlw.util.CacheUserUtil.getStudent; -import static com.ibeetl.admin.core.util.user.CacheUserUtil.getUser; -import static com.ibeetl.admin.core.util.user.CacheUserUtil.getUserId; import static com.ibeetl.jlw.enums.ResourcesQuestionSnapshotFromTypeEnum.CHAPTER_EXERCISE; /** @@ -452,11 +449,8 @@ public class ResourcesQuestionSnapshotService extends CoreBaseService getQuestionTestSimpleInfoDo(@Validated(ValidateConfig.ADD.class) TeacherOpenCourseQuestionTestSimpleInfoDTO dto, @SCoreUser CoreUser coreUser) { - Assert.notNull(coreUser, "请登录后再操作"); + Assert.isTrue(coreUser.isStudent(), "非学生身份，无法获取数据!"); return JsonResult.success(resourcesQuestionSnapshotService.getQuestionTestSimpleInfo(dto.getPageQuery())); } diff --git a/web/src/main/java/com/ibeetl/jlw/web/SchoolClassController.java b/web/src/main/java/com/ibeetl/jlw/web/SchoolClassController.java index e52e4038..38568118 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/SchoolClassController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/SchoolClassController.java @@ -1,6 +1,5 @@ package com.ibeetl.jlw.web; -import cn.hutool.core.lang.Assert; import cn.jlw.Interceptor.SCoreUser; import cn.jlw.validate.ValidateConfig; import com.ibeetl.admin.core.annotation.Function; @@ -64,7 +63,7 @@ public class SchoolClassController{ @GetMapping(API + "/getListWithLogin.do") @ResponseBody public JsonResult> getListWithLogin(SchoolClassQuery param, @SCoreUser CoreUser coreUser) { - Assert.notNull(coreUser, "请登录后再操作"); + Listlist = schoolClassService.getValues(param); return JsonResult.success(list); } diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseChatLogController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseChatLogController.java index afe72a96..d672b09b 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseChatLogController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseChatLogController.java @@ -122,7 +122,7 @@ public class TeacherOpenCourseChatLogController{ if(result.hasErrors()){ return JsonResult.failMessage(result); }else{ - Assert.notNull(coreUser, "请登录后再操作"); + teacherOpenCourseChatLogQuery.setUserId(coreUser.getId()); teacherOpenCourseChatLogQuery.setOrgId(coreUser.getOrgId()); if (ObjectUtil.isNotEmpty(teacher)) { @@ -151,7 +151,7 @@ public class TeacherOpenCourseChatLogController{ if(result.hasErrors()){ return JsonResult.failMessage(result); }else{ - Assert.notNull(coreUser, "请登录后再操作"); + Assert.notNull(student, "该接口仅限学生使用"); TeacherOpenCourseChatLogQuery teacherOpenCourseChatLogQuery = new TeacherOpenCourseChatLogQuery(); @@ -182,7 +182,7 @@ public class TeacherOpenCourseChatLogController{ if(result.hasErrors()){ return JsonResult.failMessage(result); }else{ - Assert.notNull(coreUser, "请登录后再操作"); + Assert.notNull(teacher, "该接口仅限教师使用"); TeacherOpenCourseChatLogQuery teacherOpenCourseChatLogQuery = new TeacherOpenCourseChatLogQuery(); @@ -318,7 +318,7 @@ public class TeacherOpenCourseChatLogController{ if(result.hasErrors()){ return JsonResult.failMessage(result); }else{ - Assert.notNull(coreUser, "请登录后再操作"); + teacherOpenCourseChatLogQuery.setUserId(coreUser.getId()); teacherOpenCourseChatLogQuery.setOrgId(coreUser.getOrgId()); if (ObjectUtil.isNotEmpty(teacher)) { diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseHandsOnSimulationTasksAssessmentController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseHandsOnSimulationTasksAssessmentController.java index 6f4f47a1..c1d9ad45 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseHandsOnSimulationTasksAssessmentController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseHandsOnSimulationTasksAssessmentController.java @@ -1,60 +1,29 @@ package com.ibeetl.jlw.web; import cn.hutool.core.lang.Assert; -import cn.jlw.Interceptor.RFile; import cn.jlw.Interceptor.SCoreUser; -import cn.jlw.Interceptor.GetFile; -import cn.jlw.util.ToolUtils; 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.ConvertUtil; -import com.ibeetl.admin.core.util.PlatformException; -import com.ibeetl.admin.core.util.TimeTool; import com.ibeetl.admin.core.web.JsonResult; +import com.ibeetl.jlw.entity.TeacherOpenCourseHandsOnSimulationTasksAssessment; +import com.ibeetl.jlw.service.TeacherOpenCourseHandsOnSimulationTasksAssessmentService; +import com.ibeetl.jlw.web.query.TeacherOpenCourseHandsOnSimulationTasksAssessmentQuery; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.poi.hssf.usermodel.*; -import org.apache.poi.ss.usermodel.*; -import org.apache.poi.ss.usermodel.Cell; -import org.apache.poi.ss.usermodel.HorizontalAlignment; -import org.apache.poi.ss.usermodel.Row; -import org.apache.poi.ss.usermodel.Sheet; -import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.beetl.sql.core.engine.PageQuery; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.servlet.ModelAndView; - +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import org.springframework.validation.annotation.Validated; - -import com.ibeetl.admin.console.web.dto.DictExcelImportData; -import com.ibeetl.admin.console.web.query.UserQuery; -import com.ibeetl.admin.core.annotation.Function; -import com.ibeetl.jlw.entity.*; -import com.ibeetl.jlw.service.*; -import com.ibeetl.jlw.web.query.*; +import org.springframework.web.servlet.ModelAndView; -import org.springframework.beans.factory.annotation.Autowired; -import javax.servlet.http.HttpServletRequest; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.File; -import java.io.FileInputStream; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.Date; import java.util.List; -import java.util.Map; -import java.math.BigDecimal; - -import org.springframework.beans.factory.annotation.Autowired; import static com.ibeetl.admin.core.util.user.CacheUserUtil.getUser; @@ -177,7 +146,7 @@ public class TeacherOpenCourseHandsOnSimulationTasksAssessmentController{ if(result.hasErrors()){ return JsonResult.failMessage(result); }else{ - Assert.notNull(coreUser, "请登录后再操作"); + teacherOpenCourseHandsOnSimulationTasksAssessmentQuery.setUserId(coreUser.getId()); teacherOpenCourseHandsOnSimulationTasksAssessmentQuery.setOrgId(coreUser.getOrgId()); return teacherOpenCourseHandsOnSimulationTasksAssessmentService.add(teacherOpenCourseHandsOnSimulationTasksAssessmentQuery); diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeCourseInfoController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeCourseInfoController.java index 25e152ec..7f1e0dea 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeCourseInfoController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeCourseInfoController.java @@ -171,7 +171,7 @@ public class TeacherOpenCourseMergeCourseInfoController{ if(result.hasErrors()){ return JsonResult.failMessage(result); }else{ - Assert.notNull(coreUser, "请登录后再操作"); + teacherOpenCourseMergeCourseInfoQuery.setUserId(coreUser.getId()); teacherOpenCourseMergeCourseInfoQuery.setOrgId(coreUser.getOrgId()); return teacherOpenCourseMergeCourseInfoService.addCourseAndQuestionWithQuestionSnap(teacherOpenCourseMergeCourseInfoQuery, null, new HashMap<>()); diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeResourcesQuestionController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeResourcesQuestionController.java index d273a9fb..dacb7974 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeResourcesQuestionController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeResourcesQuestionController.java @@ -478,7 +478,7 @@ public class TeacherOpenCourseMergeResourcesQuestionController extends BaseContr */ @PostMapping(API + "/questionTypeGroupInfo.do") public JsonResult questionTypeGroupInfo(Long teacherOpenCourseId, @SCoreUser CoreUser coreUser) { - Assert.notNull(coreUser, "请登录后再操作"); + return JsonResult.success(teacherOpenCourseMergeResourcesQuestionService.getGroupQuestionTypeCount(teacherOpenCourseId)); } diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionLogController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionLogController.java index b70ef138..64eacbf5 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionLogController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionLogController.java @@ -119,7 +119,7 @@ public class TeacherOpenCourseQuestionLogController { @PostMapping(API + "/addQuestionLog.do") @ResponseBody public JsonResult addQuestionLog(@RequestBody QuestionLogAddDTO questionLogAddDTO, @SCoreUser CoreUser coreUser) { - Assert.notNull(coreUser, "请登录后再操作"); + Assert.isTrue(coreUser.isStudent(), "非学生身份，无法提交!"); teacherOpenCourseQuestionLogService.insertQuestionLog(questionLogAddDTO); return JsonResult.success(); @@ -138,7 +138,7 @@ public class TeacherOpenCourseQuestionLogController { String teacherOpenCourseQuestionLogIds, BigDecimal score, @RequestParam(required = false) String reply, @SCoreUser CoreUser coreUser) { - Assert.notNull(coreUser, "请登录后再操作"); + teacherOpenCourseQuestionLogService.manualModifyQuestionScores(teacherOpenCourseQuestionLogIds, score, reply); return JsonResult.success(); } diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionSettingController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionSettingController.java index 2e5217ae..ccce8b7a 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionSettingController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionSettingController.java @@ -1,6 +1,5 @@ package com.ibeetl.jlw.web; -import cn.hutool.core.lang.Assert; import cn.jlw.Interceptor.SCoreUser; import cn.jlw.validate.ValidateConfig; import com.ibeetl.admin.core.annotation.Function; @@ -90,7 +89,7 @@ public class TeacherOpenCourseQuestionSettingController{ if (result.hasErrors()) { return JsonResult.failMessage(result); } - Assert.notNull(coreUser, "请登录后再操作"); + teacherOpenCourseQuestionSettingQuery.setUserId(coreUser.getId()); teacherOpenCourseQuestionSettingQuery.setOrgId(coreUser.getOrgId()); teacherOpenCourseQuestionSettingService.addSettingByOpenCourse(teacherOpenCourseQuestionSettingQuery, new HashMap<>(1));