Browse Source

大模型参数根据配置下发

master
lijw 9 months ago
parent
commit
25fb82f71a
3 changed files with 5 additions and 4 deletions
  1. +1
    -0
      inspect-job/src/main/java/com/inspect/job/task/JobMainTask.java
  2. +2
    -2
      inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java
  3. +2
    -2
      inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/AnalyseRemoteService.java

+ 1
- 0
inspect-job/src/main/java/com/inspect/job/task/JobMainTask.java View File

@ -1071,6 +1071,7 @@ public class JobMainTask {
} }
//unused
private void prePointExceSilenceControl(PatrolTask task, List<PatrolTaskInfo> patrolTaskInfoList, SimpleDateFormat sdf) { private void prePointExceSilenceControl(PatrolTask task, List<PatrolTaskInfo> patrolTaskInfoList, SimpleDateFormat sdf) {
if (patrolTaskInfoList != null && !patrolTaskInfoList.isEmpty()) { if (patrolTaskInfoList != null && !patrolTaskInfoList.isEmpty()) {
PatrolTaskInfo patrolTaskInfo = patrolTaskInfoList.get(0); PatrolTaskInfo patrolTaskInfo = patrolTaskInfoList.get(0);


+ 2
- 2
inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java View File

@ -921,7 +921,7 @@ public class PatrolResultController extends BaseController {
//qinyl //qinyl
if (filterList.get(0).getImageUrlList() != null && filterList.get(0).getImageUrlList().length > 0) { if (filterList.get(0).getImageUrlList() != null && filterList.get(0).getImageUrlList().length > 0) {
String meterFilter = patrolTaskService.selectConfigByKey("ANALYSE_IS_METER_FILTER"); 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.setRequestHostIp(MAJOR_URL);
analyseReq.setRequestHostPort(TASK_PORT); analyseReq.setRequestHostPort(TASK_PORT);
if (bigList.get(0).getImageUrlList() != null && bigList.get(0).getImageUrlList().length > 0) { if (bigList.get(0).getImageUrlList() != null && bigList.get(0).getImageUrlList().length > 0) {
analyseRemoteService.sendRequest(analyseReq, true);
analyseRemoteService.sendRequest(analyseReq, bigList.get(0).getTypeList(), true);
} }
} }
} }


+ 2
- 2
inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/AnalyseRemoteService.java View File

@ -35,7 +35,7 @@ public class AnalyseRemoteService {
private IPatrolTaskService patrolTaskService; private IPatrolTaskService patrolTaskService;
//qinyl //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 requestId = UUID.randomUUID().toString().trim().replaceAll(StringUtils.DASH, StringUtils.EMPTY);
String taskPatrolId = analyseReq.getTaskPatrolId(); String taskPatrolId = analyseReq.getTaskPatrolId();
redisService.setCacheObject(RedisConst.REQUEST_UUID + requestId, taskPatrolId, 1L, TimeUnit.DAYS); redisService.setCacheObject(RedisConst.REQUEST_UUID + requestId, taskPatrolId, 1L, TimeUnit.DAYS);
@ -51,7 +51,7 @@ public class AnalyseRemoteService {
if ("1".equals(analyseFilter) && isFilter) { if ("1".equals(analyseFilter) && isFilter) {
this.redisService.setCacheObject("ANALYSE_FILTER_REQUEST:" + requestId, analyseReq.clone(), 1L, TimeUnit.HOURS); this.redisService.setCacheObject("ANALYSE_FILTER_REQUEST:" + requestId, analyseReq.clone(), 1L, TimeUnit.HOURS);
AnalyseReqItem analyseReqItem = analyseReq.getObjectList().get(0); AnalyseReqItem analyseReqItem = analyseReq.getObjectList().get(0);
analyseReqItem.setTypeList(new String[]{"bj_bpmh"});
analyseReqItem.setTypeList(typeList);
analyseReq.setObjectList(Collections.singletonList(analyseReqItem)); analyseReq.setObjectList(Collections.singletonList(analyseReqItem));
requestUrl = patrolTaskService.selectConfigByKey("ANALYSE_FILTER_URL"); requestUrl = patrolTaskService.selectConfigByKey("ANALYSE_FILTER_URL");
} else { } else {


Loading…
Cancel
Save