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

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ClientServiceImpl.java

@@ -145,7 +145,7 @@ public class ClientServiceImpl implements ClientService {
             throw ExceptionResultEnum.ERROR.exception("打印员不能为空");
         }
         ExamDetail examDetail = examDetailService.getById(examDetailId);
-        if(StringUtils.isNotBlank(examDetail.getPrintUser()) && !examDetail.getPrintUser().equals(printUser)){
+        if(isPrint && StringUtils.isNotBlank(examDetail.getPrintUser()) && !examDetail.getPrintUser().equals(printUser)){
             throw ExceptionResultEnum.ERROR.exception("该任务已被["+printUser+"]占用");
         }
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ExamTaskDetailServiceImpl.java

@@ -68,20 +68,19 @@ public class ExamTaskDetailServiceImpl extends ServiceImpl<ExamTaskDetailMapper,
     @Autowired
     private ExamTaskPaperLogService examTaskPaperLogService;
 
+    @Transactional
     @Override
-    public boolean enable(ExamTaskDetail examTaskDetail) throws IOException {
+    public boolean enable(ExamTaskDetail examTaskDetail) {
+        // 正在生成pdf不能禁用
+
+        // 禁用，解决试卷关联关系，并且解除生成pdf绑定
+        if (!examTaskDetail.getEnable()) {
+
+        }
         UpdateWrapper<ExamTaskDetail> updateWrapper = new UpdateWrapper<>();
         updateWrapper.lambda().set(ExamTaskDetail::getEnable, examTaskDetail.getEnable()).eq(ExamTaskDetail::getExamTaskId, examTaskDetail.getId());
         this.update(updateWrapper);
 
-        // 启用，触发考场生成pdf
-        if (examTaskDetail.getEnable()) {
-            SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-            ExamTask examTask = examTaskService.getById(examTaskDetail.getExamTaskId());
-            // 校验是否可以提交打印状态
-            commonService.checkData(examTask.getSchoolId(), examTask.getCourseCode(), examTask.getPaperNumber(), sysUser);
-        }
-
         return true;
     }
 

distributed-print/src/main/java/com/qmth/distributed/print/api/ExamTaskController.java

@@ -451,6 +451,13 @@ public class ExamTaskController {
     @RequestMapping(value = "/paper_enable", method = RequestMethod.POST)
     public Result taskPaperEnable(@RequestBody ExamTaskDetail examTaskDetail) throws IOException {
         boolean isSuccess = examTaskDetailService.enable(examTaskDetail);
+        // 启用，触发考场生成pdf
+        if(examTaskDetail.getEnable()){
+            SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
+            ExamTask examTask = examTaskService.getById(examTaskDetail.getExamTaskId());
+            // 校验是否可以提交打印状态
+            commonService.checkData(examTask.getSchoolId(), examTask.getCourseCode(), examTask.getPaperNumber(), sysUser);
+        }
         return ResultUtil.ok(isSuccess);
     }
 

distributed-print/src/main/resources/application.properties

@@ -65,13 +65,13 @@ org.center.orgQueryApi=/api/open/org/query
 #com.qmth.api.uri-prefix=/aaa
 #\u7EDF\u8BA1\u9875\u9762\u914D\u7F6E
 com.qmth.api.metrics-endpoint=/metrics-count
-com.qmth.api.global-auth=true
-#com.qmth.api.global-strict=true
+#com.qmth.api.global-auth=false
+#com.qmth.api.global-strict=false
 #com.qmth.api.global-rate-limit=1/5s
 
 #token\u8D85\u65F6\u914D\u7F6E
-com.qmth.api.auth.time-max-ahead=-5
-com.qmth.api.auth.time-max-delay=30
+com.qmth.api.auth.time-max-ahead=-10000
+com.qmth.api.auth.time-max-delay=10000
 
 #\u7F13\u5B58\u65F6\u95F4
 com.qmth.cache.expire-after-write=8h