wangliang@qmth.com.cn %!s(int64=4) %!d(string=hai) anos
pai
achega
e6aa0616d9

+ 1 - 1
distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/TBTaskServiceImpl.java

@@ -341,7 +341,7 @@ public class TBTaskServiceImpl extends ServiceImpl<TBTaskMapper, TBTask> impleme
             for (TBTask tbTask : tbTasks) {
                 if (tbTask.getResetCount() < dictionaryConfig.sysDomain().getAutoCreatePdfResetMaxCount()) {
                     Map<String, Object> map = new HashMap<>();
-                    tbTask.setVersion(new AtomicInteger(tbTask.getVersion()).incrementAndGet());
+//                    tbTask.setVersion(new AtomicInteger(tbTask.getVersion()).incrementAndGet());
                     if (Objects.nonNull(tbTask.getRemark())) {
                         JSONArray jsonArray = JSONArray.parseArray(tbTask.getRemark());
                         ArraysParams arraysParams = new ArraysParams(jsonArray.toArray(new Long[jsonArray.size()]));

+ 4 - 4
distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/execute/AsyncCreatePdfTempleteService.java

@@ -61,10 +61,10 @@ public class AsyncCreatePdfTempleteService extends AsyncCreateTaskTemplete {
             log.error("请求出错", e);
             stringJoinerSummary.add(MessageFormat.format("{0}{1}{2}{3}", DateUtil.format(new Date(), SystemConstant.DEFAULT_DATE_PATTERN), EXCEPTION_TITLE, EXCEPTION_DATA, e.getMessage()));
             tbTask.setResult(TaskResultEnum.ERROR);
-            TBTask dbTask = tbTaskService.getById(tbTask.getId());
-            if (tbTask.getVersion() == dbTask.getVersion()) {
-                tbTask.setResetCount(new AtomicInteger(tbTask.getResetCount()).incrementAndGet());
-            }
+//            TBTask dbTask = tbTaskService.getById(tbTask.getId());
+//            if (tbTask.getVersion() == dbTask.getVersion()) {
+//                tbTask.setResetCount(new AtomicInteger(tbTask.getResetCount()).incrementAndGet());
+//            }
             if (e instanceof ApiException) {
                 ResultUtil.error((ApiException) e, e.getMessage());
             } else {

+ 4 - 4
distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/importData/AsyncImportTaskTemplete.java

@@ -140,10 +140,10 @@ public abstract class AsyncImportTaskTemplete {
             stringJoinerSummary.add(MessageFormat.format("{0}{1}{2}{3}", DateUtil.format(new Date(), SystemConstant.DEFAULT_DATE_PATTERN), EXCEPTION_CREATE_TXT_TITLE, EXCEPTION_DATA, e.getMessage()));
             tbTask.setSummary(stringJoinerSummary.toString());
             tbTask.setResult(TaskResultEnum.ERROR);
-            TBTask dbTask = tbTaskService.getById(tbTask.getId());
-            if (tbTask.getVersion() == dbTask.getVersion()) {
-                tbTask.setResetCount(new AtomicInteger(tbTask.getResetCount()).incrementAndGet());
-            }
+//            TBTask dbTask = tbTaskService.getById(tbTask.getId());
+//            if (tbTask.getVersion() == dbTask.getVersion()) {
+//                tbTask.setResetCount(new AtomicInteger(tbTask.getResetCount()).incrementAndGet());
+//            }
             if (e instanceof ApiException) {
                 ResultUtil.error((ApiException) e, e.getMessage());
             } else {

+ 1 - 1
distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/service/impl/TaskLogicServiceImpl.java

@@ -359,7 +359,7 @@ public class TaskLogicServiceImpl implements TaskLogicService {
                                 }
                                 paperPdfList.addAll(paperPdfTempList);
                                 examStudentPdfList.addAll(examStudentTempPdfList);
-                                examStudentService.saveOrUpdateBatch(examStudentList);
+//                                examStudentService.saveOrUpdateBatch(examStudentList);
                                 jsonObject.put("card", jsonArray);
                                 examCardDetail.setAttachmentId(jsonObject.toJSONString());
                             }

+ 1 - 1
distributed-print/src/main/java/com/qmth/distributed/print/api/TBTaskController.java

@@ -82,7 +82,7 @@ public class TBTaskController {
     public Result resetCreatePdf(@ApiParam(value = "任务id", required = true) @RequestParam String id) throws IOException {
         Long taskId = Long.parseLong(id);
         TBTask tbTask = tbTaskService.getById(taskId);
-        tbTask.setVersion(new AtomicInteger(tbTask.getVersion()).incrementAndGet());
+//        tbTask.setVersion(new AtomicInteger(tbTask.getVersion()).incrementAndGet());
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         Map<String, Object> map = new HashMap<>();
         if (Objects.nonNull(tbTask.getRemark())) {