diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AnalyseResponseServiceImpl.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AnalyseResponseServiceImpl.java index 8801917..9a1d69e 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AnalyseResponseServiceImpl.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AnalyseResponseServiceImpl.java @@ -164,7 +164,8 @@ public class AnalyseResponseServiceImpl implements IAnalyseResponseService { || AlgConstants.INFRA_1800.equals(algType) || AlgConstants.INFRA_YU3.equals(algType) || AlgConstants.INFRA_CAMERA.equals(algType) - || AlgConstants.INFRA_CAMERA_REVERSE.equals(algType)) + || AlgConstants.INFRA_CAMERA_REVERSE.equals(algType) + || AlgConstants.INFRARED2.equals(algType)) ) { /* * 先检查结果有缺无缺陷,如果有缺陷不用判断算法直接调用大模型;* 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 fcbaa5c..1d3d446 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 @@ -970,6 +970,7 @@ public class PatrolResultController extends BaseController { analyseReq.setValueUnit(patrolResult.getValueUnit()); analyseReq.setValueType(patrolResult.getValueType()); analyseReq.setTypeList(filterList.get(0).getTypeList()); + analyseReq.setCoordinatePixel(patrolResult.getCoordinatePixel()); String requestDataToRedis = new Gson().toJson(analyseReq); logger.info("callRemoteAlgorithm filterList requestDataToRedis: {}", requestDataToRedis); redisService.redisTemplate.opsForList().rightPush(AnalyseConstants.ALGORITHM_REQUEST_QUEUE, requestDataToRedis); @@ -994,6 +995,7 @@ public class PatrolResultController extends BaseController { analyseReq.setFilter(true); analyseReq.setAlgorithmType("bigModelAlgorithm"); analyseReq.setTypeList(bigModelList.get(0).getTypeList()); + analyseReq.setCoordinatePixel(patrolResult.getCoordinatePixel()); String requestDataToRedis = new Gson().toJson(analyseReq); logger.info("callRemoteAlgorithm bigModelList requestDataToRedis: {}", requestDataToRedis); redisService.redisTemplate.opsForList().rightPush(AnalyseConstants.ALGORITHM_REQUEST_QUEUE, requestDataToRedis); diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/domain/AnalyseRequest.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/domain/AnalyseRequest.java index 159f1b4..d4ecd7c 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/domain/AnalyseRequest.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/domain/AnalyseRequest.java @@ -40,6 +40,7 @@ public class AnalyseRequest implements RetryableRequest, Serializable { private String unit; private String valueUnit; private String valueType; + private String coordinatePixel; public AnalyseRequest() {