diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/utils/ResultAnalysisUtils.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/utils/ResultAnalysisUtils.java index 5fb15a4..753fab7 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/utils/ResultAnalysisUtils.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/utils/ResultAnalysisUtils.java @@ -92,7 +92,7 @@ public class ResultAnalysisUtils { final String correctionValue = value; // 读取字符串中的整数或浮点数(注意集合下只取第一个值,有坑,原值使用correctionValue) value = algValue.formatValue(value); - // 这个不知道为什么加上 + // 初筛时不做算法值的具体解析 if ("1".equals(resultAnalysis.getFilter())) { algType = ""; } diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java index 61f152e..8c86cd2 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java @@ -1227,8 +1227,8 @@ public class PatrolResultController extends BaseController { String devType = patrolTaskDb.getDevType(); String taskCode = patrolTaskDb.getTaskCode(); String[] devTypeArray = Arrays.stream(devType.split(",")).distinct().toArray(String[]::new); - // note 任务包含多个设备类型,则为联合任务 - if (devTypeArray.length > 1) { + // note 联合任务:任务包含多个设备类型 或者 单个非摄像头的设备类型有多个设备编码 + if (devTypeArray.length > 1 || (devTypeArray.length == 1 && devTypeArray[0]!= "2" && patrolTaskDb.getDevNo().split(",").length > 1 )) { // 当taskCode为多设备且redis中正在执行该taskCode的任务时,新增或ignore主任务 final String taskCurrentCode = redisService.getCacheObjectOfTask(RedisConst.TASK_CURRENT_CODE, taskCode); logger.info(Color.CYAN + "task is union task, taskCode: {}, devType: {}, taskCurrentCode: {}" + Color.END, taskCode, devType, taskCurrentCode);