OCT

REM:
1. 重构任务启动、停止逻辑

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

@@ -1,6 +1,7 @@
 package com.dispose.service.impl;
 
 import com.dispose.common.DisposeConfigValue;
+import com.dispose.common.DisposeDeviceType;
 import com.dispose.common.DisposeTaskStatus;
 import com.dispose.common.DpTechAttackType;
 import com.dispose.common.ErrorCode;
@@ -118,7 +119,6 @@ public class DeviceTaskManagerServiceImpl implements DeviceTaskManagerService {
         deviceTaskManager.changeDisposeDeviceTaskInfoStatus(deviceTask.getId(), DisposeTaskStatus.TASK_FINISHED);
     }
 
-
     /**
      * Hao han device task run.
      *
@@ -474,16 +474,18 @@ public class DeviceTaskManagerServiceImpl implements DeviceTaskManagerService {
                       ret.getSecondParam(), deviceTask);
         } else {
             // 任务出错，不在重试，当做失败任务处理
-            deviceTaskManager.setAttackTypeStatus(deviceTask.getId(),
+            deviceTaskManager.setAttackTypeStatus(deviceTask.getId(), disposeTask.getFlowDirection(), 0L);
-                    disposeTask.getFlowDirection(), 0L);
 
             // 设置该任务为启动失败
-            deviceTaskManager.changeDisposeDeviceTaskInfoStatus(deviceTask.getId(), DisposeTaskStatus.TASK_NEW);
+            deviceTaskManager.changeDisposeDeviceTaskInfoStatus(deviceTask.getId(),
+                                                                DisposeTaskStatus.TASK_START_FAILED);
+
             //任务出错，设备任务状态为启动处置任务失败
             deviceTaskManager.changeDisposeDeviceTaskInfoDevStatus(deviceTask.getId(),
                                                                    (long) PengXinTaskStatus.TASK_STARTED_FAILED.getValue());
+
             // 记录任务出错重试次数
-            deviceTaskManager.setTaskErrRetryTimes(deviceTask.getId(), deviceTask.getErrRetry() + 1);
+            deviceTaskManager.setTaskErrRetryTimes(deviceTask.getId(), 0);
 
             log.error("PENGXIN_PLATFORM setup task error {}: {}", ret.getFirstParam(), deviceTask);
         }
@@ -500,7 +502,7 @@ public class DeviceTaskManagerServiceImpl implements DeviceTaskManagerService {
         MulReturnType<ErrorCode, Long> ret;
 
         // 重试错误次数过多
-        if (deviceTask.getErrRetry() > DisposeConfigValue.CALL_ERROR_RETRY_TIMES * 2) {
+        if (deviceTask.getErrRetry() > DisposeConfigValue.CALL_ERROR_RETRY_TIMES) {
             return;
         }
 
@@ -514,25 +516,23 @@ 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 * 2) {
+        } else if (deviceTask.getErrRetry() < DisposeConfigValue.CALL_ERROR_RETRY_TIMES) {
             // 记录任务出错重试次数
             deviceTaskManager.setTaskErrRetryTimes(deviceTask.getId(), deviceTask.getErrRetry() + 1);
-            // 设置任务状态为处置中，待下次重试停止
-            deviceTaskManager.changeDisposeDeviceTaskInfoStatus(deviceTask.getId(), DisposeTaskStatus.TASK_STARTED);
             log.error("PENGXIN_PLATFORM stop task times {} error {}: {}", deviceTask.getErrRetry(),
                       ret.getSecondParam(), deviceTask);
         } else {
             // 记录任务出错重试次数
-            deviceTaskManager.setTaskErrRetryTimes(deviceTask.getId(), deviceTask.getErrRetry() + 1);
+            deviceTaskManager.setTaskErrRetryTimes(deviceTask.getId(), 0);
             // 设置该任务为停止失败
-            deviceTaskManager.changeDisposeDeviceTaskInfoStatus(deviceTask.getId(), DisposeTaskStatus.TASK_FINISHED);
+            deviceTaskManager.changeDisposeDeviceTaskInfoStatus(deviceTask.getId(), DisposeTaskStatus.TASK_STOP_FAILED);
 
             log.error("PENGXIN_PLATFORM stop task error {}: {}", ret.getFirstParam(), deviceTask);
         }
     }
 
     /**
-     * Huawei ATIC device task run.
+     * Hua wei device task run.
      *
      * @param ai          the ai
      * @param deviceTask  the device task
@@ -584,7 +584,7 @@ public class DeviceTaskManagerServiceImpl implements DeviceTaskManagerService {
     }
 
     /**
-     * Huawei ATIC device task stop.
+     * Hua wei device task stop.
      *
      * @param ai          the ai
      * @param deviceTask  the device task
@@ -613,6 +613,118 @@ public class DeviceTaskManagerServiceImpl implements DeviceTaskManagerService {
         }
     }
 
+    /**
+     * Restful device task run.
+     *
+     * @param ai          the ai
+     * @param deviceTask  the device task
+     * @param disposeTask the dispose task
+     * @param deviceType  the device type
+     */
+    private void restfulDeviceTaskRun(AbilityInfo ai, DeviceTask deviceTask, DisposeTask disposeTask,
+                                      DisposeDeviceType deviceType) {
+        MulReturnType<ErrorCode, String> ret;
+
+        // 重试错误次数过多
+        if (deviceTask.getErrRetry() > DisposeConfigValue.CALL_ERROR_RETRY_TIMES) {
+            return;
+        }
+
+        // 设置任务状态为启动中
+        deviceTaskManager.changeDisposeDeviceTaskInfoStatus(deviceTask.getId(), DisposeTaskStatus.TASK_STARTING);
+        // 设置启动任务攻击类型状态
+        deviceTaskManager.setExecAttackType(deviceTask.getId(), NetflowDirection.DIRECTION_BI,
+                                            deviceTask.getTaskAttackType());
+
+        ret = ai.getDb()
+                .runDispose(disposeTask.getDisposeObject(), disposeTask.getObjectType(),
+                            disposeTask.getDisposeCapacity(), null,
+                            null, (long) -(Helper.getTimestampDiffNow(disposeTask.getPlanEndTime()) / 60));
+
+        if (ret.getFirstParam() == ErrorCode.ERR_OK) {
+            // 设置攻击类型任务启动结果
+            deviceTaskManager.setAttackTypeStatus(deviceTask.getId(),
+                                                  disposeTask.getFlowDirection(), deviceTask.getTaskAttackType());
+            // 更改处置任务状态为处置中
+            deviceTaskManager.changeDisposeDeviceTaskInfoStatus(deviceTask.getId(), DisposeTaskStatus.TASK_STARTED);
+
+            // 记录设备返回的任务ID
+            deviceTaskManager.setTaskExternId(deviceTask.getId(), ret.getSecondParam());
+
+            log.info("{} setup task succeed: {}, device taskId {}", deviceType, deviceTask, ret.getSecondParam());
+
+            // 重置错误尝试次数
+            deviceTaskManager.setTaskErrRetryTimes(deviceTask.getId(), 0);
+        } else if (deviceTask.getErrRetry() < DisposeConfigValue.CALL_ERROR_RETRY_TIMES) {
+            // 设置该任务为新任务，待下次重试启动
+            deviceTaskManager.changeDisposeDeviceTaskInfoStatus(deviceTask.getId(), DisposeTaskStatus.TASK_NEW);
+
+            // 记录任务出错重试次数
+            deviceTaskManager.setTaskErrRetryTimes(deviceTask.getId(), deviceTask.getErrRetry() + 1);
+            log.error("{} setup task times {} error {}: {}", deviceType, deviceTask.getErrRetry(),
+                      ret.getSecondParam(),
+                      deviceTask);
+        } else {
+            // 任务出错，不在重试，当做失败任务处理
+            deviceTaskManager.setAttackTypeStatus(deviceTask.getId(), disposeTask.getFlowDirection(), 0L);
+
+            // 设置该任务为启动失败
+            deviceTaskManager.changeDisposeDeviceTaskInfoStatus(deviceTask.getId(),
+                                                                DisposeTaskStatus.TASK_START_FAILED);
+
+            //任务出错，设备任务状态为启动处置任务失败
+            deviceTaskManager.changeDisposeDeviceTaskInfoDevStatus(deviceTask.getId(),
+                                                                   (long) PengXinTaskStatus.TASK_STARTED_FAILED.getValue());
+
+            // 记录任务出错重试次数
+            deviceTaskManager.setTaskErrRetryTimes(deviceTask.getId(), 0);
+
+            log.error("{} setup task error {}: {}", deviceType, ret.getFirstParam(), deviceTask);
+        }
+    }
+
+    /**
+     * Restful device task stop.
+     *
+     * @param ai          the ai
+     * @param deviceTask  the device task
+     * @param disposeTask the dispose task
+     * @param deviceType  the device type
+     */
+    private void restfulDeviceTaskStop(AbilityInfo ai, DeviceTask deviceTask, DisposeTask disposeTask,
+                                 DisposeDeviceType deviceType) {
+        MulReturnType<ErrorCode, Long> ret;
+
+        // 重试错误次数过多
+        if (deviceTask.getErrRetry() > DisposeConfigValue.CALL_ERROR_RETRY_TIMES) {
+            return;
+        }
+
+        // 停止处置任务
+        ret = ai.getDb().stopDispose(disposeTask.getDisposeObject(), disposeTask.getDisposeCapacity(), null, null,
+                                     deviceTask.getExternId());
+
+        if (ret.getFirstParam() == ErrorCode.ERR_OK) {
+            log.info("{} stop task succeed: {}, device taskId {}", deviceType, deviceTask, ret.getSecondParam());
+            // 设置任务状态为结束
+            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) {
+            // 记录任务出错重试次数
+            deviceTaskManager.setTaskErrRetryTimes(deviceTask.getId(), deviceTask.getErrRetry() + 1);
+            log.error("{} stop task times {} error {}: {}", deviceType, deviceTask.getErrRetry(),
+                      ret.getSecondParam(), deviceTask);
+        } else {
+            // 记录任务出错重试次数
+            deviceTaskManager.setTaskErrRetryTimes(deviceTask.getId(), 0);
+            // 设置该任务为停止失败
+            deviceTaskManager.changeDisposeDeviceTaskInfoStatus(deviceTask.getId(), DisposeTaskStatus.TASK_STOP_FAILED);
+
+            log.error("{} stop task error {}: {}", deviceType, ret.getFirstParam(), deviceTask);
+        }
+    }
+
     /**
      * Dispose task manager schedule.
      */
