update

examcloud-core-print-provider/src/main/java/cn/com/qmth/examcloud/core/print/api/controller/CourseStatisticController.java

@@ -10,7 +10,7 @@ package cn.com.qmth.examcloud.core.print.api.controller;
 import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
 import cn.com.qmth.examcloud.core.print.common.Result;
 import cn.com.qmth.examcloud.core.print.service.CourseStatisticService;
-import cn.com.qmth.examcloud.core.print.service.bean.coursestatistic.CourseRefreshReq;
+import cn.com.qmth.examcloud.core.print.service.bean.coursestatistic.CourseStatisticRefreshReq;
 import cn.com.qmth.examcloud.core.print.service.bean.coursestatistic.CourseStatisticInfo;
 import cn.com.qmth.examcloud.core.print.service.bean.coursestatistic.CourseStatisticQuery;
 import io.swagger.annotations.Api;
@@ -40,10 +40,10 @@ public class CourseStatisticController extends ControllerSupport {
         return courseStatisticService.getCourseStatisticList(query);
     }
 
-    @PostMapping("/init")
+    @PostMapping("/refresh")
     @ApiOperation(value = "刷新某些课程的统计信息")
-    public Result init(@RequestBody CourseRefreshReq form) {
-        courseStatisticService.initCourseStatistic(form);
+    public Result refresh(@RequestBody CourseStatisticRefreshReq form) {
+        courseStatisticService.refreshCourseStatistic(form);
         return success();
     }
 

examcloud-core-print-provider/src/main/java/cn/com/qmth/examcloud/core/print/api/controller/PrintingProjectStatisticController.java

@@ -37,10 +37,10 @@ public class PrintingProjectStatisticController extends ControllerSupport {
         return printingProjectStatisticService.getPrintingProjectStatistic(orgId, examId);
     }
 
-    @PostMapping("/init/{orgId}/{examId}")
+    @PostMapping("/refresh/{orgId}/{examId}")
     @ApiOperation(value = "刷新某个印刷项目的统计信息")
-    public Result init(@PathVariable Long orgId, @PathVariable Long examId) {
-        printingProjectStatisticService.initPrintingProjectStatistic(orgId, examId);
+    public Result refresh(@PathVariable Long orgId, @PathVariable Long examId) {
+        printingProjectStatisticService.refreshPrintingProjectStatistic(orgId, examId);
         return success();
     }
 

examcloud-core-print-service/src/main/java/cn/com/qmth/examcloud/core/print/service/CourseStatisticService.java

@@ -7,7 +7,7 @@
 
 package cn.com.qmth.examcloud.core.print.service;
 
-import cn.com.qmth.examcloud.core.print.service.bean.coursestatistic.CourseRefreshReq;
+import cn.com.qmth.examcloud.core.print.service.bean.coursestatistic.CourseStatisticRefreshReq;
 import cn.com.qmth.examcloud.core.print.service.bean.coursestatistic.CourseStatisticInfo;
 import cn.com.qmth.examcloud.core.print.service.bean.coursestatistic.CourseStatisticQuery;
 import org.springframework.data.domain.Page;
@@ -28,7 +28,7 @@ public interface CourseStatisticService {
      *
      * @param req 请求表单
      */
-    void initCourseStatistic(CourseRefreshReq req);
+    void refreshCourseStatistic(CourseStatisticRefreshReq req);
 
     /**
      * 初始所有课程的统计信息

examcloud-core-print-service/src/main/java/cn/com/qmth/examcloud/core/print/service/PrintingProjectStatisticService.java

@@ -29,7 +29,7 @@ public interface PrintingProjectStatisticService {
     /**
      * 刷新某个印刷项目的统计信息
      */
-    void initPrintingProjectStatistic(@NotNull Long orgId, @NotNull Long examId);
+    void refreshPrintingProjectStatistic(@NotNull Long orgId, @NotNull Long examId);
 
     /**
      * 初始所有印刷项目的统计信息

examcloud-core-print-service/src/main/java/cn/com/qmth/examcloud/core/print/service/bean/coursestatistic/CourseRefreshReq.java → examcloud-core-print-service/src/main/java/cn/com/qmth/examcloud/core/print/service/bean/coursestatistic/CourseStatisticRefreshReq.java

@@ -16,7 +16,7 @@ import java.util.List;
  * @author: fengdesheng
  * @since: 2018/11/08
  */
-public class CourseRefreshReq implements Serializable {
+public class CourseStatisticRefreshReq implements Serializable {
     private static final long serialVersionUID = 1L;
     /**
      * 学校机构ID

examcloud-core-print-service/src/main/java/cn/com/qmth/examcloud/core/print/service/impl/CourseStatisticServiceImpl.java

@@ -19,10 +19,10 @@ import cn.com.qmth.examcloud.core.print.service.CourseStatisticService;
 import cn.com.qmth.examcloud.core.print.service.PrintingProjectService;
 import cn.com.qmth.examcloud.core.print.service.bean.common.ExamCourseInfo;
 import cn.com.qmth.examcloud.core.print.service.bean.common.ExamInfo;
-import cn.com.qmth.examcloud.core.print.service.bean.coursestatistic.CourseRefreshReq;
 import cn.com.qmth.examcloud.core.print.service.bean.coursestatistic.CourseStatisticConvert;
 import cn.com.qmth.examcloud.core.print.service.bean.coursestatistic.CourseStatisticInfo;
 import cn.com.qmth.examcloud.core.print.service.bean.coursestatistic.CourseStatisticQuery;
+import cn.com.qmth.examcloud.core.print.service.bean.coursestatistic.CourseStatisticRefreshReq;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -78,21 +78,22 @@ public class CourseStatisticServiceImpl implements CourseStatisticService {
     }
 
     @Override
-    public void initCourseStatistic(CourseRefreshReq req) {
+    public void refreshCourseStatistic(CourseStatisticRefreshReq req) {
         Check.isNull(req, "请求参数不能为空！");
         Check.isNull(req.getOrgId(), "学校ID不能为空！");
         Check.isNull(req.getExamId(), "考试ID不能为空！");
 
-        List<CourseRefreshReq.Course> courses = req.getCourses();
+        List<CourseStatisticRefreshReq.Course> courses = req.getCourses();
         if (courses == null || courses.size() == 0) {
             //课程ID和试卷类型未指定时，则不统计
             return;
         }
 
-        for (CourseRefreshReq.Course course : courses) {
+        for (CourseStatisticRefreshReq.Course course : courses) {
             if (course.getCourseId() == null || StringUtils.isBlank(course.getPaperType())) {
                 continue;
             }
+            //按课程和试卷类型逐个更新统计信息
             List<ExamCourseInfo> examCourses = commonService.findExamCourses(req.getOrgId(), req.getExamId(), course.getCourseId(), course.getPaperType());//todo
             this.syncCourseStatisticList(examCourses);
         }
@@ -102,12 +103,13 @@ public class CourseStatisticServiceImpl implements CourseStatisticService {
     public void initAllCourseStatistic() {
         log.debug("initAllCourseStatistic...");
 
-        //只处理已存在印刷项目中的考试
+        //只处理印刷项目中已有的考试
         List<ExamInfo> exams = printingProjectService.getExamList(null);
         if (exams == null || exams.isEmpty()) {
             return;
         }
 
+        //todo 优化
         for (ExamInfo info : exams) {
             List<ExamCourseInfo> examCourses = commonService.findExamCourses(info.getOrgId(), info.getExamId());//todo
             this.syncCourseStatisticList(examCourses);

examcloud-core-print-service/src/main/java/cn/com/qmth/examcloud/core/print/service/impl/PrintingProjectStatisticServiceImpl.java

@@ -56,7 +56,7 @@ public class PrintingProjectStatisticServiceImpl implements PrintingProjectStati
     }
 
     @Override
-    public void initPrintingProjectStatistic(Long orgId, Long examId) {
+    public void refreshPrintingProjectStatistic(Long orgId, Long examId) {
         Check.isNull(orgId, "学校ID不能为空！");
         Check.isNull(examId, "考试ID不能为空！");
 
@@ -77,7 +77,7 @@ public class PrintingProjectStatisticServiceImpl implements PrintingProjectStati
     public void initAllPrintingProjectStatistic() {
         log.debug("initAllPrintingProjectStatistic...");
 
-        //只处理已存在印刷项目中的考试
+        //只处理印刷项目中已有的考试
         List<ExamInfo> exams = printingProjectService.getExamList(null);
         if (exams == null || exams.isEmpty()) {
             return;

examcloud-core-print-starter/src/main/resources/security-exclusions.conf

@@ -12,11 +12,11 @@
 [${$rmp.ctrl.print}/printing/project][/list][POST]
 [${$rmp.ctrl.print}/printing/project][/{id}][POST]
 [${$rmp.ctrl.print}/printing/project][/update][POST]
-[${$rmp.ctrl.print}/printing/project][/all/init][GET]
 [${$rmp.ctrl.print}/printing/project][/exam/list][POST]
+[${$rmp.ctrl.print}/printing/project][/all/init][GET]
 
 [${$rmp.ctrl.print}/printing/project/statistic][/{orgId}/{examId}][POST]
-[${$rmp.ctrl.print}/printing/project/statistic][/init/{orgId}/{examId}][POST]
+[${$rmp.ctrl.print}/printing/project/statistic][/refresh/{orgId}/{examId}][POST]
 [${$rmp.ctrl.print}/printing/project/statistic][/all/init][GET]
 
 [${$rmp.ctrl.print}/project/backup/setting][/{projectId}][POST]
@@ -29,7 +29,7 @@
 [${$rmp.ctrl.print}/project/other/setting][/delete/{id}][POST]
 
 [${$rmp.ctrl.print}/course/statistic][/list][POST]
-[${$rmp.ctrl.print}/course/statistic][/init][POST]
+[${$rmp.ctrl.print}/course/statistic][/refresh][POST]
 [${$rmp.ctrl.print}/course/statistic][/all/init][GET]
 
 [${$rmp.ctrl.print}/course/paper][/list][POST]

examcloud-core-print-starter/src/test/java/cn/com/qmth/examcloud/core/print/test/CourseStatisticServiceTest.java

@@ -8,7 +8,7 @@
 package cn.com.qmth.examcloud.core.print.test;
 
 import cn.com.qmth.examcloud.core.print.service.CourseStatisticService;
-import cn.com.qmth.examcloud.core.print.service.bean.coursestatistic.CourseRefreshReq;
+import cn.com.qmth.examcloud.core.print.service.bean.coursestatistic.CourseStatisticRefreshReq;
 import cn.com.qmth.examcloud.core.print.service.bean.coursestatistic.CourseStatisticInfo;
 import cn.com.qmth.examcloud.core.print.service.bean.coursestatistic.CourseStatisticQuery;
 import org.junit.Test;
@@ -40,14 +40,14 @@ public class CourseStatisticServiceTest extends BaseTest {
 
     @Test
     public void initCourseStatisticTest() throws Exception {
-        CourseRefreshReq req = new CourseRefreshReq();
+        CourseStatisticRefreshReq req = new CourseStatisticRefreshReq();
         req.setOrgId(109L);
         req.setExamId(178L);
-        List<CourseRefreshReq.Course> courses = new ArrayList<>();
-        courses.add(new CourseRefreshReq.Course(262L, "O"));
-        courses.add(new CourseRefreshReq.Course(263L, "O"));
+        List<CourseStatisticRefreshReq.Course> courses = new ArrayList<>();
+        courses.add(new CourseStatisticRefreshReq.Course(262L, "O"));
+        courses.add(new CourseStatisticRefreshReq.Course(263L, "O"));
         req.setCourses(courses);
-        courseStatisticService.initCourseStatistic(req);
+        courseStatisticService.refreshCourseStatistic(req);
 
         //courseStatisticService.initAllCourseStatistic();
         //courseStatisticService.syncCourseNameByCourseId(262L, "测试课程");

examcloud-core-print-starter/src/test/java/cn/com/qmth/examcloud/core/print/test/ProjectStatisticServiceTest.java

@@ -30,7 +30,7 @@ public class ProjectStatisticServiceTest extends BaseTest {
     public void initPrintingProjectStatisticTest() throws Exception {
         Long orgId = 1L;
         Long examId = 1L;
-        printingProjectStatisticService.initPrintingProjectStatistic(orgId, examId);
+        printingProjectStatisticService.refreshPrintingProjectStatistic(orgId, examId);
         //printingProjectStatisticService.initAllPrintingProjectStatistic();
     }