From b0084cf06384d1c035ee2705a418a4d925f469eb Mon Sep 17 00:00:00 2001 From: HuangXin Date: Fri, 13 Nov 2020 17:09:08 +0800 Subject: [PATCH] =?UTF-8?q?OCT=20REM:=201.=20=E4=BF=AE=E6=94=B9=E8=AE=BE?= =?UTF-8?q?=E5=A4=87id=E6=95=B0=E6=8D=AE=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/dispose/ability/DisposeAbility.java | 2 +- .../com/dispose/ability/impl/DpTechAbilityImpl.java | 2 +- .../com/dispose/ability/impl/HaoHanAbilityImpl.java | 2 +- .../com/dispose/ability/impl/PengXinAbilityImpl.java | 2 +- .../com/dispose/ability/impl/VirtualAbilityImpl.java | 2 +- .../java/com/dispose/manager/DeviceTaskManager.java | 2 +- .../dispose/manager/impl/DeviceTaskManagerImpl.java | 2 +- src/main/java/com/dispose/mapper/DeviceTaskMapper.java | 2 +- .../service/impl/DeviceTaskManagerServiceImpl.java | 10 +++++++--- 9 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/dispose/ability/DisposeAbility.java b/src/main/java/com/dispose/ability/DisposeAbility.java index 2e0013fa..4fdb4b8c 100644 --- a/src/main/java/com/dispose/ability/DisposeAbility.java +++ b/src/main/java/com/dispose/ability/DisposeAbility.java @@ -62,7 +62,7 @@ public interface DisposeAbility { * @param taskId the task id * @return the mul return type */ - MulReturnType taskStatus(Long taskId); + MulReturnType taskStatus(String taskId); /** * Gets ability device fireware. diff --git a/src/main/java/com/dispose/ability/impl/DpTechAbilityImpl.java b/src/main/java/com/dispose/ability/impl/DpTechAbilityImpl.java index 04197943..41b27a13 100644 --- a/src/main/java/com/dispose/ability/impl/DpTechAbilityImpl.java +++ b/src/main/java/com/dispose/ability/impl/DpTechAbilityImpl.java @@ -324,7 +324,7 @@ public class DpTechAbilityImpl implements DisposeAbility { * @return the mul return type */ @Override - public MulReturnType taskStatus(Long taskId) { + public MulReturnType taskStatus(String taskId) { return new MulReturnType<>(ErrorCode.ERR_UNSUPPORT, -1L); } } diff --git a/src/main/java/com/dispose/ability/impl/HaoHanAbilityImpl.java b/src/main/java/com/dispose/ability/impl/HaoHanAbilityImpl.java index 10290569..2242cfbc 100644 --- a/src/main/java/com/dispose/ability/impl/HaoHanAbilityImpl.java +++ b/src/main/java/com/dispose/ability/impl/HaoHanAbilityImpl.java @@ -222,7 +222,7 @@ public class HaoHanAbilityImpl implements DisposeAbility { * @return the mul return type */ @Override - public MulReturnType taskStatus(Long taskId) { + public MulReturnType taskStatus(String taskId) { return new MulReturnType<>(ErrorCode.ERR_UNSUPPORT, -1L); } } diff --git a/src/main/java/com/dispose/ability/impl/PengXinAbilityImpl.java b/src/main/java/com/dispose/ability/impl/PengXinAbilityImpl.java index 7d69e63d..4d7468f7 100644 --- a/src/main/java/com/dispose/ability/impl/PengXinAbilityImpl.java +++ b/src/main/java/com/dispose/ability/impl/PengXinAbilityImpl.java @@ -415,7 +415,7 @@ public class PengXinAbilityImpl implements DisposeAbility { * @return the mul return type */ @Override - public MulReturnType taskStatus(Long taskId) { + public MulReturnType taskStatus(String taskId) { if (token == null || token.length() == 0) { return new MulReturnType<>(ErrorCode.ERR_LOGOUT, -1L); } diff --git a/src/main/java/com/dispose/ability/impl/VirtualAbilityImpl.java b/src/main/java/com/dispose/ability/impl/VirtualAbilityImpl.java index 633cdb5c..d9520f65 100644 --- a/src/main/java/com/dispose/ability/impl/VirtualAbilityImpl.java +++ b/src/main/java/com/dispose/ability/impl/VirtualAbilityImpl.java @@ -140,7 +140,7 @@ public class VirtualAbilityImpl implements DisposeAbility { * @return the mul return type */ @Override - public MulReturnType taskStatus(Long taskId) { + public MulReturnType taskStatus(String taskId) { return new MulReturnType<>(ErrorCode.ERR_UNSUPPORT, -1L); } } diff --git a/src/main/java/com/dispose/manager/DeviceTaskManager.java b/src/main/java/com/dispose/manager/DeviceTaskManager.java index 0e3cdfb1..571b1cb1 100644 --- a/src/main/java/com/dispose/manager/DeviceTaskManager.java +++ b/src/main/java/com/dispose/manager/DeviceTaskManager.java @@ -51,7 +51,7 @@ public interface DeviceTaskManager { * @param id the id * @return the dispose device task status */ - int changeDisposeDeviceTaskInfoDevStatus(Long id, Long devStatus); + int changeDisposeDeviceTaskInfoDevStatus(String id, Long devStatus); /** * Sets exec attack type. diff --git a/src/main/java/com/dispose/manager/impl/DeviceTaskManagerImpl.java b/src/main/java/com/dispose/manager/impl/DeviceTaskManagerImpl.java index a0c57b4d..7abccc58 100644 --- a/src/main/java/com/dispose/manager/impl/DeviceTaskManagerImpl.java +++ b/src/main/java/com/dispose/manager/impl/DeviceTaskManagerImpl.java @@ -87,7 +87,7 @@ public class DeviceTaskManagerImpl implements DeviceTaskManager { * @return the long */ @Override - public int changeDisposeDeviceTaskInfoDevStatus(Long id, Long devStatus) { + public int changeDisposeDeviceTaskInfoDevStatus(String id, Long devStatus) { return deviceTaskMapper.changeTaskDevStatus(id, devStatus); } diff --git a/src/main/java/com/dispose/mapper/DeviceTaskMapper.java b/src/main/java/com/dispose/mapper/DeviceTaskMapper.java index 538bad81..a357836a 100644 --- a/src/main/java/com/dispose/mapper/DeviceTaskMapper.java +++ b/src/main/java/com/dispose/mapper/DeviceTaskMapper.java @@ -92,7 +92,7 @@ public interface DeviceTaskMapper { * @param status the status * @return the int */ - int changeTaskDevStatus(@Param("id") Long id, + int changeTaskDevStatus(@Param("id") String id, @Param("status") Long status); /** diff --git a/src/main/java/com/dispose/service/impl/DeviceTaskManagerServiceImpl.java b/src/main/java/com/dispose/service/impl/DeviceTaskManagerServiceImpl.java index 285d9069..a4179df5 100644 --- a/src/main/java/com/dispose/service/impl/DeviceTaskManagerServiceImpl.java +++ b/src/main/java/com/dispose/service/impl/DeviceTaskManagerServiceImpl.java @@ -716,10 +716,14 @@ public class DeviceTaskManagerServiceImpl implements DeviceTaskManagerService { // 任务预计结束5分钟内， if (Helper.getTimestampDiffNow(task.getPlanEndTime()) < 5 * 60) { if (v.getEndTime() == null && Helper.getTimestampDiffNow(v.getEndTime()) < 5 * 60) { - MulReturnType ret = ai.getDb().taskStatus(v.getId()); - if (ret.getFirstParam() == ErrorCode.ERR_OK) { - deviceTaskManager.changeDisposeDeviceTaskInfoDevStatus(v.getId(), ret.getSecondParam()); + if (v.getExternId() != null && v.getExternId().length() > 0) { + MulReturnType ret = ai.getDb().taskStatus(v.getExternId()); + + if (ret.getFirstParam() == ErrorCode.ERR_OK) { + deviceTaskManager.changeDisposeDeviceTaskInfoDevStatus(v.getExternId(), + ret.getSecondParam()); + } } } }