Browse Source

/*红外走自己的初筛*/

master
htjcAdmin 3 months ago
parent
commit
671cef173c
2 changed files with 25 additions and 1 deletions
  1. +1
    -0
      inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/constant/AnalyseConstants.java
  2. +24
    -1
      inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/AnalyseRequestServiceImpl.java

+ 1
- 0
inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/constant/AnalyseConstants.java View File

@ -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";


+ 24
- 1
inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/AnalyseRequestServiceImpl.java View File

@ -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;


Loading…
Cancel
Save