From b2a181a0ea3d19e80b56671adb8077b4d748130b Mon Sep 17 00:00:00 2001 From: yinhuaiwei Date: Mon, 16 Mar 2026 12:34:56 +0800 Subject: [PATCH] =?UTF-8?q?fix:=201.=E5=B1=8F=E8=94=BD=E8=BE=85=E5=8A=A9?= =?UTF-8?q?=E5=80=BC=E5=AD=97=E6=AE=B5value2=EF=BC=8C=E5=BE=85=E9=81=BF?= =?UTF-8?q?=E9=9B=B7=E5=99=A8=E6=A0=87=E8=AE=B0=E7=AE=97=E6=B3=95=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E5=90=8E=E6=94=BE=E5=BC=80=EF=BC=9B2.=E8=AF=B7?= =?UTF-8?q?=E6=B1=82=E5=88=86=E6=9E=90=E4=B8=BB=E6=9C=BA=E6=96=B0=E5=A2=9E?= =?UTF-8?q?code=E9=9D=9E200=E8=BF=94=E5=9B=9Efalse=EF=BC=9B3.=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3=E5=88=9D=E7=AD=9B=E5=92=8C=E5=A4=A7=E6=A8=A1=E5=9E=8B?= =?UTF-8?q?=E7=94=A8=E4=B8=8D=E5=90=8CrequestId=EF=BC=88=E6=95=B0=E8=81=9A?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/AnalyseResponseServiceImpl.java | 3 +- .../AnalyseRequestRetryableDelegate.java | 1 + .../service/AnalyseRequestServiceImpl.java | 29 ++++++++++++++----- 3 files changed, 25 insertions(+), 8 deletions(-) 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 4b73106..bea876f 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 @@ -902,7 +902,8 @@ public class AnalyseResponseServiceImpl implements IAnalyseResponseService { AlgValue algValue = selectAlgMap(objectId, analyseResPoint.getType()); resultAnalysisUtils.parseAlg(analyseResPoint.getType(), algValue, value, analyseResPoint.getDesc(), resultAnalysis); // 合并辅助值字段 - resultAnalysisUtils.mergeValue(analyseResPoint ,resultAnalysis); + // todo 等待避雷器表计记算法优化再放开 +// resultAnalysisUtils.mergeValue(analyseResPoint ,resultAnalysis); } return resultAnalysis; diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/AnalyseRequestRetryableDelegate.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/AnalyseRequestRetryableDelegate.java index 446b5c2..60905ec 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/AnalyseRequestRetryableDelegate.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/AnalyseRequestRetryableDelegate.java @@ -36,6 +36,7 @@ public class AnalyseRequestRetryableDelegate { log.info("CALL_REMOTE_ANALYZE RESULT: {}", result); if (!"200".equals(JSONObject.parseObject(result).getString(AnalyseConstants.ANALYSE_CODE))) { log.info("CALL_REMOTE_ANALYZE FAIL: {}", JSONObject.parseObject(result).getString(AnalyseConstants.ANALYSE_CODE)); + return false; } return true; 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 fe9aad4..71b24b8 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 @@ -153,9 +153,10 @@ public class AnalyseRequestServiceImpl implements IAnalyseRequestService { @Override public void sendRequest(AnalyseRequest analyseReq, String[] typeList, boolean isFilter) throws IOException { final long requestTimeout = 1L; - //String requestId = UUID.randomUUID().toString().trim().replaceAll(StringUtils.DASH, StringUtils.EMPTY); - String requestId = StringUtils.isNotEmpty(analyseReq.getRequestId()) ? - analyseReq.getRequestId() : UUID.randomUUID().toString().trim().replaceAll(StringUtils.DASH, StringUtils.EMPTY); + // 数聚的初筛和大模型不能使用同一requestId + String requestId = UUID.randomUUID().toString().trim().replaceAll(StringUtils.DASH, StringUtils.EMPTY); +// String requestId = StringUtils.isNotEmpty(analyseReq.getRequestId()) ? +// analyseReq.getRequestId() : UUID.randomUUID().toString().trim().replaceAll(StringUtils.DASH, StringUtils.EMPTY); String taskPatrolId = analyseReq.getTaskPatrolId(); redisService.setCacheObject(RedisConst.REQUEST_UUID + requestId, taskPatrolId, requestTimeout, TimeUnit.DAYS); log.info("CALL_REMOTE_ANALYZE isFilter: {}, requestId: {}, typeList: {}", isFilter, requestId, typeList); @@ -203,7 +204,7 @@ public class AnalyseRequestServiceImpl implements IAnalyseRequestService { // log.info("ANALYSE_FILTER_URL_INFRARED requestId: {}, requestUrl: {}", requestId, requestUrl); // } else { - requestUrl = patrolTaskService.selectConfigByKey(AnalyseConstants.ANALYSE_FILTER_URL); + requestUrl = getFilterAnalysisUrl(requestId, analyseReq.getDrafter()); log.info("ANALYSE_FILTER_URL requestId: {}, requestUrl: {}", requestId, requestUrl); } @@ -271,11 +272,25 @@ public class AnalyseRequestServiceImpl implements IAnalyseRequestService { } } + /** + * 根据厂商获取初筛地址 + */ + public String getFilterAnalysisUrl(String requestId, String drafter) { + String key = AnalyseConstants.ANALYSE_FILTER_URL; + if (!StringUtil.isEmpty(drafter)) { + key = "ANALYSE_FILTER_URL_" + drafter; + } + String requestUrl = patrolTaskService.selectConfigByKey(key); + log.info("ANALYSIS_FILTER_URL requestId: {}, requestUrl: {}", requestId, requestUrl); + return requestUrl; + } + /** * 根据厂商或算法获取大模型分析地址 - * @param typeList 算法 + * + * @param typeList 算法 * @param requestId 请求唯一id标识 - * @param drafter 算法厂商 + * @param drafter 算法厂商 * @return 大模型分析地址 */ public String getLargeModelAnalysisUrl(String[] typeList, String requestId, String drafter) { @@ -286,7 +301,7 @@ public class AnalyseRequestServiceImpl implements IAnalyseRequestService { String key = "ANALYSIS_BIG_URL_" + drafter; requestUrl = patrolTaskService.selectConfigByKey(key); log.info("{} requestId: {}, requestUrl: {}", key, requestId, requestUrl); - if(!StringUtils.isEmpty(requestUrl)) { + if (!StringUtils.isEmpty(requestUrl)) { return requestUrl; } }