OCT

REM:
1. 修改设备id数据类型

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<ErrorCode, Long> taskStatus(Long taskId);
+    MulReturnType<ErrorCode, Long> taskStatus(String taskId);
 
     /**
      * Gets ability device fireware.

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<ErrorCode, Long> taskStatus(Long taskId) {
+    public MulReturnType<ErrorCode, Long> taskStatus(String taskId) {
         return new MulReturnType<>(ErrorCode.ERR_UNSUPPORT, -1L);
     }
 }

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<ErrorCode, Long> taskStatus(Long taskId) {
+    public MulReturnType<ErrorCode, Long> taskStatus(String taskId) {
         return new MulReturnType<>(ErrorCode.ERR_UNSUPPORT, -1L);
     }
 }

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<ErrorCode, Long> taskStatus(Long taskId) {
+    public MulReturnType<ErrorCode, Long> taskStatus(String taskId) {
         if (token == null || token.length() == 0) {
             return new MulReturnType<>(ErrorCode.ERR_LOGOUT, -1L);
         }

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<ErrorCode, Long> taskStatus(Long taskId) {
+    public MulReturnType<ErrorCode, Long> taskStatus(String taskId) {
         return new MulReturnType<>(ErrorCode.ERR_UNSUPPORT, -1L);
     }
 }

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.

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);
     }
 

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);
 
     /**

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<ErrorCode, Long> ret = ai.getDb().taskStatus(v.getId());
 
-                    if (ret.getFirstParam() == ErrorCode.ERR_OK) {
+                    if (v.getExternId() != null && v.getExternId().length() > 0) {
-                        deviceTaskManager.changeDisposeDeviceTaskInfoDevStatus(v.getId(), ret.getSecondParam());
+                        MulReturnType<ErrorCode, Long> ret = ai.getDb().taskStatus(v.getExternId());
+
+                        if (ret.getFirstParam() == ErrorCode.ERR_OK) {
+                            deviceTaskManager.changeDisposeDeviceTaskInfoDevStatus(v.getExternId(),
+                                                                                   ret.getSecondParam());
+                        }
                     }
                 }
             }