OCT

REM:
1.修改鹏信设备启动、停止处置任务业务逻辑
2.增加鹏信设备任务状态码
3.修改数据库获取符合条件的鹏信设备处置任务SQL语句

src/main/java/com/dispose/service/impl/DeviceTaskManagerServiceImpl.java

@@ -14,6 +14,7 @@ import com.dispose.pojo.po.AbilityInfo;
 import com.dispose.pojo.po.MulReturnType;
 import com.dispose.service.DeviceTaskManagerService;
 import com.dispose.service.DisposeAbilityRouterService;
+import com.pengxin.dispose.common.PengXinTaskStatus;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -434,7 +435,7 @@ public class DeviceTaskManagerServiceImpl implements DeviceTaskManagerService {
         MulReturnType<ErrorCode, String> ret;
 
         // 重试错误次数过多
-        if (deviceTask.getErrRetry() >= DisposeConfigValue.CALL_ERROR_RETRY_TIMES) {
+        if (deviceTask.getErrRetry() > DisposeConfigValue.CALL_ERROR_RETRY_TIMES) {
             return;
         }
 
@@ -476,6 +477,14 @@ public class DeviceTaskManagerServiceImpl implements DeviceTaskManagerService {
             deviceTaskManager.setAttackTypeStatus(deviceTask.getId(),
                     disposeTask.getFlowDirection(), 0L);
 
+            // 设置该任务为启动失败
+            deviceTaskManager.changeDisposeDeviceTaskInfoStatus(deviceTask.getId(), DisposeTaskStatus.TASK_NEW);
+            //任务出错，设备任务状态为启动处置任务失败
+            deviceTaskManager.changeDisposeDeviceTaskInfoDevStatus(deviceTask.getId(),
+                    (long) PengXinTaskStatus.TASK_STARTED_FAILED.getValue());
+            // 记录任务出错重试次数
+            deviceTaskManager.setTaskErrRetryTimes(deviceTask.getId(), deviceTask.getErrRetry() + 1);
+
             log.error("PENGXIN_PLATFORM setup task error {}: {}", ret.getFirstParam(), deviceTask);
         }
     }
@@ -490,6 +499,11 @@ public class DeviceTaskManagerServiceImpl implements DeviceTaskManagerService {
     private void pengXinDeviceTaskStop(AbilityInfo ai, DeviceTask deviceTask, DisposeTask disposeTask) {
         MulReturnType<ErrorCode, Long> ret;
 
+        // 重试错误次数过多
+        if (deviceTask.getErrRetry() > DisposeConfigValue.CALL_ERROR_RETRY_TIMES * 2) {
+            return;
+        }
+
         // 停止处置任务
         ret = ai.getDb().stopDispose(disposeTask.getDisposeObject(), disposeTask.getDisposeCapacity(), null, null,
                 deviceTask.getExternId());
@@ -500,12 +514,19 @@ public class DeviceTaskManagerServiceImpl implements DeviceTaskManagerService {
             deviceTaskManager.changeDisposeDeviceTaskInfoStatus(deviceTask.getId(), DisposeTaskStatus.TASK_FINISHED);
             deviceTaskManager.setTaskErrRetryTimes(deviceTask.getId(), 0);
             deviceTaskManager.setAttackTypeStatus(deviceTask.getId(), disposeTask.getFlowDirection(), 0L);
-        } else if (deviceTask.getErrRetry() < DisposeConfigValue.CALL_ERROR_RETRY_TIMES) {
+        } else if (deviceTask.getErrRetry() < DisposeConfigValue.CALL_ERROR_RETRY_TIMES * 2) {
             // 记录任务出错重试次数
             deviceTaskManager.setTaskErrRetryTimes(deviceTask.getId(), deviceTask.getErrRetry() + 1);
+            // 设置任务状态为启动中
+            deviceTaskManager.changeDisposeDeviceTaskInfoStatus(deviceTask.getId(), DisposeTaskStatus.TASK_STARTING);
             log.error("PENGXIN_PLATFORM stop task times {} error {}: {}", deviceTask.getErrRetry(),
                     ret.getSecondParam(), deviceTask);
         } else {
+            // 记录任务出错重试次数
+            deviceTaskManager.setTaskErrRetryTimes(deviceTask.getId(), deviceTask.getErrRetry() + 1);
+            // 设置该任务为停止失败
+            deviceTaskManager.changeDisposeDeviceTaskInfoStatus(deviceTask.getId(), DisposeTaskStatus.TASK_FINISHED);
+
             log.error("PENGXIN_PLATFORM stop task error {}: {}", ret.getFirstParam(), deviceTask);
         }
     }

src/main/java/com/pengxin/dispose/common/PengXinTaskStatus.java

@@ -48,6 +48,10 @@ public enum PengXinTaskStatus implements BaseEnum {
      * The Task unblocking.
      */
     TASK_UNBLOCKING(9, "解封中"),
+    /**
+     * The Task unknown.
+     */
+    TASK_UNKNOWN(-1, "未知状态"),
     ;
 
     /**

src/main/resources/mappers/DeviceTask.xml

@@ -136,6 +136,6 @@
         WHERE
             dd.deviceType = 2
         AND
-            dt.devStatus != 8 AND dt.devStatus != 7 AND dt.devStatus != -1
+            dt.devStatus != 2 AND dt.devStatus != 3 AND dt.devStatus != 6
     </select>
 </mapper>