diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/constant/AnalyseConstants.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/constant/AnalyseConstants.java index 97e2858..debb43f 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/constant/AnalyseConstants.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/constant/AnalyseConstants.java @@ -35,6 +35,7 @@ public class AnalyseConstants { public static final String ANALYSE_IS_FILTER = "ANALYSE_IS_FILTER"; public static final String ANALYSE_IS_METER_FILTER = "ANALYSE_IS_METER_FILTER"; public static final String ANALYSE_FILTER_URL = "ANALYSE_FILTER_URL"; + public static final String ANALYSE_FILTER_URL_INFRARED = "ANALYSE_FILTER_URL_INFRARED"; public static final String ANALYSIS_BIG_URL = "ANALYSIS_BIG_URL"; public static final String ANALYSIS_BIG_URL_INFRARED = "ANALYSIS_BIG_URL_INFRARED"; public static final String ANALYSIS_BIG_URL_METER = "ANALYSIS_BIG_URL_METER"; diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/AnalyseRequestServiceImpl.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/AnalyseRequestServiceImpl.java index 9b3a1d0..8f4abd9 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/AnalyseRequestServiceImpl.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/AnalyseRequestServiceImpl.java @@ -96,7 +96,13 @@ public class AnalyseRequestServiceImpl implements IAnalyseRequestService { sendCompensateRequest(analyseReq); return; } - requestUrl = patrolTaskService.selectConfigByKey(AnalyseConstants.ANALYSE_FILTER_URL); + + if (checkInfraredType2(typeList)) { + requestUrl = patrolTaskService.selectConfigByKey(AnalyseConstants.ANALYSE_FILTER_URL_INFRARED); + log.info("ANALYSE_FILTER_URL_INFRARED requestId: {}, requestUrl: {}", requestId, requestUrl); + } else { + requestUrl = patrolTaskService.selectConfigByKey(AnalyseConstants.ANALYSE_FILTER_URL); + } } else { // 不再使用这个redis键值 @@ -197,6 +203,11 @@ public class AnalyseRequestServiceImpl implements IAnalyseRequestService { AlgConstants.INFRA_CAMERA_REVERSE )); + private static final Set INFRARED_TYPES_2 = new HashSet<>(Arrays.asList( + + AlgConstants.INFRA_CAMERA_REVERSE + )); + private static final Set OLD_INFRARED_TYPES = new HashSet<>(Arrays.asList( "infrared" )); @@ -217,6 +228,18 @@ public class AnalyseRequestServiceImpl implements IAnalyseRequestService { return false; } + public static boolean checkInfraredType2(String[] typeList) { + if (typeList == null) { + return false; + } + for (String type : typeList) { + if (INFRARED_TYPES_2.contains(type)) { + return true; + } + } + return false; + } + public static boolean checkOldInfraredType(String[] typeList) { if (typeList == null) { return false;