From 1b3fc09bf97da0b1ca292006a2b9855ee9accdbf Mon Sep 17 00:00:00 2001 From: htjcAdmin Date: Wed, 6 Aug 2025 19:44:03 +0800 Subject: [PATCH] =?UTF-8?q?/*=E8=A1=A8=E8=AE=A1=E7=B1=BB=E5=9E=8B=E8=B5=B0?= =?UTF-8?q?=E8=87=AA=E5=B7=B1=E7=9A=84=E5=A4=A7=E6=A8=A1=E5=9E=8B=EF=BC=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0ANALYSIS=5FBIG=5FURL=5FMETER=E5=88=86?= =?UTF-8?q?=E6=94=AF*/?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/core/constant/AlgConstants.java | 1 + .../analysis/constant/AnalyseConstants.java | 1 + .../service/AnalyseRequestServiceImpl.java | 31 +++++++++++++++---- 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/constant/AlgConstants.java b/inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/constant/AlgConstants.java index 807abfa..3fa85a6 100644 --- a/inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/constant/AlgConstants.java +++ b/inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/constant/AlgConstants.java @@ -6,6 +6,7 @@ public class AlgConstants { public static final String INFRA_YU3 = "infra_yu3"; public static final String INFRA_CAMERA = "infra_camera"; public static final String INFRA_CAMERA_REVERSE = "infra_camera_reverse"; + public static final String INFRARED2 = "infrared2"; public static final String XB = "xb"; public static final String ALG_SUBTYPE_CODE = "alg_subtype_code"; diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/constant/AnalyseConstants.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/constant/AnalyseConstants.java index 003026f..dcc7803 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/constant/AnalyseConstants.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/constant/AnalyseConstants.java @@ -37,6 +37,7 @@ public class AnalyseConstants { public static final String ANALYSE_FILTER_URL = "ANALYSE_FILTER_URL"; 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"; public static final String MAX_NUM = "MAX_NUM"; public static final String ALGORITHM_REQUEST_QUEUE = "algorithm:request:queue"; diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/AnalyseRequestServiceImpl.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/AnalyseRequestServiceImpl.java index 6007030..b237a9c 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/AnalyseRequestServiceImpl.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/AnalyseRequestServiceImpl.java @@ -91,12 +91,15 @@ public class AnalyseRequestServiceImpl implements IAnalyseRequestService { // } // }); - if(checkInfraredType(typeList)) { + if (checkInfraredType(typeList)) { requestUrl = patrolTaskService.selectConfigByKey(AnalyseConstants.ANALYSIS_BIG_URL_INFRARED); - log.info("BIG_MODEL_INFRARED requestId: {}, requestUrl: {}", requestId, requestUrl); + log.info("ANALYSIS_BIG_URL_INFRARED requestId: {}, requestUrl: {}", requestId, requestUrl); + } else if (checkMeterType(typeList)) { + requestUrl = patrolTaskService.selectConfigByKey(AnalyseConstants.ANALYSIS_BIG_URL_METER); + log.info("ANALYSIS_BIG_URL_METER requestId: {}, requestUrl: {}", requestId, requestUrl); } else { requestUrl = patrolTaskService.selectConfigByKey(AnalyseConstants.ANALYSIS_BIG_URL); - log.info("BIG_MODEL_OTHER requestId: {}, requestUrl: {}", requestId, requestUrl); + log.info("DEFAULT ANALYSIS_BIG_URL requestId: {}, requestUrl: {}", requestId, requestUrl); } final String analyzeBigModelRequestIdRedisKey = AnalyseConstants.ANALYSE_AI_REQUEST.concat(requestId); @@ -107,7 +110,7 @@ public class AnalyseRequestServiceImpl implements IAnalyseRequestService { redisService.setCacheObject(analyzeBigModelRequestIdRedisKey, analyseReq.clone(), requestTimeout, TimeUnit.DAYS); } - if(StringUtil.isEmpty(requestUrl)) { + if (StringUtil.isEmpty(requestUrl)) { requestUrl = "http://localhost:8080"; } @@ -115,13 +118,13 @@ public class AnalyseRequestServiceImpl implements IAnalyseRequestService { analyseReq.setRequestUrl(requestUrl.concat(AnalyseConstants.ANALYSE_URI)); analyseReq.setRedissonTime(DateUtils.parseDateToStr(DateUtils.yyyyMMddHHmmss, new Date())); - if(testMode) { + if (testMode) { delayQueueService.submitRequest(AnalyseConstants.ANALYSE_REQ_DELAY_QUEUE, analyseReq, (3L), TimeUnit.MINUTES); } else { delayQueueService.submitRequest(AnalyseConstants.ANALYSE_REQ_DELAY_QUEUE, analyseReq, requestTimeout, TimeUnit.DAYS); } - if(!retryDelegate.callRemoteAnalyseService(analyseReq)) { + if (!retryDelegate.callRemoteAnalyseService(analyseReq)) { log.info("FINALLY FAIL CALL REMOTE ANALYSE SERVICE, requestId: {}, taskPatrolId: {}", analyseReq.getRequestId(), analyseReq.getTaskPatrolId()); @@ -141,6 +144,10 @@ public class AnalyseRequestServiceImpl implements IAnalyseRequestService { AlgConstants.INFRA_CAMERA_REVERSE )); + private static final Set METER_TYPES = new HashSet<>(Arrays.asList( + AlgConstants.METER + )); + public static boolean checkInfraredType(String[] typeList) { if (typeList == null) { return false; @@ -153,6 +160,18 @@ public class AnalyseRequestServiceImpl implements IAnalyseRequestService { return false; } + public static boolean checkMeterType(String[] typeList) { + if (typeList == null) { + return false; + } + for (String type : typeList) { + if (METER_TYPES.contains(type)) { + return true; + } + } + return false; + } + public static void main(String[] args) { try { ObjectMapper mapper = new ObjectMapper();