From cc35b50dcba75bbe8811030b5ed4761fb406336c Mon Sep 17 00:00:00 2001
From: chenlinghy <chenlinghy@cmhi.chinamobile.com>
Date: Tue, 1 Dec 2020 09:47:12 +0800
Subject: [PATCH] =?UTF-8?q?OCT=20REM:=201.=E5=8D=8E=E4=B8=BA=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E5=90=AF=E5=8A=A8=E3=80=81=E5=81=9C=E6=AD=A2=E5=A4=84?=
 =?UTF-8?q?=E7=BD=AE=E4=BB=BB=E5=8A=A1=E6=97=B6=E9=87=87=E7=94=A8=E5=85=AC?=
 =?UTF-8?q?=E5=85=B1=E5=90=AF=E5=8A=A8=E3=80=81=E5=81=9C=E6=AD=A2=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E6=8E=A5=E5=8F=A3=202.=E5=88=A0=E9=99=A4=E6=97=A0?=
 =?UTF-8?q?=E7=94=A8=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DeviceTaskManagerServiceImpl.java        | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/dispose/service/impl/DeviceTaskManagerServiceImpl.java b/src/main/java/com/dispose/service/impl/DeviceTaskManagerServiceImpl.java
index 6a6aaaa8..775bd9bf 100644
--- a/src/main/java/com/dispose/service/impl/DeviceTaskManagerServiceImpl.java
+++ b/src/main/java/com/dispose/service/impl/DeviceTaskManagerServiceImpl.java
@@ -816,12 +816,11 @@ public class DeviceTaskManagerServiceImpl implements DeviceTaskManagerService {
                     break;
 
                 case PENGXIN_PLATFORM:
-                    //pengXinDeviceTaskRun(ai, v, task);
                     restfulDeviceTaskRun(ai, v, task, DisposeDeviceType.PENGXIN_PLATFORM);
                     break;
 
                 case HUAWEI_PLATFORM:
-                    huaWeiDeviceTaskRun(ai, v, task);
+                    restfulDeviceTaskRun(ai, v, task, DisposeDeviceType.HUAWEI_PLATFORM);
                     break;
 
                 default:
@@ -876,8 +875,6 @@ public class DeviceTaskManagerServiceImpl implements DeviceTaskManagerService {
             // 设置标志，避免对同一个IP重复调用停止处置命令
             taskCache.put(taskStopKey, true);
 
-            //deviceTaskManager.changeDisposeDeviceTaskInfoStatus(v.getId(), DisposeTaskStatus.TASK_EXPIRED);
-
             switch (ai.getDev().getDeviceType()) {
                 case DPTECH_UMC:
                     dpTechDeviceTaskStop(ai, v, task);
@@ -892,12 +889,11 @@ public class DeviceTaskManagerServiceImpl implements DeviceTaskManagerService {
                     break;
 
                 case PENGXIN_PLATFORM:
-                    //pengXinDeviceTaskStop(ai, v, task);
                     restfulDeviceTaskStop(ai, v, task, DisposeDeviceType.PENGXIN_PLATFORM);
                     break;
 
                 case HUAWEI_PLATFORM:
-                    huaWeiDeviceTaskStop(ai, v, task);
+                    restfulDeviceTaskStop(ai, v, task, DisposeDeviceType.HUAWEI_PLATFORM);
                     break;
 
                 default: