20210729修改查询任务

common/src/main/java/com/ccsens/common/bean/dto/CPluginDto.java

@@ -29,9 +29,9 @@ public class CPluginDto {
         @NotNull(message = "任务详情id不能为空")
         @ApiModelProperty("任务详情id")
         private Long taskDetailId;
-        @NotNull(message = "插件id不能为空")
+        @NotNull(message = "插件名不能为空")
-        @ApiModelProperty("插件id")
+        @ApiModelProperty("插件名")
-        private Long pluginId;
+        private String pluginName;
         @ApiModelProperty("参数")
         private String param;
         @Min(1)

common/src/main/java/com/ccsens/common/bean/dto/CTaskDto.java

@@ -58,4 +58,15 @@ public class CTaskDto {
         private byte type;
     }
 
+    @Data
+    @ApiModel("修改任务状态")
+    public static class UpdateTaskProcess{
+        @NotNull(message = "任务id不能为空")
+        @ApiModelProperty("任务详情id")
+        private Long detailId;
+        @ApiModelProperty("关联类型（0开始前，1开始时，2开始后，3结束前，4结束时，5结束后")
+        private byte type;
+        @ApiModelProperty("关联的绝对时间")
+        private Long timeDifference;
+    }
 }

common/src/main/java/com/ccsens/common/persist/dao/PluginDao.java

@@ -0,0 +1,9 @@
+package com.ccsens.common.persist.dao;
+
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface PluginDao {
+    Long getPluginIdByName(@Param("pluginName") String pluginName);
+}

common/src/main/java/com/ccsens/common/persist/dao/ProTaskDetailDao.java

