deason 6 vuotta sitten
vanhempi
commit
0e3feb3176

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

@@ -10,14 +10,17 @@ 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.CourseStatisticRefreshReq;
 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 io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import static cn.com.qmth.examcloud.core.print.common.Result.success;
 
@@ -47,10 +50,4 @@ public class CourseStatisticController extends ControllerSupport {
         return success();
     }
 
-    @GetMapping("/all/init")
-    public Result init() {
-        courseStatisticService.initAllCourseStatistic();
-        return success();
-    }
-
 }

+ 0 - 6
examcloud-core-print-provider/src/main/java/cn/com/qmth/examcloud/core/print/api/controller/PrintingProjectController.java

@@ -58,12 +58,6 @@ public class PrintingProjectController extends ControllerSupport {
         return success();
     }
 
-    @GetMapping("/all/init")
-    public Result initAllData() {
-        printingProjectService.initAllPrintingProject();
-        return success();
-    }
-
     @PostMapping("/org/list")
     @ApiOperation(value = "获取印刷学校列表")
     public List<OrgInfo> getOrgList() {

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

@@ -14,7 +14,10 @@ import cn.com.qmth.examcloud.core.print.service.bean.printingprojectstatistic.Pr
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import static cn.com.qmth.examcloud.core.print.common.Result.success;
 
@@ -44,10 +47,4 @@ public class PrintingProjectStatisticController extends ControllerSupport {
         return success();
     }
 
-    @GetMapping("/all/init")
-    public Result init() {
-        printingProjectStatisticService.initAllPrintingProjectStatistic();
-        return success();
-    }
-
 }

+ 5 - 1
examcloud-core-print-starter/src/main/java/cn/com/qmth/examcloud/core/print/config/StatisticScheduler.java

@@ -14,7 +14,6 @@ import cn.com.qmth.examcloud.core.print.service.PrintingProjectStatisticService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 import java.io.Serializable;
@@ -37,11 +36,16 @@ public class StatisticScheduler implements Serializable {
     //@Scheduled(cron = "0 1/1 * * * ?")
     public void execute() throws Exception {
         Date start = new Date();
+
+        //初始所有印刷项目的基本信息
         printingProjectService.initAllPrintingProject();
 
+        //初始所有课程的统计信息
         courseStatisticService.initAllCourseStatistic();
 
+        //初始所有印刷项目的统计信息
         printingProjectStatisticService.initAllPrintingProjectStatistic();
+
         log.info("统计耗时:" + DateUtils.diff(start, new Date()));
     }
 

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

@@ -5,48 +5,41 @@
 [/swagger-resources][/configuration/ui][GET]
 [/swagger-resources][/configuration/security][GET]
 [][${springfox.documentation.swagger.v2.path:/v2/api-docs}][GET]
-
 [${$rmp.ctrl.print}/common][/upload][POST]
 [${$rmp.ctrl.print}/common][/download][GET]
 
+[${$rmp.ctrl.print}/course/paper][/list][POST]
+[${$rmp.ctrl.print}/course/paper][/save][POST]
+[${$rmp.ctrl.print}/course/paper][/allot/{courseStatisticId}/{coursePaperId}][POST]
+[${$rmp.ctrl.print}/course/paper][/allot/all/{orgId}/{examId}][POST]
+[${$rmp.ctrl.print}/course/paper][/total/{orgId}/{examId}][POST]
+[${$rmp.ctrl.print}/course/paper][/check/structure/{orgId}/{examId}/{paperId}][POST]
+[${$rmp.ctrl.print}/course/paper][/export/batch][GET]
+[${$rmp.ctrl.print}/course/paper][/export/all][GET]
+
 [${$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][/org/list][POST]
 [${$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][/refresh/{orgId}/{examId}][POST]
-[${$rmp.ctrl.print}/printing/project/statistic][/all/init][GET]
+[${$rmp.ctrl.print}/course/statistic][/list][POST]
+[${$rmp.ctrl.print}/course/statistic][/refresh][POST]
 
 [${$rmp.ctrl.print}/project/backup/setting][/{projectId}][POST]
 [${$rmp.ctrl.print}/project/backup/setting][/save][POST]
 [${$rmp.ctrl.print}/project/backup/setting][/delete/{projectId}][POST]
-
 [${$rmp.ctrl.print}/project/other/setting][/list][POST]
 [${$rmp.ctrl.print}/project/other/setting][/{id}][POST]
 [${$rmp.ctrl.print}/project/other/setting][/save][POST]
 [${$rmp.ctrl.print}/project/other/setting][/delete/{id}][POST]
 
-[${$rmp.ctrl.print}/course/statistic][/list][POST]
-[${$rmp.ctrl.print}/course/statistic][/refresh][POST]
-[${$rmp.ctrl.print}/course/statistic][/all/init][GET]
-
-[${$rmp.ctrl.print}/course/paper][/list][POST]
-[${$rmp.ctrl.print}/course/paper][/save][POST]
-[${$rmp.ctrl.print}/course/paper][/allot/{courseStatisticId}/{coursePaperId}][POST]
-[${$rmp.ctrl.print}/course/paper][/allot/all/{orgId}/{examId}][POST]
-[${$rmp.ctrl.print}/course/paper][/total/{orgId}/{examId}][POST]
-[${$rmp.ctrl.print}/course/paper][/check/structure/{orgId}/{examId}/{paperId}][POST]
-[${$rmp.ctrl.print}/course/paper][/export/batch][GET]
-[${$rmp.ctrl.print}/course/paper][/export/all][GET]
-
-[${$rmp.ctrl.print}/project/template][/{orgId}/{examId}][POST]
-[${$rmp.ctrl.print}/project/template][/save][POST]
-[${$rmp.ctrl.print}/project/template][/{id}][POST]
-
 [${$rmp.ctrl.print}/examStructure][/list][POST]
 [${$rmp.ctrl.print}/examStructure][/{orgId}/{examId}][POST]
 [${$rmp.ctrl.print}/examStructure][/save][POST]
 [${$rmp.ctrl.print}/examStructure][/clone][POST]
-[${$rmp.ctrl.print}/examStructure][/delete/{ids}][POST]
+[${$rmp.ctrl.print}/examStructure][/delete/{ids}][POST]
+[${$rmp.ctrl.print}/project/template][/{orgId}/{examId}][POST]
+[${$rmp.ctrl.print}/project/template][/save][POST]
+[${$rmp.ctrl.print}/project/template][/{id}][POST]