Merge branch 'dev_v2.1.0' into release_v2.1.0

merge

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/service/impl/AnalyzeForReportServiceImpl.java

@@ -1,6 +1,7 @@
 package com.qmth.teachcloud.report.business.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.qmth.teachcloud.common.contant.SpringContextHolder;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.SysOrg;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
@@ -348,6 +349,9 @@ public class AnalyzeForReportServiceImpl implements AnalyzeForReportService {
                 long sameCount = dataSource.stream().filter(e -> e.getTotalScore().compareTo(totalScore) == 0).count(); // 和我相同的人数
                 int totalCount = dataSource.size(); //总人数
                 // 标准回归系数
+                if (standardDeviation.compareTo(BigDecimal.ZERO) == 0){
+                    standardDeviation = BigDecimal.valueOf(0.001);
+                }
                 BigDecimal standardizedCoefficients = (taExamCourseRecord.getAssignedScore().subtract(avgScore)).divide(standardDeviation, 4, BigDecimal.ROUND_HALF_UP);
 
                 int percentGrade = this.handlePercentGrade(BigDecimal.valueOf(lowCount), BigDecimal.valueOf(sameCount), BigDecimal.valueOf(totalCount));
@@ -1476,19 +1480,20 @@ public class AnalyzeForReportServiceImpl implements AnalyzeForReportService {
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void dataCalculate(Long examId,String courseCode) throws Exception {
-        this.buildAnalyzeExamCourse(examId,courseCode);
-        this.buildAnalyzeExamCourseRecord(examId, courseCode);
-        this.buildAnalyzeExamCourseCollegeInspect(examId, courseCode);
-        this.buildAnalyzeExamCourseClazz(examId, courseCode);
-        this.AnalyzePointScoreRate(examId, courseCode);
-        this.buildAnalyzeExamCourseCollegeInspectDio(examId, courseCode);
-        this.buildAnalyzeExamCourseTeacherDio(examId, courseCode);
-        this.buildAnalyzePaperStruct(examId, courseCode);
-        this.buildExamPaperDifficult(examId, courseCode);
-        this.buildExamPaperTeacherDifficult(examId, courseCode);
-        this.buildAnalyzeExamTotal(examId);
-        this.buildAnalyzeExamCourseCollegeTeacher(examId, courseCode);
-        this.buildAnalyzeExamCourseTeacher(examId, courseCode);
+        AnalyzeForReportService analyzeForReportService = SpringContextHolder.getBean(AnalyzeForReportService.class);
+        analyzeForReportService.buildAnalyzeExamCourse(examId,courseCode);
+        analyzeForReportService.buildAnalyzeExamCourseRecord(examId, courseCode);
+        analyzeForReportService.buildAnalyzeExamCourseCollegeInspect(examId, courseCode);
+        analyzeForReportService.buildAnalyzeExamCourseClazz(examId, courseCode);
+        analyzeForReportService.AnalyzePointScoreRate(examId, courseCode);
+        analyzeForReportService.buildAnalyzeExamCourseCollegeInspectDio(examId, courseCode);
+        analyzeForReportService.buildAnalyzeExamCourseTeacherDio(examId, courseCode);
+        analyzeForReportService.buildAnalyzePaperStruct(examId, courseCode);
+        analyzeForReportService.buildExamPaperDifficult(examId, courseCode);
+        analyzeForReportService.buildExamPaperTeacherDifficult(examId, courseCode);
+        analyzeForReportService.buildAnalyzeExamTotal(examId);
+        analyzeForReportService.buildAnalyzeExamCourseCollegeTeacher(examId, courseCode);
+        analyzeForReportService.buildAnalyzeExamCourseTeacher(examId, courseCode);
     }
 
     @Override

teachcloud-report/src/main/java/com/qmth/teachcloud/report/api/CourseController.java

@@ -221,7 +221,9 @@ public class CourseController {
             @ApiParam(value = "科目编码", required = true) @RequestParam String courseCode,
             @ApiParam(value = "赋分系数", required = true) @RequestParam BigDecimal coefficient) {
 
-
+        if (coefficient.compareTo(BigDecimal.ONE) == 0){
+            throw ExceptionResultEnum.ERROR.exception("赋分系数有误，当赋分系数为1时所有学生成绩均为满分 异常");
+        }
         Map<String, Object> map = tbTaskService.saveTask(TaskTypeEnum.DATA_CALCULATE);
         map.put("examId", examId);
         map.put("courseCode", courseCode);

teachcloud-report/src/main/resources/application-dev.properties

@@ -13,7 +13,7 @@ spring.application.name=teachcloud-report
 db.host=192.168.10.136
 #db.host=localhost
 db.port=3306
-db.name=teachcloud-report-617
+db.name=teachcloud-report
 db.username=root
 db.password=Qmth87863577!
 #db.password=123456789
@@ -57,7 +57,7 @@ sys.config.adminLogoUrl=http://qmth-test.oss-cn-shenzhen.aliyuncs.com/frontend/w
 #sys.config.htmlToPdfUrl=/usr/local/bin/wkhtmltopdf
 #sys.config.autoCreatePdfResetMaxCount=5
 sys.config.threadPoolCoreSize=1
-sys.config.customThreadPoolCoreSize=false
+sys.config.customThreadPoolCoreSize=true
 sys.config.sessionActive=1h
 sys.config.reportUrl=http://localhost:9099/#/student-report/
 sys.config.loginAuthenUrl=http://localhost:9099/#/login-authen/

teachcloud-report/src/main/resources/application-release.properties

@@ -55,7 +55,7 @@ sys.config.adminLogoUrl=http://qmth-test.oss-cn-shenzhen.aliyuncs.com/frontend/w
 #sys.config.htmlToPdfUrl=/usr/local/bin/wkhtmltopdf
 #sys.config.autoCreatePdfResetMaxCount=5
 sys.config.threadPoolCoreSize=1
-sys.config.customThreadPoolCoreSize=false
+sys.config.customThreadPoolCoreSize=true
 sys.config.sessionActive=1h
 sys.config.reportUrl=https://wdfx.qmth.com.cn/#/student-report/
 sys.config.loginAuthenUrl=https://wdfx.qmth.com.cn/#/login-authen/

teachcloud-report/src/main/resources/application-test.properties

@@ -55,7 +55,7 @@ sys.config.adminLogoUrl=http://qmth-test.oss-cn-shenzhen.aliyuncs.com/frontend/w
 #sys.config.htmlToPdfUrl=/usr/local/bin/wkhtmltopdf
 #sys.config.autoCreatePdfResetMaxCount=5
 sys.config.threadPoolCoreSize=1
-sys.config.customThreadPoolCoreSize=false
+sys.config.customThreadPoolCoreSize=true
 sys.config.sessionActive=1h
 sys.config.reportUrl=http://192.168.10.136:7005/#/student-report/
 sys.config.loginAuthenUrl=http://192.168.10.136:7005/#/login-authen/