@@ -40,7 +40,7 @@ public interface ProTaskDetailDao extends ProTaskDetailMapper {
      * @param timeFormat 时间格式
      * @return 定期任务列表
      */
-    List<CTaskVo.QueryTask> queryRegularTask(@Param("roleId") List<Long> roleIdList, @Param("timeUnit") int timeUnit, @Param("timeNode") Long timeNode
+    List<CTaskVo.QueryTask> queryRegularTask(@Param("roleIdList") List<Long> roleIdList, @Param("timeUnit") int timeUnit, @Param("timeNode") Long timeNode
                                             , @Param("queryType") int queryType, @Param("query") String query, @Param("timeFormat") String timeFormat);
 
     /**

common/src/main/java/com/ccsens/common/persist/dao/ProTaskProcessDao.java

@@ -1,6 +1,7 @@
 package com.ccsens.common.persist.dao;
 
 import com.ccsens.common.bean.po.ProTaskProcess;
+import com.ccsens.common.persist.mapper.ProTaskProcessMapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -10,7 +11,7 @@ import java.util.List;
  * @author AUSU
  */
 @Repository
-public interface ProTaskProcessDao {
+public interface ProTaskProcessDao extends ProTaskProcessMapper {
 
     /**
      * 根据任务id列表查询所有上下道工序

common/src/main/java/com/ccsens/common/service/ITaskService.java

@@ -41,4 +41,10 @@ public interface ITaskService {
     void updateTaskType(CTaskDto.UpdateTaskType param, Long userId) throws Exception;
 
     void updateTaskStartTime(Long taskSubId,Byte statusOfUpdate);
+
+    /**
+     * 添加任务上下工序
+     * @param updateTaskProcesses 任务信息
+     */
+    void updateTaskStartTime(List<CTaskDto.UpdateTaskProcess> updateTaskProcesses);
 }

common/src/main/java/com/ccsens/common/service/PluginService.java

@@ -7,7 +7,10 @@ import cn.hutool.core.util.StrUtil;
 import com.ccsens.common.bean.dto.CPluginDto;
 import com.ccsens.common.bean.po.ProTaskPlugin;
 import com.ccsens.common.bean.po.ProTaskPluginExample;
+import com.ccsens.common.persist.dao.PluginDao;
 import com.ccsens.common.persist.dao.ProTaskPluginDao;
+import com.ccsens.common.util.CommonCodeError;
+import com.ccsens.util.exception.BaseException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
@@ -24,13 +27,20 @@ public class PluginService implements IPluginService{
     private ProTaskPluginDao proTaskPluginDao;
     @Resource
     private Snowflake snowflake;
+    @Resource
+    private PluginDao pluginDao;
 
     @Override
     public void updateTaskPlugin(CPluginDto.UpdateTaskPlugin updateTaskPlugin) {
+        //查询插件信息
+        Long pluginId = pluginDao.getPluginIdByName(updateTaskPlugin.getPluginName());
+        if(ObjectUtil.isNull(pluginId)){
+            throw new BaseException(CommonCodeError.PLUGIN_NAME_ERROR);
+        }
         //根据任务id和插件id查找以前的关联信息
         ProTaskPluginExample taskPluginExample = new ProTaskPluginExample();
         taskPluginExample.createCriteria().andTaskDetailIdEqualTo(updateTaskPlugin.getTaskDetailId())
-                .andPluginIdEqualTo(updateTaskPlugin.getPluginId());
+                .andPluginIdEqualTo(pluginId);
         List<ProTaskPlugin> proTaskPlugins = proTaskPluginDao.selectByExample(taskPluginExample);
         if(CollectionUtil.isNotEmpty(proTaskPlugins)){
             //有则修改
@@ -56,7 +66,7 @@ public class PluginService implements IPluginService{
             ProTaskPlugin proTaskPlugin = new ProTaskPlugin();
             proTaskPlugin.setId(snowflake.nextId());
             proTaskPlugin.setTaskDetailId(updateTaskPlugin.getTaskDetailId());
-            proTaskPlugin.setPluginId(updateTaskPlugin.getPluginId());
+            proTaskPlugin.setPluginId(pluginId);
             proTaskPlugin.setPlginRow(updateTaskPlugin.getRow());
             proTaskPlugin.setPlginCol(updateTaskPlugin.getCol());
             proTaskPlugin.setRowspan(updateTaskPlugin.getRowspan());

common/src/main/java/com/ccsens/common/service/TaskService.java

@@ -6,10 +6,7 @@ import cn.hutool.core.util.BooleanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.ccsens.common.bean.dto.CTaskDto;
 import com.ccsens.common.bean.message.TaskMessageWithStatus;
-import com.ccsens.common.bean.po.ProRole;
+import com.ccsens.common.bean.po.*;
-import com.ccsens.common.bean.po.ProTaskProcess;
-import com.ccsens.common.bean.po.ProTaskStatusRecord;
-import com.ccsens.common.bean.po.ProTaskSub;
 import com.ccsens.common.bean.vo.CRoleVo;
 import com.ccsens.common.bean.vo.CTaskVo;
 import com.ccsens.common.persist.dao.*;
@@ -536,4 +533,38 @@ public class TaskService implements ITaskService {
         }
     }
 
-}
+
+    @Override
+    public void updateTaskStartTime(List<CTaskDto.UpdateTaskProcess> updateTaskProcesses) {
+        if(CollectionUtil.isNotEmpty(updateTaskProcesses) && updateTaskProcesses.size() > 1){
+            Long task1;
+            Long task2;
+            for (int i = 1; i < updateTaskProcesses.size(); i++) {
+                task1 = updateTaskProcesses.get(i - 1).getDetailId();
+                CTaskDto.UpdateTaskProcess taskProcess = updateTaskProcesses.get(i);
+                task2 = taskProcess.getDetailId();
+                //查找任务之前的上到工序信息，有就替换，没有添加
+                ProTaskProcessExample proTaskProcessExample = new ProTaskProcessExample();
+                proTaskProcessExample.createCriteria().andNextTaskDetailIdEqualTo(task2);
+                List<ProTaskProcess> proTaskProcesses = taskProcessDao.selectByExample(proTaskProcessExample);
+                if(CollectionUtil.isNotEmpty(proTaskProcesses)){
+                    for (ProTaskProcess process : proTaskProcesses){
+                        process.setTaskDetailId(task1);
+                        process.setProcessType(taskProcess.getType());
+                        process.setNextTaskDetailId(taskProcess.getTimeDifference());
+                        taskProcessDao.updateByPrimaryKeySelective(process);
+                    }
+                }else {
+                    ProTaskProcess proTaskProcess = new ProTaskProcess();
+                    proTaskProcess.setId(snowflake.nextId());
+                    proTaskProcess.setTaskDetailId(task1);
+                    proTaskProcess.setNextTaskDetailId(task2);
+                    proTaskProcess.setProcessType(taskProcess.getType());
+                    proTaskProcess.setNextTaskDetailId(taskProcess.getTimeDifference());
+                    taskProcessDao.insertSelective(proTaskProcess);
+                }
+            }
+        }
+    }
+
+}

common/src/main/java/com/ccsens/common/util/CommonCodeError.java

@@ -14,5 +14,6 @@ public class CommonCodeError extends CodeError {
     public static final Code OPERATION_ERROR = new Code(5,"请选择正确的操作!", true);
     public static final Code PROJECT_NOT_FOUND = new Code(6,"项目不存在,请检查后再试!", true);
     public static final Code TASK_SUB_NOT_FOUND = new Code(6,"分解任务不存在,请检查后再试!", true);
+    public static final Code PLUGIN_NAME_ERROR = new Code(7,"请选择正确的插件", true);
 
 }

common/src/main/resources/mapper_dao/PluginDao.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ccsens.common.persist.dao.PluginDao">
+
+    <select id="getPluginIdByName" resultType="java.lang.Long">
+        SELECT
+        id
+        FROM
+        `plugin`.t_pro_plugin
+        WHERE
+        `name` = #{pluginName}
+        and rec_status = 0
+        limit 1
+    </select>
+</mapper>

pom.xml

@@ -9,7 +9,7 @@
         <module>cloudutil</module>
         <module>util</module>
         <module>tall</module>
-        <module>recovery</module>
+<!--        <module>recovery</module>-->
 <!--        <module>ht</module>-->
 <!--        <module>game</module>-->
 <!--        <module>mt</module>-->