OCT

REM:
1. 备份代码

config/application-dispose.properties

@@ -3,8 +3,8 @@ dispose.debug-model=true
 dispose.check-protocol-timeout=false
 dispose.split_char=,
 dispose.request-timeout-second=5
-
 dispose.used-privacy-protect=true
+dispose.call-error-retry-times=3
 
 # 迪普设备配置
 # 发送超时时间(s)

src/main/java/com/dispose/ability/DeviceDisposeAbility.java

@@ -0,0 +1,32 @@
+package com.dispose.ability;
+
+import com.dispose.common.DisposeCapacityType;
+
+/**
+ * The interface Device dispose ability.
+ *
+ * @param <T> the type parameter
+ * @author <huangxin@cmhi.chinamoblie.com>
+ */
+public interface DeviceDisposeAbility <T> {
+    /**
+     * Device dispose exec t.
+     *
+     * @param callback the callback
+     * @param capType  the cap type
+     * @param ipAddr   the ip addr
+     * @param args     the args
+     * @return the t
+     */
+    T deviceDisposeExec(DisposeTaskCallback callback, DisposeCapacityType capType, String ipAddr, Object... args);
+
+    /**
+     * Device dispose stop t.
+     *
+     * @param callback the callback
+     * @param capType  the cap type
+     * @param args     the args
+     * @return the t
+     */
+    T deviceDisposeStop(DisposeTaskCallback callback, DisposeCapacityType capType, Object... args);
+}

src/main/java/com/dispose/ability/DisposeTaskCallback.java

@@ -0,0 +1,17 @@
+package com.dispose.ability;
+
+import com.dispose.common.ErrorCode;
+
+/**
+ * The interface Dispose task callback.
+ *
+ * @author <huangxin@cmhi.chinamoblie.com>
+ */
+public interface DisposeTaskCallback {
+    /**
+     * Upgrade status callback.
+     *
+     * @param err the err
+     */
+    void upgradeStatusCallback(ErrorCode err);
+}

src/main/java/com/dispose/ability/impl/HaoHanAbilityImpl.java

@@ -1,6 +1,8 @@
 package com.dispose.ability.impl;
 
+import com.dispose.ability.DeviceDisposeAbility;
 import com.dispose.ability.DisposeAbility;
+import com.dispose.ability.DisposeTaskCallback;
 import com.dispose.common.DDoSAttackType;
 import com.dispose.common.DisposeCapacityType;
 import com.dispose.common.ErrorCode;
@@ -22,7 +24,7 @@ import javax.annotation.Nullable;
  */
 @Component
 @Slf4j
