OCT

REM:
1. 增加处置任务服务相关内容

config/application-local.properties

@@ -26,7 +26,7 @@ mybatis.mapper-locations=classpath*:mappers/*.xml
 mybatis.type-aliases-package=com.dispose.pojo.entity
 mybatis.configuration.default-enum-type-handler=com.dispose.common.CommonEnumHandler
 #config log
-logging.config=file:config/logback_debug.xml
+logging.config=file:config/logback.xml
 #config tomcat
 server.tomcat.max-threads=128
 #Json sort

src/main/java/com/dispose/manager/DisposeTaskManager.java

@@ -1,5 +1,6 @@
 package com.dispose.manager;
 
+import com.dispose.common.DisposeCapacityType;
 import com.dispose.common.DisposeTaskStatus;
 import com.dispose.common.ErrorCode;
 import com.dispose.pojo.entity.DisposeTask;
@@ -94,4 +95,14 @@ public interface DisposeTaskManager {
      * @param mask   the mask
      */
     void setAttackTypeMaskStatus(Long taskId, Long mask);
+
+    /**
+     * Gets task status.
+     *
+     * @param deviceId  the device id
+     * @param disposeIp the dispose ip
+     * @param capType   the cap type
+     * @return the task status
+     */
+    DisposeTaskStatus getTaskStatus(Long deviceId, String disposeIp, DisposeCapacityType capType);
 }

src/main/java/com/dispose/manager/impl/DisposeTaskManagerImpl.java

@@ -1,5 +1,6 @@
 package com.dispose.manager.impl;
 
+import com.dispose.common.DisposeCapacityType;
 import com.dispose.common.DisposeTaskStatus;
 import com.dispose.common.ErrorCode;
 import com.dispose.manager.DisposeTaskManager;
@@ -140,4 +141,9 @@ public class DisposeTaskManagerImpl implements DisposeTaskManager {
     public ErrorCode setDisposeTaskStatus(Long taskId, DisposeTaskStatus status) {
         return null;
     }
+
+    @Override
+    public DisposeTaskStatus getTaskStatus(Long deviceId, String disposeIp, DisposeCapacityType capType) {
+        return null;
+    }
 }

src/main/java/com/dispose/mapper/DisposeTaskMapper.java

@@ -1,5 +1,6 @@
 package com.dispose.mapper;
 
+import com.dispose.common.DisposeCapacityType;
 import com.dispose.common.DisposeTaskStatus;
 import com.dispose.pojo.entity.DisposeTask;
 import org.apache.ibatis.annotations.Param;
@@ -44,4 +45,16 @@ public interface DisposeTaskMapper {
      */
     int changTaskStatus(@Param("id") Long taskId,
                         @Param("status") DisposeTaskStatus status);
+
+    /**
+     * Gets dispose task.
+     *
+     * @param deviceId  the device id
+     * @param capType   the cap type
+     * @param disposeIp the dispose ip
+     * @return the dispose task
+     */
+    List<DisposeTask> getDisposeTask(@Param("deviceId") Long deviceId,
+                               @Param("capType") DisposeCapacityType capType,
+                               @Param("disposeIp") String disposeIp);
 }

src/main/java/com/dispose/pojo/entity/TaskInfo.java

