fix: 1.屏蔽辅助值字段value2，待避雷器标记算法优化后放开；2.请求分析主机新增code非200返回false；3.修正初筛和大模型用不同requestId（数聚）

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;

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;

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;
             }
         }