@@ -702,7 +814,8 @@ public class DeviceTaskManagerServiceImpl implements DeviceTaskManagerService {
                     break;
 
                 case PENGXIN_PLATFORM:
-                    pengXinDeviceTaskRun(ai, v, task);
+                    //pengXinDeviceTaskRun(ai, v, task);
+                    restfulDeviceTaskRun(ai, v, task, DisposeDeviceType.PENGXIN_PLATFORM);
                     break;
 
                 case HUAWEI_PLATFORM:
@@ -761,7 +874,7 @@ public class DeviceTaskManagerServiceImpl implements DeviceTaskManagerService {
             // 设置标志，避免对同一个IP重复调用停止处置命令
             taskCache.put(taskStopKey, true);
 
-            deviceTaskManager.changeDisposeDeviceTaskInfoStatus(v.getId(), DisposeTaskStatus.TASK_EXPIRED);
+            //deviceTaskManager.changeDisposeDeviceTaskInfoStatus(v.getId(), DisposeTaskStatus.TASK_EXPIRED);
 
             switch (ai.getDev().getDeviceType()) {
                 case DPTECH_UMC:
@@ -777,7 +890,8 @@ public class DeviceTaskManagerServiceImpl implements DeviceTaskManagerService {
                     break;
 
                 case PENGXIN_PLATFORM:
-                    pengXinDeviceTaskStop(ai, v, task);
+                    //pengXinDeviceTaskStop(ai, v, task);
+                    restfulDeviceTaskStop(ai, v, task, DisposeDeviceType.PENGXIN_PLATFORM);
                     break;
 
                 case HUAWEI_PLATFORM:

src/main/resources/mappers/DeviceTask.xml

@@ -55,18 +55,29 @@
     <select id="getNewTaskInfos" resultMap="device_task">
         SELECT *
         FROM device_task
+        <choose>
+            <when test="status == @com.dispose.common.DisposeTaskStatus@TASK_START_FAILED">
+                WHERE CURRENT_TIMESTAMP - endTime > 300
+            </when>
+            <otherwise>
                 WHERE status = ${@com.dispose.common.DisposeTaskStatus@TASK_NEW.getValue()}
-           OR status = ${@com.dispose.common.DisposeTaskStatus@TASK_STARTING.getValue()}
+            </otherwise>
-           OR status = ${@com.dispose.common.DisposeTaskStatus@TASK_START_FAILED.getValue()}
+        </choose>
     </select>
 
     <select id="getRunningTaskInfos" resultMap="device_task">
         SELECT *
         FROM device_task
+        <choose>
+            <when test="status == @com.dispose.common.DisposeTaskStatus@TASK_STOP_FAILED">
+                WHERE CURRENT_TIMESTAMP - endTime > 300
+            </when>
+            <otherwise>
                 WHERE status = ${@com.dispose.common.DisposeTaskStatus@TASK_NEW.getValue()}
                 OR status = ${@com.dispose.common.DisposeTaskStatus@TASK_STARTING.getValue()}
                 OR status = ${@com.dispose.common.DisposeTaskStatus@TASK_STARTED.getValue()}
-           OR status = ${@com.dispose.common.DisposeTaskStatus@TASK_STOP_FAILED.getValue()}
+            </otherwise>
+        </choose>
     </select>
 
     <select id="getTaskByDetails" resultMap="device_task">
@@ -95,7 +106,8 @@
     <update id="changeTaskDevStatus">
         UPDATE device_task
         SET devStatus = #{devStatus}
-        WHERE id = #{id} AND devStatus != #{devStatus}
+        WHERE id = #{id}
+          AND devStatus != #{devStatus}
     </update>
 
     <update id="changeExecAttackTypeInValue">
@@ -136,10 +148,11 @@
 
     <select id="getPengXinTask" resultType="com.dispose.pojo.entity.DeviceTask">
         SELECT dt.*, dd.*
-        FROM device_task dt LEFT JOIN dispose_device dd ON dt.deviceId = dd.id
+        FROM device_task dt
-        WHERE
+                 LEFT JOIN dispose_device dd ON dt.deviceId = dd.id
-            dd.deviceType = 2
+        WHERE dd.deviceType = 2
-        AND
+          AND dt.devStatus != 2
-            dt.devStatus != 2 AND dt.devStatus != 3 AND dt.devStatus != 6
+          AND dt.devStatus != 3
+          AND dt.devStatus != 6
     </select>
 </mapper>