From f001a397dd84472f8f16b1355619d899d4372dd7 Mon Sep 17 00:00:00 2001
From: huangxin <huangxin@cmhi.chinamobile.com>
Date: Wed, 19 Aug 2020 10:30:46 +0800
Subject: [PATCH] =?UTF-8?q?OCT=20REM:=201.=20taskinfo=20=E8=A1=A8=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E7=9B=B8=E5=85=B3=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/dispose/pojo/entity/TaskInfo.java     | 22 ++++++++++++-------
 src/main/resources/mappers/TaskInfo.xml       | 14 +++++++-----
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/dispose/pojo/entity/TaskInfo.java b/src/main/java/com/dispose/pojo/entity/TaskInfo.java
index ec80bd38..1d618cb1 100644
--- a/src/main/java/com/dispose/pojo/entity/TaskInfo.java
+++ b/src/main/java/com/dispose/pojo/entity/TaskInfo.java
@@ -16,8 +16,6 @@ import java.io.Serializable;
 
 /**
  * The type Task info.
- *
- * @author <huangxin@cmhi.chinamoblie.com>
  */
 @Data
 @NoArgsConstructor
@@ -48,8 +46,8 @@ public class TaskInfo implements Serializable {
      */
     private Long deviceId;
     /**
-    * The Begin time.
-    */
+     * The Begin time.
+     */
     private String beginTime;
     /**
      * The End time.
@@ -60,13 +58,21 @@ public class TaskInfo implements Serializable {
      */
     private Long taskAttackType;
     /**
-     * The Exec attack type.
+     * The Exec attack type in.
      */
-    private Long execAttackType;
+    private Long execAttackTypeIn;
     /**
-     * The Attack type status.
+     * The Attack type status in.
      */
-    private Long attackTypeStatus;
+    private Long attackTypeStatusIn;
+    /**
+     * The Exec attack type out.
+     */
+    private Long execAttackTypeOut;
+    /**
+     * The Attack type status out.
+     */
+    private Long attackTypeStatusOut;
     /**
      * The Extern id.
      */
diff --git a/src/main/resources/mappers/TaskInfo.xml b/src/main/resources/mappers/TaskInfo.xml
index f247359d..25947d70 100644
--- a/src/main/resources/mappers/TaskInfo.xml
+++ b/src/main/resources/mappers/TaskInfo.xml
@@ -1,20 +1,22 @@
 <?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.dispose.mapper.TaskInfoMapper">
-    <resultMap id="dispose_task" type="com.dispose.pojo.entity.TaskInfo">
+    <resultMap id="task_info" type="com.dispose.pojo.entity.TaskInfo">
         <id column="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="taskAttackType" property="execAttackType"/>
-        <result column="execAttackType" property="execAttackType"/>
-        <result column="attackTypeStatus" property="attackTypeStatus"/>
+        <result column="taskAttackType" property="taskAttackType"/>
+        <result column="execAttackTypeIn" property="execAttackTypeIn"/>
+        <result column="attackTypeStatusIn" property="attackTypeStatusIn"/>
+        <result column="execAttackTypeOut" property="execAttackTypeOut"/>
+        <result column="attackTypeStatusOut" property="attackTypeStatusOut"/>
         <result column="externId" property="externId"/>
         <result column="status" property="status"/>
     </resultMap>
 
-    <select id="selectAll" resultMap="dispose_task">
+    <select id="selectAll" resultMap="task_info">
         SELECT *
         FROM task_info
     </select>
@@ -34,7 +36,7 @@
         VALUES (#{taskId}, #{deviceId}, #{taskAttackType})
     </insert>
 
-    <select id="getTaskInfoByTaskId" resultMap="dispose_task">
+    <select id="getTaskInfoByTaskId" resultMap="task_info">
         SELECT *
         FROM task_info
         WHERE taskId = #{taskId, jdbcType=INTEGER}