From ed64ab41e6515174f1a68419fdf577dad8be2cf4 Mon Sep 17 00:00:00 2001
From: chenlinghy <chenlinghy@cmhi.chinamobile.com>
Date: Thu, 5 Nov 2020 17:13:08 +0800
Subject: [PATCH 1/2] =?UTF-8?q?OCT=20REM:=201.=E8=A7=A3=E5=86=B3=E5=81=9C?=
 =?UTF-8?q?=E6=AD=A2=E5=A4=84=E7=BD=AE=E4=BB=BB=E5=8A=A1=E6=97=B6=E7=A9=BA?=
 =?UTF-8?q?=E6=8C=87=E9=92=88=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dispose/service/impl/DeviceTaskManagerServiceImpl.java   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/java/com/dispose/service/impl/DeviceTaskManagerServiceImpl.java b/src/main/java/com/dispose/service/impl/DeviceTaskManagerServiceImpl.java
index e2034e2f..e2fb104f 100644
--- a/src/main/java/com/dispose/service/impl/DeviceTaskManagerServiceImpl.java
+++ b/src/main/java/com/dispose/service/impl/DeviceTaskManagerServiceImpl.java
@@ -634,6 +634,11 @@ public class DeviceTaskManagerServiceImpl implements DeviceTaskManagerService {
             // 获取设备
             AbilityInfo ai = disposeAbilityRouterService.getAbilityDevice(v.getDeviceId());
 
+            // 如果设备已经删除或者禁用，跳过处理
+            if (ai == null) {
+                continue;
+            }
+
             // 对处置IP生成一个唯一的操作标识符
             String taskStopKey = task.getDisposeObject() + "Stop" + ai.getDev().getDeviceType().getDescription();
 

From 5c59f57183996c5bde39f7ab40322c918977cc6f Mon Sep 17 00:00:00 2001
From: chenlinghy <chenlinghy@cmhi.chinamobile.com>
Date: Thu, 5 Nov 2020 17:23:40 +0800
Subject: [PATCH 2/2] =?UTF-8?q?OCT=20REM:=201.=E5=90=AF=E5=8A=A8=E5=92=8C?=
 =?UTF-8?q?=E5=81=9C=E6=AD=A2=E5=A4=84=E7=BD=AE=E4=BB=BB=E5=8A=A1=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E8=AE=BE=E5=A4=87=E4=B8=8D=E5=AD=98=E5=9C=A8=E5=88=99?=
 =?UTF-8?q?=E5=B0=86=E4=BB=BB=E5=8A=A1=E7=8A=B6=E6=80=81=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E4=B8=BA=E5=B7=B2=E5=AE=8C=E6=88=90=EF=BC=8C=E9=81=BF=E5=85=8D?=
 =?UTF-8?q?=E5=AF=B9=E8=AF=A5=E4=BB=BB=E5=8A=A1=E9=87=8D=E5=A4=8D=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dispose/service/impl/DeviceTaskManagerServiceImpl.java    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/java/com/dispose/service/impl/DeviceTaskManagerServiceImpl.java b/src/main/java/com/dispose/service/impl/DeviceTaskManagerServiceImpl.java
index e2fb104f..60e2db30 100644
--- a/src/main/java/com/dispose/service/impl/DeviceTaskManagerServiceImpl.java
+++ b/src/main/java/com/dispose/service/impl/DeviceTaskManagerServiceImpl.java
@@ -568,6 +568,8 @@ public class DeviceTaskManagerServiceImpl implements DeviceTaskManagerService {
 
             // 如果设备已经删除或者禁用，跳过处理
             if (ai == null) {
+                // 设置任务状态为已完成
+                deviceTaskManager.changeDisposeDeviceTaskInfoStatus(v.getId(), DisposeTaskStatus.TASK_FINISHED);
                 continue;
             }
 
@@ -636,6 +638,8 @@ public class DeviceTaskManagerServiceImpl implements DeviceTaskManagerService {
 
             // 如果设备已经删除或者禁用，跳过处理
             if (ai == null) {
+                // 设置任务状态为已完成
+                deviceTaskManager.changeDisposeDeviceTaskInfoStatus(v.getId(), DisposeTaskStatus.TASK_FINISHED);
                 continue;
             }