update

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

@@ -3,6 +3,7 @@ package com.qmth.distributed.print.business.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.qmth.distributed.print.business.bean.result.TaskListResult;
+import com.qmth.distributed.print.business.entity.SysUser;
 import com.qmth.distributed.print.business.entity.TBTask;
 import com.qmth.distributed.print.business.enums.TaskResultEnum;
 import com.qmth.distributed.print.business.enums.TaskStatusEnum;
@@ -88,7 +89,15 @@ public interface TBTaskService extends IService<TBTask> {
      */
     public Map<String, Object> saveTask(TaskTypeEnum taskTypeEnum, Long printPlanId);
 
-
+    /**
+     * 保存任务
+     *
+     * @param taskTypeEnum
+     * @param printPlanId
+     * @param sysUser
+     * @return
+     */
+    public Map<String, Object> saveTask(TaskTypeEnum taskTypeEnum, Long printPlanId, SysUser sysUser);
 
     /**
      * 查询任务列表

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

@@ -62,7 +62,7 @@ public class TBTaskServiceImpl extends ServiceImpl<TBTaskMapper, TBTask> impleme
                 throw ExceptionResultEnum.ATTACHMENT_ERROR.exception();
             } else {
                 map = new HashMap<>();
-                TBTask tbTask = saveTaskCommon(basicAttachment, taskTypeEnum, map);
+                TBTask tbTask = saveTaskCommon(basicAttachment, taskTypeEnum, map, null);
                 this.save(tbTask);
             }
         } catch (Exception e) {
@@ -85,7 +85,7 @@ public class TBTaskServiceImpl extends ServiceImpl<TBTaskMapper, TBTask> impleme
         Map<String, Object> map = null;
         try {
             map = new HashMap<>();
-            TBTask tbTask = saveTaskCommon(null, taskTypeEnum, map);
+            TBTask tbTask = saveTaskCommon(null, taskTypeEnum, map, null);
             this.save(tbTask);
         } catch (Exception e) {
             log.error("请求出错", e);
@@ -109,7 +109,7 @@ public class TBTaskServiceImpl extends ServiceImpl<TBTaskMapper, TBTask> impleme
                 throw ExceptionResultEnum.ATTACHMENT_ERROR.exception();
             } else {
                 map = new HashMap<>();
-                TBTask tbTask = saveTaskCommon(basicAttachment, taskTypeEnum, map);
+                TBTask tbTask = saveTaskCommon(basicAttachment, taskTypeEnum, map, null);
                 tbTask.setPrintPlanId(printPlanId);
                 this.save(tbTask);
             }
@@ -179,7 +179,33 @@ public class TBTaskServiceImpl extends ServiceImpl<TBTaskMapper, TBTask> impleme
     public Map<String, Object> saveTask(TaskTypeEnum taskTypeEnum, Long printPlanId) {
         Map<String, Object> map = new HashMap<>();
         try {
-            TBTask tbTask = saveTaskCommon(null, taskTypeEnum, map);
+            TBTask tbTask = saveTaskCommon(null, taskTypeEnum, map, null);
+            tbTask.setPrintPlanId(printPlanId);
+            this.save(tbTask);
+        } catch (Exception e) {
+            log.error("请求出错", e);
+            if (e instanceof ApiException) {
+                ResultUtil.error((ApiException) e, e.getMessage());
+            } else {
+                ResultUtil.error(e.getMessage());
+            }
+        }
+        return map;
+    }
+
+    /**
+     * 保存任务
+     *
+     * @param taskTypeEnum
+     * @param printPlanId
+     * @param sysUser
+     * @return
+     */
+    @Override
+    public Map<String, Object> saveTask(TaskTypeEnum taskTypeEnum, Long printPlanId, SysUser sysUser) {
+        Map<String, Object> map = new HashMap<>();
+        try {
+            TBTask tbTask = saveTaskCommon(null, taskTypeEnum, map, sysUser);
             tbTask.setPrintPlanId(printPlanId);
             this.save(tbTask);
         } catch (Exception e) {
@@ -213,10 +239,11 @@ public class TBTaskServiceImpl extends ServiceImpl<TBTaskMapper, TBTask> impleme
      *
      * @param basicAttachment
      * @param taskTypeEnum
+     * @param sysUser
      * @return
      */
-    public TBTask saveTaskCommon(BasicAttachment basicAttachment, TaskTypeEnum taskTypeEnum, Map map) {
-        SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
+    public TBTask saveTaskCommon(BasicAttachment basicAttachment, TaskTypeEnum taskTypeEnum, Map map, SysUser sysUser) {
+        SysUser requestUser = Objects.nonNull(sysUser) ? sysUser : (SysUser) ServletUtil.getRequestUser();
 
         TBTask tbTask = new TBTask(taskTypeEnum,
                 TaskStatusEnum.INIT,