-public class HaoHanAbilityImpl implements DisposeAbility {
+public class HaoHanAbilityImpl implements DisposeAbility, DeviceDisposeAbility<MulReturnType<ErrorCode, Long>> {
 
     /**
      * The constant DISPOSE_PLATFORM_NAME.
@@ -65,9 +67,9 @@ public class HaoHanAbilityImpl implements DisposeAbility {
                                                      @Nullable DDoSAttackType[] attackType,
                                                      @Nullable Long duration) {
         return runDispose(ip, capType,
-                NetflowDirection.DIRECTION_BI,
+            NetflowDirection.DIRECTION_BI,
-                DDoSAttackType.ALL_ATTACKS,
+            DDoSAttackType.ALL_ATTACKS,
-                duration);
+            duration);
     }
 
     /**
@@ -93,7 +95,7 @@ public class HaoHanAbilityImpl implements DisposeAbility {
         }
 
         HaoHanStartCleanResp resp = restfulInterface.startClean(this.urlRootPath, ip, duration.intValue(),
-                DISPOSE_PLATFORM_NAME);
+            DISPOSE_PLATFORM_NAME);
 
         if (resp == null) {
             log.error("----Error Haohan start clean {} server return error", ip);
@@ -125,9 +127,9 @@ public class HaoHanAbilityImpl implements DisposeAbility {
                                                       @Nullable DDoSAttackType[] attackType,
                                                       @Nullable Long taskId) {
         return stopDispose(ip, capType,
-                NetflowDirection.DIRECTION_BI,
+            NetflowDirection.DIRECTION_BI,
-                DDoSAttackType.ALL_ATTACKS,
+            DDoSAttackType.ALL_ATTACKS,
-                taskId);
+            taskId);
     }
 
     /**
@@ -152,7 +154,7 @@ public class HaoHanAbilityImpl implements DisposeAbility {
         }
 
         HaoHanStopCleanResp resp = restfulInterface.stopClean(this.urlRootPath, taskId.intValue(),
-                DISPOSE_PLATFORM_NAME);
+            DISPOSE_PLATFORM_NAME);
 
         if (resp == null) {
             log.error("----Error Haohan stop task{} server return error", taskId);
@@ -182,18 +184,18 @@ public class HaoHanAbilityImpl implements DisposeAbility {
     @Override
     public MulReturnType<ErrorCode, DeviceFirewareInfo> getAbilityDeviceFireware() {
         return new MulReturnType<>(ErrorCode.ERR_OK,
-                DeviceFirewareInfo.builder()
+            DeviceFirewareInfo.builder()
-                        .vendor("HaoHan")
+                .vendor("HaoHan")
-                        .model("Unknown")
+                .model("Unknown")
-                        .firmware("Unknown")
+                .firmware("Unknown")
-                        .os("Linux Server")
+                .os("Linux Server")
-                        .kernel("Linux")
+                .kernel("Linux")
-                        .arch("x86_64")
+                .arch("x86_64")
-                        .version("Unknown")
+                .version("Unknown")
-                        .memory(-1)
+                .memory(-1)
-                        .freeMemory(-1)
+                .freeMemory(-1)
-                        .cpuUsed(-1)
+                .cpuUsed(-1)
-                        .build());
+                .build());
     }
 
     /**
@@ -206,4 +208,50 @@ public class HaoHanAbilityImpl implements DisposeAbility {
     public Long toDeviceAttackType(Long ddosAttackTypeMask) {
         return ddosAttackTypeMask;
     }
+
+    /**
+     * Device dispose exec mul return type.
+     *
+     * @param capType  the cap type
+     * @param ipAddr   the ip addr
+     * @param duration the duration
+     * @return the mul return type
+     */
+    @Override
+    public MulReturnType<ErrorCode, Long> deviceDisposeExec(DisposeTaskCallback callback,
+                                                            DisposeCapacityType capType,
+                                                            String ipAddr,
+                                                            Object... duration) {
+        MulReturnType<ErrorCode, Long> ret = runDispose(ipAddr,
+            capType,
+            null,
+            DDoSAttackType.ALL_ATTACKS,
+            (long) duration[0]);
+
+        callback.upgradeStatusCallback(ret.getFirstParam());
+
+        return ret;
+    }
+
+    /**
+     * Device dispose stop mul return type.
+     *
+     * @param capType the cap type
+     * @param taskId  the task id
+     * @return the mul return type
+     */
+    @Override
+    public MulReturnType<ErrorCode, Long> deviceDisposeStop(DisposeTaskCallback callback,
+                                                            DisposeCapacityType capType,
+                                                            Object... taskId) {
+        MulReturnType<ErrorCode, Long> ret =  stopDispose(null,
+            null,
+            null,
+            DDoSAttackType.ALL_ATTACKS,
+            (long) taskId[0]);
+
+        callback.upgradeStatusCallback(ret.getFirstParam());
+
+        return ret;
+    }
 }

src/main/java/com/dispose/ability/impl/VirtualAbilityImpl.java

@@ -1,6 +1,8 @@
 package com.dispose.ability.impl;
 
+import com.dispose.ability.DeviceDisposeAbility;
 import com.dispose.ability.DisposeAbility;
+import com.dispose.ability.DisposeTaskCallback;
 import com.dispose.common.DDoSAttackType;
 import com.dispose.common.DisposeCapacityType;
 import com.dispose.common.ErrorCode;
@@ -15,7 +17,7 @@ import javax.annotation.Nullable;
  *
  * @author <huangxin@cmhi.chinamoblie.com>
  */
-public class VirtualAbilityImpl implements DisposeAbility {
+public class VirtualAbilityImpl implements DisposeAbility, DeviceDisposeAbility<ErrorCode> {
     /**
      * Init device env.
      *
@@ -106,18 +108,18 @@ public class VirtualAbilityImpl implements DisposeAbility {
     @Override
     public MulReturnType<ErrorCode, DeviceFirewareInfo> getAbilityDeviceFireware() {
         return new MulReturnType<>(ErrorCode.ERR_OK,
-                DeviceFirewareInfo.builder()
+            DeviceFirewareInfo.builder()
-                        .vendor("Virtual")
+                .vendor("Virtual")
-                        .model("Dispose_1000")
+                .model("Dispose_1000")
-                        .firmware("Unknown")
+                .firmware("Unknown")
-                        .os("Unknown")
+                .os("Unknown")
-                        .kernel("Linux")
+                .kernel("Linux")
-                        .arch("x86_64")
+                .arch("x86_64")
-                        .version("Virtual_Device_2.0")
+                .version("Virtual_Device_2.0")
-                        .memory(-1)
+                .memory(-1)
-                        .freeMemory(-1)
+                .freeMemory(-1)
-                        .cpuUsed(-1)
+                .cpuUsed(-1)
-                        .build());
+                .build());
     }
 
     /**
@@ -140,4 +142,46 @@ public class VirtualAbilityImpl implements DisposeAbility {
     public Long toDeviceAttackType(Long ddosAttackTypeMask) {
         return ddosAttackTypeMask;
     }
+
+    /**
+     * Device dispose exec error code.
+     *
+     * @param capType  the cap type
+     * @param ipAddr   the ip addr
+     * @param duration the duration
+     * @return the error code
+     */
+    @Override
+    public ErrorCode deviceDisposeExec(DisposeTaskCallback callback, DisposeCapacityType capType, String ipAddr,
+                                       Object... duration) {
+        ErrorCode ret = runDispose(ipAddr,
+            capType,
+            null,
+            DDoSAttackType.ALL_ATTACKS,
+            null).getFirstParam();
+
+        callback.upgradeStatusCallback(ret);
+
+        return ret;
+    }
+
+    /**
+     * Device dispose stop error code.
+     *
+     * @param capType the cap type
+     * @param taskId  the task id
+     * @return the error code
+     */
+    @Override
+    public ErrorCode deviceDisposeStop(DisposeTaskCallback callback, DisposeCapacityType capType, Object... taskId) {
+        ErrorCode ret = stopDispose(null,
+            capType,
+            null,
+            DDoSAttackType.ALL_ATTACKS,
+            null).getFirstParam();
+
+        callback.upgradeStatusCallback(ret);
+
+        return ret;
+    }
 }

src/main/java/com/dispose/common/DisposeConfigValue.java

@@ -21,4 +21,9 @@ public class DisposeConfigValue {
      * The constant USED_PRIVACY_PROTECT.
      */
     public static volatile boolean USED_PRIVACY_PROTECT = false;
+
+    /**
+     * The constant CALL_ERROR_RETRY_TIMES.
+     */
+    public static volatile int CALL_ERROR_RETRY_TIMES=5;
 }

src/main/java/com/dispose/config/DisposeConfigure.java

@@ -34,4 +34,9 @@ public class DisposeConfigure {
      * The Used privacy protect.
      */
     private String usedPrivacyProtect;
+
+    /**
+     * The Call error retry times.
+     */
+    public String callErrorRetryTimes;
 }

src/main/java/com/dispose/manager/DeviceTaskManager.java

@@ -1,12 +1,13 @@
 package com.dispose.manager;
 
 import com.dispose.common.DisposeTaskStatus;
+import com.dispose.common.NetflowDirection;
 import com.dispose.pojo.entity.DeviceTask;
 
 import java.util.List;
 
 /**
- * The interface Task info manager.
+ * The interface Device task manager.
  *
  * @author <huangxin@cmhi.chinamoblie.com>
  */
@@ -36,4 +37,33 @@ public interface DeviceTaskManager {
      * @return the boolean
      */
     boolean changeDisposeDeviceTaskInfoStatus(Long id, DisposeTaskStatus status);
+
+    /**
+     * Sets exec attack type.
+     *
+     * @param id             the id
+     * @param nf             the nf
+     * @param attackTypeMask the attack type mask
+     * @return the exec attack type
+     */
+    boolean setExecAttackType(Long id, NetflowDirection nf, Long attackTypeMask);
+
+    /**
+     * Sets attack type status.
+     *
+     * @param id             the id
+     * @param nf             the nf
+     * @param attackTypeMask the attack type mask
+     * @return the attack type status
+     */
+    boolean setAttackTypeStatus(Long id, NetflowDirection nf, Long attackTypeMask);
+
+    /**
+     * Sets task err retry times.
+     *
+     * @param id     the id
+     * @param rTimes the r times
+     * @return the task err retry times
+     */
+    boolean setTaskErrRetryTimes(Long id, Integer rTimes);
 }

src/main/java/com/dispose/manager/impl/DeviceTaskManagerImpl.java

@@ -1,6 +1,7 @@
 package com.dispose.manager.impl;
 
 import com.dispose.common.DisposeTaskStatus;
+import com.dispose.common.NetflowDirection;
 import com.dispose.manager.DeviceTaskManager;
 import com.dispose.mapper.DeviceTaskMapper;
 import com.dispose.pojo.entity.DeviceTask;
@@ -11,7 +12,7 @@ import javax.annotation.Resource;
 import java.util.List;
 
 /**
- * The type Task info manager.
+ * The type Device task manager.
  *
  * @author <huangxin@cmhi.chinamoblie.com>
  */
@@ -19,7 +20,7 @@ import java.util.List;
 @Slf4j
 public class DeviceTaskManagerImpl implements DeviceTaskManager {
     /**
-     * The Task info mapper.
+     * The Device task mapper.
      */
     @Resource
     private DeviceTaskMapper deviceTaskMapper;
@@ -67,4 +68,55 @@ public class DeviceTaskManagerImpl implements DeviceTaskManager {
     public boolean changeDisposeDeviceTaskInfoStatus(Long id, DisposeTaskStatus status) {
         return deviceTaskMapper.changeTaskStatus(id, status) == 1;
     }
+
+    /**
+     * Sets exec attack type.
+     *
+     * @param id             the id
+     * @param nf             the nf
+     * @param attackTypeMask the attack type mask
+     * @return the exec attack type
+     */
+    @Override
+    public boolean setExecAttackType(Long id, NetflowDirection nf, Long attackTypeMask) {
+        int ret = 0;
+
+        if(nf != NetflowDirection.DIRECTION_IN) {
+            ret = deviceTaskMapper.changeExecAttackTypeOutValue(id, attackTypeMask);
+        }
+
+        if(nf != NetflowDirection.DIRECTION_OUT) {
+            ret = deviceTaskMapper.changeAttackTypeStatusInValue(id, attackTypeMask);
+        }
+
+        return ret == 1;
+    }
+
+    /**
+     * Sets attack type status.
+     *
+     * @param id             the id
+     * @param nf             the nf
+     * @param attackTypeMask the attack type mask
+     * @return the attack type status
+     */
+    @Override
+    public boolean setAttackTypeStatus(Long id, NetflowDirection nf, Long attackTypeMask) {
+        int ret = 0;
+
+        if(nf != NetflowDirection.DIRECTION_IN) {
+            ret = deviceTaskMapper.changeAttackTypeStatusOutValue(id, attackTypeMask);
+        }
+
+        if(nf != NetflowDirection.DIRECTION_OUT) {
+            ret = deviceTaskMapper.changeAttackTypeStatusInValue(id, attackTypeMask);
+        }
+
+        return ret == 1;
+    }
+
+    @Override
+    public boolean setTaskErrRetryTimes(Long id, Integer rTimes) {
+        return deviceTaskMapper.changeErrRetry(id, rTimes) == 1;
+    }
 }

src/main/java/com/dispose/mapper/DeviceTaskMapper.java

@@ -71,4 +71,54 @@ public interface DeviceTaskMapper {
      */
     int changeTaskStatus(@Param("id") Long id,
                          @Param("status") DisposeTaskStatus status);
+
+    /**
+     * Change exec attack type in value int.
+     *
+     * @param id              the id
+     * @param attackTypeValue the attack type value
+     * @return the int
+     */
+    int changeExecAttackTypeInValue(@Param("id") Long id,
+                                    @Param("attackTypeValue") Long attackTypeValue);
+
+    /**
+     * Change exec attack type out value int.
+     *
+     * @param id              the id
+     * @param attackTypeValue the attack type value
+     * @return the int
+     */
+    int changeExecAttackTypeOutValue(@Param("id") Long id,
+                                    @Param("attackTypeValue") Long attackTypeValue);
+
+    /**
+     * Change attack type status in value int.
+     *
+     * @param id               the id
+     * @param attackStatsValue the attack stats value
+     * @return the int
+     */
+    int changeAttackTypeStatusInValue(@Param("id") Long id,
+                                    @Param("attackStatsValue") Long attackStatsValue);
+
+    /**
+     * Change attack type status out value int.
+     *
+     * @param id               the id
+     * @param attackStatsValue the attack stats value
+     * @return the int
+     */
+    int changeAttackTypeStatusOutValue(@Param("id") Long id,
+                                      @Param("attackTypeValue") Long attackStatsValue);
+
+    /**
+     * Change err retry int.
+     *
+     * @param id       the id
+     * @param errRetry the err retry
+     * @return the int
+     */
+    int changeErrRetry(@Param("id") Long id,
+                       @Param("errRetry") Integer errRetry);
 }

src/main/java/com/dispose/pojo/entity/DeviceTask.java

@@ -15,7 +15,9 @@ import javax.persistence.Table;
 import java.io.Serializable;
 
 /**
- * The type Task info.
+ * The type Device task.
+ *
+ * @author <huangxin@cmhi.chinamoblie.com>
  */
 @Data
 @NoArgsConstructor
@@ -77,6 +79,10 @@ public class DeviceTask implements Serializable {
      * The Extern id.
      */
     private Long externId;
+    /**
+     * The Err retry.
+     */
+    private Integer errRetry;
     /**
      * The Status.
      */

src/main/java/com/dispose/pojo/entity/DisposeTask.java

@@ -88,7 +88,6 @@ public class DisposeTask implements Serializable {
      * The Current status.
      */
     private DisposeTaskStatus currentStatus;
-
     /**
      * The Task info.
      */

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

@@ -1,6 +1,8 @@
 package com.dispose.service.impl;
 
-import com.dispose.common.DDoSAttackType;
+import com.dispose.ability.impl.HaoHanAbilityImpl;
+import com.dispose.ability.impl.VirtualAbilityImpl;
+import com.dispose.common.DisposeConfigValue;
 import com.dispose.common.DisposeTaskStatus;
 import com.dispose.common.ErrorCode;
 import com.dispose.common.Helper;
@@ -9,7 +11,6 @@ import com.dispose.manager.DeviceTaskManager;
 import com.dispose.manager.DisposeTaskManager;
 import com.dispose.pojo.entity.DisposeTask;
 import com.dispose.pojo.po.AbilityInfo;
-import com.dispose.pojo.po.MulReturnType;
 import com.dispose.service.DeviceTaskManagerService;
 import com.dispose.service.DisposeAbilityRouterService;
 import lombok.extern.slf4j.Slf4j;
@@ -34,7 +35,7 @@ public class DeviceTaskManagerServiceImpl implements DeviceTaskManagerService {
     private DisposeTaskManager disposeTaskManager;
 
     /**
-     * The Task info manager.
+     * The Device task manager.
      */
     @Resource
     private DeviceTaskManager deviceTaskManager;
@@ -103,25 +104,74 @@ public class DeviceTaskManagerServiceImpl implements DeviceTaskManagerService {
                         break;
 
                     case HAOHAN_PLATFORM:
+                        // 设置任务状态为启动中
                         deviceTaskManager.changeDisposeDeviceTaskInfoStatus(v.getId(), DisposeTaskStatus.TASK_STARTING);
-
+                        // 设置启动任务攻击类型状态
-                        MulReturnType<ErrorCode, Long> ret = ai.getDb().runDispose(task.getDisposeIp(),
+                        deviceTaskManager.setExecAttackType(v.getId(), NetflowDirection.DIRECTION_BI,
+                            v.getTaskAttackType());
+                        // 调用设备处置能力
+                        ((HaoHanAbilityImpl) ai.getDb()).deviceDisposeExec(
+                            errorCode -> {
+                                // 启动处置任务成功
+                                if (errorCode == ErrorCode.ERR_OK) {
+                                    // 设置攻击类型任务启动结果
+                                    deviceTaskManager.setAttackTypeStatus(v.getId(),
+                                        task.getFlowDirection(), v.getTaskAttackType());
+                                    // 更改处置任务状态为处置中
+                                    deviceTaskManager.changeDisposeDeviceTaskInfoStatus(v.getId(),
+                                        DisposeTaskStatus.TASK_STARTED);
+                                    log.info("HAOHAN_PLATFORM setup task succeed: {}", v);
+                                } else if (v.getErrRetry() < DisposeConfigValue.CALL_ERROR_RETRY_TIMES) {
+                                    // 设置该任务为新任务，待下次重试启动
+                                    deviceTaskManager.changeDisposeDeviceTaskInfoStatus(v.getId(),
+                                        DisposeTaskStatus.TASK_NEW);
+                                    // 记录任务出错重试次数
+                                    deviceTaskManager.setTaskErrRetryTimes(v.getId(), v.getErrRetry() + 1);
+                                    log.error("HAOHAN_PLATFORM setup task times {} error {}: {}",
+                                        v.getErrRetry(), errorCode, v);
+                                } else {
+                                    // 任务出错，不在重试，当做失败任务处理
+                                    deviceTaskManager.setAttackTypeStatus(v.getId(),
+                                        task.getFlowDirection(), ~v.getTaskAttackType());
+                                    log.error("HAOHAN_PLATFORM setup task error {}: {}", errorCode, v);
+                                }
+                            },
                             task.getDisposeCapacity(),
-                            NetflowDirection.DIRECTION_BI,
+                            task.getDisposeIp(),
-                            DDoSAttackType.ALL_ATTACKS,
+                            (long) Helper.getTimestampDiffNow(task.getPlanEndTime()));
-                            (long)Helper.getTimestampDiffNow(task.getPlanEndTime()));
+                        break;
 
-                        deviceTaskManager.changeDisposeDeviceTaskInfoStatus(v.getId(), DisposeTaskStatus.TASK_STARTED);
+                    case VIRTUAL_DISPOSE:
+                        // 设置任务状态为启动中
+                        deviceTaskManager.changeDisposeDeviceTaskInfoStatus(v.getId(), DisposeTaskStatus.TASK_STARTING);
+                        // 设置启动任务攻击类型状态
+                        deviceTaskManager.setExecAttackType(v.getId(), NetflowDirection.DIRECTION_BI,
+                            v.getTaskAttackType());
 
-                        if(ret.getFirstParam() != ErrorCode.ERR_OK) {
+                        ((VirtualAbilityImpl) ai.getDb()).deviceDisposeExec(
-                            log.error("HAOHAN_PLATFORM setup task error {}: {}", ret.getFirstParam(), v);
+                            errorCode -> {
-                        } else {
+                                // 启动处置任务成功
-
+                                if (errorCode == ErrorCode.ERR_OK) {
-                        }
+                                    // 设置攻击类型任务启动结果
+                                    deviceTaskManager.setAttackTypeStatus(v.getId(),
+                                        task.getFlowDirection(), v.getTaskAttackType());
+                                    // 更改处置任务状态为处置中
+                                    deviceTaskManager.changeDisposeDeviceTaskInfoStatus(v.getId(),
+                                        DisposeTaskStatus.TASK_STARTED);
+                                    log.info("VIRTUAL_DISPOSE setup task succeed: {}", v);
+                                } else {
+                                    // 任务出错，不在重试，当做失败任务处理
+                                    deviceTaskManager.setAttackTypeStatus(v.getId(),
+                                        task.getFlowDirection(), ~v.getTaskAttackType());
+                                    log.error("VIRTUAL_DISPOSE setup task error {}: {}", errorCode, v);
+                                }
+                            },
+                            task.getDisposeCapacity(),
+                            task.getDisposeIp());
                         break;
 
                     default:
-
+                        log.error("Unknown dispose device type: {}", ai.getDev());
                         break;
                 }
 

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

@@ -68,11 +68,11 @@ public class DisposeAbilityRouterServiceImpl implements DisposeAbilityRouterServ
     @Override
     public AbilityInfo getAbilityDevice(Long id) {
         DisposeDevice dev = disposeDeviceManager.getAllNormalDisposeDevices().parallelStream()
-                .filter(v -> v.getId().equals(id))
+            .filter(v -> v.getId().equals(id))
-                .findAny()
+            .findAny()
-                .orElse(null);
+            .orElse(null);
 
-        if(dev != null) {
+        if (dev != null) {
             return disposeAbilityMap.get(getAbilityDeviceHashKey(dev.getIpAddr(), dev.getIpPort()));
         }
 
@@ -123,10 +123,10 @@ public class DisposeAbilityRouterServiceImpl implements DisposeAbilityRouterServ
 
         // 缓存处置设备到Hash表中
         disposeAbilityMap.put(addr, AbilityInfo.builder()
-                .db(db)
+            .db(db)
-                .dev(dev)
+            .dev(dev)
-                .linkStatus(false)
+            .linkStatus(false)
-                .build());
+            .build());
 
         return ErrorCode.ERR_OK;
     }

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

@@ -26,7 +26,6 @@ public class DisposeTaskServiceImpl implements DisposeTaskService {
     @Override
     public MulReturnType<ErrorCode, Long> createTask(DisposeTask task) {
 
-
         if (disposeTaskManager.disposeIpRunning(task.getDeviceId(),
                 task.getDisposeIp(), task.getDisposeCapacity())) {
 

src/main/java/com/dispose/setup/SystemInitial.java

@@ -68,14 +68,14 @@ public class SystemInitial implements CommandLineRunner {
 
         try {
             DpTechConfigValue.SOAP_CONNECT_TIMEOUT_SECOND =
-                    Integer.parseInt(dpTechConfigure.getSoapConnTimeoutSecond());
+                Integer.parseInt(dpTechConfigure.getSoapConnTimeoutSecond());
         } catch (Exception ex) {
             log.error("load SOAP_CONNECT_TIMEOUT_SECOND configure error: {}", ex.getMessage());
         }
 
         try {
             DpTechConfigValue.SOAP_RECEIVE_TIMEOUT_SECOND =
-                    Integer.parseInt(dpTechConfigure.getSoapRecvTimeoutSecond());
+                Integer.parseInt(dpTechConfigure.getSoapRecvTimeoutSecond());
         } catch (Exception ex) {
             log.error("load SOAP_RECEIVE_TIMEOUT_SECOND configure error: {}", ex.getMessage());
         }
@@ -88,7 +88,7 @@ public class SystemInitial implements CommandLineRunner {
 
         try {
             DisposeConfigValue.CHECK_PROTO_REQUEST_TIMEOUT =
-                    Boolean.parseBoolean(disposeConfigure.getCheckProtocolTimeout());
+                Boolean.parseBoolean(disposeConfigure.getCheckProtocolTimeout());
         } catch (Exception ex) {
             log.error("load CHECK_PROTO_REQUEST_TIMEOUT configure error: {}", ex.getMessage());
         }
@@ -98,6 +98,12 @@ public class SystemInitial implements CommandLineRunner {
         } catch (Exception ex) {
             log.error("load USED_PRIVACY_PROTECT configure error: {}", ex.getMessage());
         }
+
+        try {
+            DisposeConfigValue.CALL_ERROR_RETRY_TIMES = Integer.parseInt(disposeConfigure.getCallErrorRetryTimes());
+        } catch (Exception ex) {
+            log.error("load CALL_ERROR_RETRY_TIMES configure error: {}", ex.getMessage());
+        }
     }
 
     @Async("bizExecutor")

src/main/resources/mappers/DeviceTask.xml

@@ -13,6 +13,7 @@
         <result column="execAttackTypeOut" property="execAttackTypeOut"/>
         <result column="attackTypeStatusOut" property="attackTypeStatusOut"/>
         <result column="externId" property="externId"/>
+        <result column="errRetry" property="errRetry"/>
         <result column="status" property="status"/>
     </resultMap>
 
@@ -75,4 +76,34 @@
         WHERE id = #{id}
     </update>
 
+    <update id="changeExecAttackTypeInValue">
+        UPDATE device_task
+        SET execAttackTypeIn = #{attackTypeValue}
+        WHERE id = #{id}
+    </update>
+
+    <update id="changeExecAttackTypeOutValue">
+        UPDATE device_task
+        SET execAttackTypeOut = #{attackTypeValue}
+        WHERE id = #{id}
+    </update>
+
+    <update id="changeAttackTypeStatusInValue">
+        UPDATE device_task
+        SET attackTypeStatusIn = #{attackStatsValue}
+        WHERE id = #{id}
+    </update>
+
+    <update id="changeAttackTypeStatusOutValue">
+        UPDATE device_task
+        SET execAttackTypeOut = #{attackStatsValue}
+        WHERE id = #{id}
+    </update>
+
+    <update id="changeErrRetry">
+        UPDATE device_task
+        SET errRetry = #{errRetry}
+        WHERE id = #{id}
+    </update>
+
 </mapper>

src/main/resources/mappers/DisposeTask.xml

@@ -26,6 +26,7 @@
             <result column="execAttackTypeOut" property="execAttackTypeOut"/>
             <result column="attackTypeStatusOut" property="attackTypeStatusOut"/>
             <result column="externId" property="externId"/>
+            <result column="errRetry" property="errRetry"/>
             <result column="status" property="status"/>
         </collection>
     </resultMap>
@@ -43,6 +44,7 @@
                ti.execAttackTypeOut   execAttackTypeOut,
                ti.attackTypeStatusOut attackTypeStatusOut,
                ti.externId            externId,
+               ti.errRetry            errRetry,
                ti.status              status
         FROM dispose_task dt
                  LEFT JOIN device_task ti on dt.id = ti.taskId
@@ -61,6 +63,7 @@
                ti.execAttackTypeOut   execAttackTypeOut,
                ti.attackTypeStatusOut attackTypeStatusOut,
                ti.externId            externId,
+               ti.errRetry            errRetry,
                ti.status              status
         FROM dispose_task dt
                  LEFT JOIN device_task ti on dt.id = ti.taskId