diff --git a/inspect-job/src/main/java/com/inspect/job/task/JobMainTask.java b/inspect-job/src/main/java/com/inspect/job/task/JobMainTask.java index dfb7bab..2a5dda8 100644 --- a/inspect-job/src/main/java/com/inspect/job/task/JobMainTask.java +++ b/inspect-job/src/main/java/com/inspect/job/task/JobMainTask.java @@ -1071,6 +1071,7 @@ public class JobMainTask { } + //unused private void prePointExceSilenceControl(PatrolTask task, List patrolTaskInfoList, SimpleDateFormat sdf) { if (patrolTaskInfoList != null && !patrolTaskInfoList.isEmpty()) { PatrolTaskInfo patrolTaskInfo = patrolTaskInfoList.get(0); 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 f63e80a..87b29f6 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 @@ -921,7 +921,7 @@ public class PatrolResultController extends BaseController { //qinyl if (filterList.get(0).getImageUrlList() != null && filterList.get(0).getImageUrlList().length > 0) { String meterFilter = patrolTaskService.selectConfigByKey("ANALYSE_IS_METER_FILTER"); - analyseRemoteService.sendRequest(analyseReq, "1".equals(meterFilter)); + analyseRemoteService.sendRequest(analyseReq, filterList.get(0).getTypeList(), "1".equals(meterFilter)); } } @@ -933,7 +933,7 @@ public class PatrolResultController extends BaseController { analyseReq.setRequestHostIp(MAJOR_URL); analyseReq.setRequestHostPort(TASK_PORT); if (bigList.get(0).getImageUrlList() != null && bigList.get(0).getImageUrlList().length > 0) { - analyseRemoteService.sendRequest(analyseReq, true); + analyseRemoteService.sendRequest(analyseReq, bigList.get(0).getTypeList(), true); } } } diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/AnalyseRemoteService.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/AnalyseRemoteService.java index e5c5cd1..1e343b6 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/AnalyseRemoteService.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/AnalyseRemoteService.java @@ -35,7 +35,7 @@ public class AnalyseRemoteService { private IPatrolTaskService patrolTaskService; //qinyl - public void sendRequest(AnalyseRequest analyseReq, boolean isFilter) { + public void sendRequest(AnalyseRequest analyseReq, String[] typeList, boolean isFilter) { String requestId = UUID.randomUUID().toString().trim().replaceAll(StringUtils.DASH, StringUtils.EMPTY); String taskPatrolId = analyseReq.getTaskPatrolId(); redisService.setCacheObject(RedisConst.REQUEST_UUID + requestId, taskPatrolId, 1L, TimeUnit.DAYS); @@ -51,7 +51,7 @@ public class AnalyseRemoteService { if ("1".equals(analyseFilter) && isFilter) { this.redisService.setCacheObject("ANALYSE_FILTER_REQUEST:" + requestId, analyseReq.clone(), 1L, TimeUnit.HOURS); AnalyseReqItem analyseReqItem = analyseReq.getObjectList().get(0); - analyseReqItem.setTypeList(new String[]{"bj_bpmh"}); + analyseReqItem.setTypeList(typeList); analyseReq.setObjectList(Collections.singletonList(analyseReqItem)); requestUrl = patrolTaskService.selectConfigByKey("ANALYSE_FILTER_URL"); } else {