|
|
|
@ -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<String> INFRARED_TYPES_2 = new HashSet<>(Arrays.asList( |
|
|
|
|
|
|
|
AlgConstants.INFRA_CAMERA_REVERSE |
|
|
|
)); |
|
|
|
|
|
|
|
private static final Set<String> 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; |
|
|
|
|