cmhi
/
dispose
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'v2.0.2_dev' into 'master' 

V2.0.2 dev

See merge request DDOSAQ/phoenix_ddos_handle!13
This commit is contained in:
陈玲（杭研） 2020-11-09 15:04:29 +08:00
parent 98aafca281 5c59f57183
commit ce1ef4aa2a
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/dispose/service/impl/DeviceTaskManagerServiceImpl.java
View File

@ -568,6 +568,8 @@ public class DeviceTaskManagerServiceImpl implements DeviceTaskManagerService {
// 如果设备已经删除或者禁用，跳过处理 // 如果设备已经删除或者禁用，跳过处理
if (ai == null) { if (ai == null) {
// 设置任务状态为已完成
deviceTaskManager.changeDisposeDeviceTaskInfoStatus(v.getId(), DisposeTaskStatus.TASK_FINISHED);
continue; continue;
} }
@ -634,6 +636,13 @@ public class DeviceTaskManagerServiceImpl implements DeviceTaskManagerService {
// 获取设备 // 获取设备
AbilityInfo ai = disposeAbilityRouterService.getAbilityDevice(v.getDeviceId()); AbilityInfo ai = disposeAbilityRouterService.getAbilityDevice(v.getDeviceId());
// 如果设备已经删除或者禁用，跳过处理
if (ai == null) {
// 设置任务状态为已完成
deviceTaskManager.changeDisposeDeviceTaskInfoStatus(v.getId(), DisposeTaskStatus.TASK_FINISHED);
continue;
}
// 对处置IP生成一个唯一的操作标识符 // 对处置IP生成一个唯一的操作标识符
String taskStopKey = task.getDisposeObject() + "Stop" + ai.getDev().getDeviceType().getDescription(); String taskStopKey = task.getDisposeObject() + "Stop" + ai.getDev().getDeviceType().getDescription();