@@ -44,10 +44,6 @@ public class TaskInfo implements Serializable {
      * The Task id.
      */
     private Long taskId;
-    /**
-     * The Device id.
-     */
-    private Long deviceId;
     /**
      * The Begin time.
      */

src/main/java/com/dispose/service/DisposeTaskService.java

@@ -0,0 +1,37 @@
+package com.dispose.service;
+
+import com.dispose.common.ErrorCode;
+import com.dispose.pojo.entity.TaskInfo;
+import com.dispose.pojo.po.MulReturnType;
+
+/**
+ * The interface Dispose task service.
+ *
+ * @author <huangxin@cmhi.chinamoblie.com>
+ */
+public interface DisposeTaskService {
+
+    /**
+     * Create task mul return type.
+     *
+     * @param task the task
+     * @return the mul return type
+     */
+    MulReturnType<ErrorCode, Long> createTask(TaskInfo task);
+
+    /**
+     * Start task error code.
+     *
+     * @param taskId the task id
+     * @return the error code
+     */
+    ErrorCode startTask(Long taskId);
+
+    /**
+     * Stop task error code.
+     *
+     * @param taskId the task id
+     * @return the error code
+     */
+    ErrorCode stopTask(Long taskId);
+}

src/main/java/com/dispose/service/impl/DisposeTaskServiceImpl.java

@@ -0,0 +1,52 @@
+package com.dispose.service.impl;
+
+import com.dispose.common.ErrorCode;
+import com.dispose.manager.DisposeTaskManager;
+import com.dispose.pojo.entity.TaskInfo;
+import com.dispose.pojo.po.MulReturnType;
+import com.dispose.service.DisposeTaskService;
+
+import javax.annotation.Resource;
+
+/**
+ * The type Dispose task service.
+ *
+ * @author <huangxin@cmhi.chinamoblie.com>
+ */
+public class DisposeTaskServiceImpl implements DisposeTaskService {
+    @Resource
+    DisposeTaskManager disposeTaskManager;
+
+    /**
+     * Create task mul return type.
+     *
+     * @param task the task
+     * @return the mul return type
+     */
+    @Override
+    public MulReturnType<ErrorCode, Long> createTask(TaskInfo task) {
+        return null;
+    }
+
+    /**
+     * Start task error code.
+     *
+     * @param taskId the task id
+     * @return the error code
+     */
+    @Override
+    public ErrorCode startTask(Long taskId) {
+        return null;
+    }
+
+    /**
+     * Stop task error code.
+     *
+     * @param taskId the task id
+     * @return the error code
+     */
+    @Override
+    public ErrorCode stopTask(Long taskId) {
+        return null;
+    }
+}

src/main/resources/mappers/DisposeTask.xml

@@ -3,8 +3,8 @@
 <mapper namespace="com.dispose.mapper.DisposeTaskMapper">
     <resultMap id="dispose_task" type="com.dispose.pojo.entity.DisposeTask">
         <id column="id" property="id"/>
-        <id column = "deviceId" property="deviceId"/>
+        <id column="deviceId" property="deviceId"/>
-        <id column = "accountId" property="accountId"/>
+        <id column="accountId" property="accountId"/>
         <result column="disposeCapacity" property="disposeCapacity" javaType="com.dispose.common.DisposeCapacityType"/>
         <result column="disposeIp" property="disposeIp"/>
         <result column="createTime" property="createTime"/>
@@ -17,10 +17,10 @@
         <collection property="taskInfo" ofType="com.dispose.pojo.entity.TaskInfo">
             <id column="t_id" property="id"/>
             <result column="taskId" property="taskId"/>
-            <result column="deviceId" property="deviceId"/>
             <result column="beginTime" property="beginTime"/>
-            <result column="endTime" property="endTime"/>
+            <result column="t_endTime" property="endTime"/>
             <result column="taskAttackType" property="execAttackType"/>
+            <result column="execAttackType" property="execAttackType"/>
             <result column="attackTypeStatus" property="attackTypeStatus"/>
             <result column="externId" property="externId"/>
             <result column="status" property="status"/>
@@ -28,8 +28,19 @@
     </resultMap>
 
     <select id="selectAll" resultMap="dispose_task">
-        SELECT *
+        SELECT dt.*, ti.*
-        FROM dispose_task
+        FROM dispose_task dt LEFT JOIN task_info ti on dt.id = ti.taskId
+    </select>
+
+    <select id="getDisposeTask" resultMap="dispose_task">
+        SELECT dt.*, ti.*
+        FROM dispose_task dt LEFT JOIN task_info ti on dt.id = ti.taskId
+        WHERE
+        dt.disposeCapacity = #{capType, jdbcType=INTEGER} AND
+        dt.disposeIp = #{disposeIp}
+        <if test="deviceId != -1">
+            AND dt.deviceId = #{deviceId}
+        </if>
     </select>
 
     <insert id="addNewTask" useGeneratedKeys="true" keyProperty="id"

src/test/java/com/dispose/test/mapper/DisposeTaskMapperTest.java

@@ -105,6 +105,21 @@ public class DisposeTaskMapperTest {
         }
     }
 
+    @Test
+    public void d2_getDisposeTask() throws JsonProcessingException {
+        List<DisposeTask> taskList = disposeTaskMapper.getDisposeTask(-1L,
+                DisposeCapacityType.CLEANUP,
+                "192.168.0.1");
+
+        log.debug("Step1: {}", objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(taskList));
+
+        taskList = disposeTaskMapper.getDisposeTask(570L,
+                DisposeCapacityType.CLEANUP,
+                "192.168.0.1");
+
+        log.debug("Step2: {}", objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(taskList));
+    }
+
     /**
      * C 1 chang task status.
      */