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

OCT 

REM:
1. 设置externId前进行参数检查
This commit is contained in:
HuangXin 2020-11-27 15:40:51 +08:00
parent e3b6d9f621
commit 69a4031034
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -649,9 +649,12 @@ public class DeviceTaskManagerServiceImpl implements DeviceTaskManagerService {
deviceTaskManager.changeDisposeDeviceTaskInfoStatus(deviceTask.getId(), DisposeTaskStatus.TASK_STARTED); deviceTaskManager.changeDisposeDeviceTaskInfoStatus(deviceTask.getId(), DisposeTaskStatus.TASK_STARTED);
// 记录设备返回的任务ID // 记录设备返回的任务ID
deviceTaskManager.setTaskExternId(deviceTask.getId(), ret.getSecondParam()); if (ret.getSecondParam() != null && ret.getSecondParam().length() > 0) {
deviceTaskManager.setTaskExternId(deviceTask.getId(), ret.getSecondParam());
log.info("{} setup task succeed: {}, device taskId {}", deviceType, deviceTask, ret.getSecondParam()); log.info("{} setup task succeed: {}, device taskId {}", deviceType, deviceTask, ret.getSecondParam());
} else {
log.info("{} setup task succeed: {}, unnecessary device taskId", deviceType, deviceTask);
}
// 重置错误尝试次数 // 重置错误尝试次数
deviceTaskManager.setTaskErrRetryTimes(deviceTask.getId(), 0); deviceTaskManager.setTaskErrRetryTimes(deviceTask.getId(), 0);
@ -662,8 +665,7 @@ public class DeviceTaskManagerServiceImpl implements DeviceTaskManagerService {
// 记录任务出错重试次数 // 记录任务出错重试次数
deviceTaskManager.setTaskErrRetryTimes(deviceTask.getId(), deviceTask.getErrRetry() + 1); deviceTaskManager.setTaskErrRetryTimes(deviceTask.getId(), deviceTask.getErrRetry() + 1);
log.error("{} setup task times {} error {}: {}", deviceType, deviceTask.getErrRetry(), log.error("{} setup task times {} error {}: {}", deviceType, deviceTask.getErrRetry(),
ret.getSecondParam(), ret.getSecondParam(), deviceTask);
deviceTask);
} else { } else {
// 任务出错，不在重试，当做失败任务处理 // 任务出错，不在重试，当做失败任务处理
deviceTaskManager.setAttackTypeStatus(deviceTask.getId(), disposeTask.getFlowDirection(), 0L); deviceTaskManager.setAttackTypeStatus(deviceTask.getId(), disposeTask.getFlowDirection(), 0L);
@ -692,7 +694,7 @@ public class DeviceTaskManagerServiceImpl implements DeviceTaskManagerService {
* @param deviceType the device type * @param deviceType the device type
*/ */
private void restfulDeviceTaskStop(AbilityInfo ai, DeviceTask deviceTask, DisposeTask disposeTask, private void restfulDeviceTaskStop(AbilityInfo ai, DeviceTask deviceTask, DisposeTask disposeTask,
DisposeDeviceType deviceType) { DisposeDeviceType deviceType) {
MulReturnType<ErrorCode, Long> ret; MulReturnType<ErrorCode, Long> ret;
// 重试错误次数过多 // 重试错误次数过多