From 499ea8f733f8e86ce35c6fec0cc3efa428808265 Mon Sep 17 00:00:00 2001
From: chenlinghy <chenlinghy@cmhi.chinamobile.com>
Date: Tue, 7 Jul 2020 16:13:05 +0800
Subject: [PATCH] =?UTF-8?q?OCT=20REM:=201.=20=E4=BF=AE=E6=94=B9=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E8=8A=82=E7=82=B9=E6=8E=A5=E5=8F=A3=202.=20=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=95=B0=E6=8D=AE=E5=BA=93=E4=B8=AD=E6=A0=B9=E6=8D=AE?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87ID=E5=88=A0=E9=99=A4=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E7=9A=84=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/dispose/mapper/TaskInfoMapper.java      | 7 +++++++
 .../com/dispose/service/impl/DisposeNodeManagerImpl.java  | 8 +++++++-
 src/main/resources/mappers/TaskInfoMapper.xml             | 7 +++++++
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/dispose/mapper/TaskInfoMapper.java b/src/main/java/com/dispose/mapper/TaskInfoMapper.java
index 34559854..0bb2ec0a 100644
--- a/src/main/java/com/dispose/mapper/TaskInfoMapper.java
+++ b/src/main/java/com/dispose/mapper/TaskInfoMapper.java
@@ -61,4 +61,11 @@ public interface TaskInfoMapper extends Mapper<TaskInfo>, MySqlMapper<TaskInfo>
      * @return the task info current status
      */
     int getTaskInfoCurrentStatus(Long id);
+
+    /**
+     * Remove task by id.
+     *
+     * @param id the id
+     */
+    void removeTaskInfoById(Long id);
 }
diff --git a/src/main/java/com/dispose/service/impl/DisposeNodeManagerImpl.java b/src/main/java/com/dispose/service/impl/DisposeNodeManagerImpl.java
index 5bb1e6fc..f0d9bc0c 100644
--- a/src/main/java/com/dispose/service/impl/DisposeNodeManagerImpl.java
+++ b/src/main/java/com/dispose/service/impl/DisposeNodeManagerImpl.java
@@ -6,6 +6,7 @@ import com.dispose.common.IPAddrType;
 import com.dispose.dispose.DeviceRouter;
 import com.dispose.dispose.DisposeEntryManager;
 import com.dispose.mapper.DisposeDeviceMapper;
+import com.dispose.mapper.TaskInfoMapper;
 import com.dispose.pojo.entity.DisposeDevice;
 import com.dispose.pojo.po.DisposeDeviceCapacity;
 import com.dispose.pojo.po.MulReturnType;
@@ -35,6 +36,8 @@ public class DisposeNodeManagerImpl implements DisposeNodeManager {
     private DisposeDeviceMapper disposeDeviceMapper;
     @Resource
     private UserAccountService userAccountService;
+    @Resource
+    private  TaskInfoMapper taskInfoMapper;
 
     /**
      * Cleanup dispose node cache.
@@ -120,6 +123,9 @@ public class DisposeNodeManagerImpl implements DisposeNodeManager {
             return ErrorCode.ERR_NOSUCHDEVICE;
         }
 
+        //删除task info表中的任务
+        taskInfoMapper.removeTaskInfoById(dev.getId());
+
         // 删除数据库和缓存中内容
         disposeDeviceMapper.delDisposeDeviceByIp(ipAddr);
         disposeDevMap.remove(ipAddr);
@@ -146,7 +152,7 @@ public class DisposeNodeManagerImpl implements DisposeNodeManager {
 
         try {
             // 获取处置设备硬件访问接口
-            dp = DeviceRouter.getDeviceRouterFactory(dev.getType(), dev.getIpAddr());
+            dp = DeviceRouter.deviceRouterFactory(dev);
 
             // 判断设备是否在线
             if (!dp.getDeviceLinkStatus()) {
diff --git a/src/main/resources/mappers/TaskInfoMapper.xml b/src/main/resources/mappers/TaskInfoMapper.xml
index 687a9dcc..718412bd 100644
--- a/src/main/resources/mappers/TaskInfoMapper.xml
+++ b/src/main/resources/mappers/TaskInfoMapper.xml
@@ -34,4 +34,11 @@
         WHERE id = #{id, jdbcType=INTEGER}
     </select>
 
+    <delete id="removeTaskInfoById" parameterType="java.lang.Long">
+        DELETE
+            task_info
+        FROM task_info
+        WHERE task_info.deviceId = #{deviceId}
+    </delete>
+
 </mapper>