Merge branch 'dev'

update

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

@@ -9,6 +9,7 @@ import com.qmth.distributed.print.business.entity.TBTask;
 import com.qmth.distributed.print.business.enums.TaskResultEnum;
 import com.qmth.distributed.print.business.enums.TaskStatusEnum;
 import com.qmth.distributed.print.business.enums.TaskTypeEnum;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
@@ -139,4 +140,10 @@ public interface TBTaskService extends IService<TBTask> {
      * @return
      */
     public boolean countByPrintPlanIdAndEntityId(Long schoolId, Long printPlanId, List<Long> entityIds);
+
+    /**
+     * 更新任务状态
+     */
+    @Async
+    public void updateStatus();
 }

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

@@ -1,6 +1,7 @@
 package com.qmth.distributed.print.business.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.boot.api.exception.ApiException;
@@ -294,6 +295,20 @@ public class TBTaskServiceImpl extends ServiceImpl<TBTaskMapper, TBTask> impleme
         return this.count(tbTaskQueryWrapper) == 0 ? true : false;
     }
 
+    /**
+     * 更新任务状态
+     */
+    @Override
+    @Transactional
+    public void updateStatus() {
+        UpdateWrapper<TBTask> tbTaskQueryWrapper = new UpdateWrapper<>();
+        tbTaskQueryWrapper.lambda().set(TBTask::getStatus, TaskStatusEnum.FINISH)
+                .set(TBTask::getSummary, "系统提交:网络异常或程序异常中断!")
+                .set(TBTask::getResult, TaskResultEnum.ERROR)
+                .isNotNull(TBTask::getStatus).ne(TBTask::getStatus, TaskStatusEnum.FINISH);
+        this.update(tbTaskQueryWrapper);
+    }
+
     /**
      * 保存task
      *

distributed-print/src/main/java/com/qmth/distributed/print/start/StartRunning.java

@@ -1,6 +1,7 @@
 package com.qmth.distributed.print.start;
 
 import com.qmth.distributed.print.business.service.OrgCenterDataDisposeService;
+import com.qmth.distributed.print.business.service.TBTaskService;
 import com.qmth.distributed.print.common.contant.SystemConstant;
 import com.qmth.distributed.print.task.enums.JobEnum;
 import com.qmth.distributed.print.task.job.TimedSyncSchoolJob;
@@ -31,12 +32,17 @@ public class StartRunning implements CommandLineRunner {
     @Resource
     private OrgCenterDataDisposeService orgCenterDataDisposeService;
 
+    @Resource
+    TBTaskService taskService;
+
     @Override
     public void run(String... args) throws Exception {
         log.info("服务器启动时执行 start");
         SystemConstant.initTempFiles();
         orgCenterDataDisposeService.updateSchoolInfo();
 
+        taskService.updateStatus();
+
         log.info("增加学校信息同步定时任务 start");
         Map schoolJobMap = new HashMap();
         schoolJobMap.computeIfAbsent("name", v -> TimedSyncSchoolJob.class.getName());