From 1d50a3c069a0e09d02bb81f137baa73cfbd5c1f9 Mon Sep 17 00:00:00 2001 From: chenlinghy Date: Mon, 30 Nov 2020 17:34:08 +0800 Subject: [PATCH] =?UTF-8?q?OCT=20REM:=201.=E4=BF=AE=E6=94=B9=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E6=9F=A5=E8=AF=A2=E5=88=A4=E6=96=AD=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=202.=E4=BF=AE=E6=94=B9=E6=B5=A9=E7=80=9A=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E5=90=AF=E5=8A=A8=E3=80=81=E5=81=9C=E6=AD=A2=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dispose/ability/impl/PengXinAbilityImpl.java | 2 +- .../service/impl/DeviceTaskManagerServiceImpl.java | 4 ++-- src/main/resources/mappers/DeviceTask.xml | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/dispose/ability/impl/PengXinAbilityImpl.java b/src/main/java/com/dispose/ability/impl/PengXinAbilityImpl.java index a86c66d5..b40b55cd 100644 --- a/src/main/java/com/dispose/ability/impl/PengXinAbilityImpl.java +++ b/src/main/java/com/dispose/ability/impl/PengXinAbilityImpl.java @@ -224,7 +224,7 @@ public class PengXinAbilityImpl implements DisposeAbility { } try { - log.debug("++++Begging PengXin Stop Cleanup Task: {}", taskId); + log.info("++++Begging PengXin Stop Cleanup Task: {}", taskId); if (capType != DisposeCapacityType.BLACKHOOL) { log.error("----Error PengXin don't support dispose capacity type: {}", capType); diff --git a/src/main/java/com/dispose/service/impl/DeviceTaskManagerServiceImpl.java b/src/main/java/com/dispose/service/impl/DeviceTaskManagerServiceImpl.java index b18e9887..6a6aaaa8 100644 --- a/src/main/java/com/dispose/service/impl/DeviceTaskManagerServiceImpl.java +++ b/src/main/java/com/dispose/service/impl/DeviceTaskManagerServiceImpl.java @@ -808,7 +808,7 @@ public class DeviceTaskManagerServiceImpl implements DeviceTaskManagerService { break; case HAOHAN_PLATFORM: - haoHanDeviceTaskRun(ai, v, task); + restfulDeviceTaskRun(ai, v, task, DisposeDeviceType.HAOHAN_PLATFORM); break; case VIRTUAL_DISPOSE: @@ -884,7 +884,7 @@ public class DeviceTaskManagerServiceImpl implements DeviceTaskManagerService { break; case HAOHAN_PLATFORM: - haoHanDeviceTaskStop(ai, v, task); + restfulDeviceTaskStop(ai, v, task, DisposeDeviceType.HAOHAN_PLATFORM); break; case VIRTUAL_DISPOSE: diff --git a/src/main/resources/mappers/DeviceTask.xml b/src/main/resources/mappers/DeviceTask.xml index 871b9963..03cdeb05 100644 --- a/src/main/resources/mappers/DeviceTask.xml +++ b/src/main/resources/mappers/DeviceTask.xml @@ -150,9 +150,9 @@ SELECT dt.*, dd.* FROM device_task dt LEFT JOIN dispose_device dd ON dt.deviceId = dd.id - WHERE dd.deviceType = 2 - AND dt.devStatus != 2 - AND dt.devStatus != 3 - AND dt.devStatus != 6 + WHERE dd.deviceType = ${@com.dispose.common.DisposeDeviceType@PENGXIN_PLATFORM.getValue()} + AND dt.devStatus != ${@com.pengxin.dispose.common.PengXinTaskStatus@TASK_FINISHED_USER.getValue()} + AND dt.devStatus != ${@com.pengxin.dispose.common.PengXinTaskStatus@TASK_FINISHED_TIME.getValue()} + AND dt.devStatus != ${@com.pengxin.dispose.common.PengXinTaskStatus@TASK_REVIEWED_FAILED.getValue()} \ No newline at end of file