/*灵州站红外反算智巡端框架修改对接*/

inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/constant/AnalyseConstants.java

@@ -36,6 +36,7 @@ public class AnalyseConstants {
    public static final String ANALYSE_IS_METER_FILTER = "ANALYSE_IS_METER_FILTER";
    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 MAX_NUM = "MAX_NUM";
 
    public static final String ALGORITHM_REQUEST_QUEUE = "algorithm:request:queue";

inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/controller/AnalysisController.java

@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.nacos.shaded.com.google.gson.Gson;
 import com.inspect.analysis.domain.*;
-import com.inspect.analysis.service.IAnalysisService;
+import com.inspect.analysis.service.IAnalyseRespService;
 import com.inspect.analysis.service.IResultAnalysisService;
 import com.inspect.base.core.constant.Color;
 import com.inspect.base.core.constant.RedisConst;
@@ -65,7 +65,7 @@ public class AnalysisController extends BaseController {
     MessageUtils messageUtils;
 
     @Resource
-    private IAnalysisService analysisService;
+    private IAnalyseRespService analysisService;
 
     public AnalysisController(IResultAnalysisService resultAnalysisService, IPatrolResultService patrolResultService, FeignTaskClient feignTaskClient, IPatrolTaskResultMainService patrolTaskResultMainService, IUploadServer iUploadServer, RedisService redisService, IPatrolTaskInfoService patrolTaskInfoService, WebsocketService WebsocketService, IPatrolTaskService patrolTaskService) {
         this.resultAnalysisService = resultAnalysisService;

inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AlgorithmResponseConsumerManager.java

@@ -1,12 +1,10 @@
 package com.inspect.analysis.service.impl;
 
-import com.alibaba.nacos.shaded.com.google.gson.Gson;
 import com.inspect.analysis.constant.AnalyseConstants;
 import com.inspect.analysis.domain.AnalyseResult;
-import com.inspect.analysis.service.IAnalysisService;
+import com.inspect.analysis.service.IAnalyseRespService;
 import com.inspect.base.core.constant.Color;
 import com.inspect.base.redis.service.RedisService;
-import com.inspect.partrolresult.service.AnalyseRemoteService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
@@ -25,7 +23,7 @@ public class AlgorithmResponseConsumerManager {
     private RedisService redisService;
 
     @Resource
-    private IAnalysisService analysisService;
+    private IAnalyseRespService analysisService;
 
     @PostConstruct
     public void initConsumer() {

inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AlgorithmResponseProcessConsumer.java

@@ -3,16 +3,13 @@ package com.inspect.analysis.service.impl;
 import com.alibaba.nacos.shaded.com.google.gson.Gson;
 import com.inspect.analysis.constant.AnalyseConstants;
 import com.inspect.analysis.domain.AnalyseResult;
-import com.inspect.analysis.service.IAnalysisService;
+import com.inspect.analysis.service.IAnalyseRespService;
 import com.inspect.base.core.constant.Color;
 import com.inspect.base.redis.service.RedisService;
-import com.inspect.partrolresult.domain.AnalyseRequest;
-import com.inspect.partrolresult.service.AnalyseRemoteService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
 
@@ -24,7 +21,7 @@ public class AlgorithmResponseProcessConsumer {
     private RedisService redisService;
 
     @Resource
-    private IAnalysisService analysisService;
+    private IAnalyseRespService analysisService;
 
     //@Scheduled(fixedDelay = 1000)
     @Scheduled(fixedDelayString = "${task.scheduler.response.delay-ms:3000}")

inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/domain/AnalyseRequest.java

@@ -69,7 +69,7 @@ public class AnalyseRequest implements RetryableRequest, Serializable {
                 AnalyseResPoint analyseResPoint = new AnalyseResPoint();
                 analyseResPoint.setCode("2002");
                 analyseResPoint.setType(type);
-                analyseResPoint.setDesc("调用分析失败");
+                analyseResPoint.setDesc("-");
                 analyseResPoint.setResImageUrl(analyseReqItem.getImageUrlList()[0]);
                 analyseResPoint.setValue("-1");
                 results.add(analyseResPoint);

inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/AnalyseRemoteService.java

@@ -5,10 +5,10 @@ import com.github.pagehelper.util.StringUtil;
 import com.inspect.analysis.constant.AnalyseConstants;
 
 import java.io.IOException;
-import java.util.Collections;
-import java.util.UUID;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 
+import com.inspect.base.core.constant.AlgConstants;
 import com.inspect.base.core.constant.RedisConst;
 import com.inspect.base.core.utils.HttpClientUtils;
 import com.inspect.base.core.utils.StringUtils;
@@ -16,16 +16,15 @@ import com.inspect.base.redis.service.RedisService;
 import com.inspect.partrolresult.domain.AnalyseReqItem;
 import com.inspect.partrolresult.domain.AnalyseRequest;
 import com.inspect.task.service.IPatrolTaskService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
 
+@Slf4j
 @Component
 public class AnalyseRemoteService {
-    private static final Logger log = LoggerFactory.getLogger(AnalyseRemoteService.class);
     @Resource
     private RedisService redisService;
 
@@ -83,22 +82,29 @@ public class AnalyseRemoteService {
                     redisService.redisTemplate.opsForSet().add(requestSetKey, item.toResultValue(type));
                 }
             });
-            requestUrl = patrolTaskService.selectConfigByKey(AnalyseConstants.ANALYSIS_BIG_URL);
+
+            if(checkInfraredType(typeList)) {
+                requestUrl = patrolTaskService.selectConfigByKey(AnalyseConstants.ANALYSIS_BIG_URL_INFRARED);
+                log.info("BIG_MODEL_INFRARED requestUrl: {}", requestUrl);
+            } else {
+                requestUrl = patrolTaskService.selectConfigByKey(AnalyseConstants.ANALYSIS_BIG_URL);
+                log.info("BIG_MODEL_OTHER requestUrl: {}", requestUrl);
+            }
 
             final String analyzeBigModelRequestIdRedisKey = AnalyseConstants.ANALYSE_AI_REQUEST.concat(requestId);
-            log.info("[BIG_MODEL] sendRequest analyzeBigModelRequestIdRedisKey: {}, analyseReq: {}", analyzeBigModelRequestIdRedisKey, analyseReq);
+            log.info("BIG_MODEL analyzeBigModelRequestIdRedisKey: {}, analyseReq: {}", analyzeBigModelRequestIdRedisKey, analyseReq);
             redisService.setCacheObject(analyzeBigModelRequestIdRedisKey, analyseReq.clone(), requestTimeout, TimeUnit.DAYS);
         }
 
         if(StringUtil.isEmpty(requestUrl)) {
-            requestUrl = "http://pleaseSetRemoteUrl:8080";
+            requestUrl = "http://localhost:8080";
         }
 
         analyseReq.setFilter(isFilter);
         analyseReq.setRequestUrl(requestUrl.concat(AnalyseConstants.ANALYSE_URI));
 
         try {
-            retryDelegate.doCallRemoteAnalyseService(analyseReq);
+            retryDelegate.callRemoteAnalyseService(analyseReq);
         } catch (IOException e) {
             log.info("FINALLY FAIL CALL REMOTE ANALYSE SERVICE, requestId: {}, taskPatrolId: {}, error: {}",
                     analyseReq.getRequestId(),
@@ -113,6 +119,25 @@ public class AnalyseRemoteService {
         HttpClientUtils.sendPostAgain(defaultUrl, request.toErrorResultStr());
     }
 
+    private static final Set<String> INFRARED_TYPES = new HashSet<>(Arrays.asList(
+            AlgConstants.INFRA_1800,
+            AlgConstants.INFRA_YU3,
+            AlgConstants.INFRA_CAMERA,
+            AlgConstants.INFRA_CAMERA_REVERSE
+    ));
+
+    public static boolean checkInfraredType(String[] typeList) {
+        if (typeList == null) {
+            return false;
+        }
+        for (String type : typeList) {
+            if (INFRARED_TYPES.contains(type)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     public static void main(String[] args) {
         try {
             ObjectMapper mapper = new ObjectMapper();

inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/AnalyseRequestRetryableDelegate.java

@@ -22,7 +22,7 @@ public class AnalyseRequestRetryableDelegate {
             value = IOException.class,
             maxAttempts = 5,
             backoff = @Backoff(delay = 2000, multiplier = 1.0))
-    public void doCallRemoteAnalyseService(final AnalyseRequest analyseReq) throws IOException {
+    public void callRemoteAnalyseService(final AnalyseRequest analyseReq) throws IOException {
         RetryContext retryContext = RetrySynchronizationManager.getContext();
         int retryCount = retryContext != null ? retryContext.getRetryCount() : 0;
         log.info("CALL_REMOTE_ANALYZE retryCount: {}, requestId: {}, isFilter: {}, URL: {}, PARAMS: {}",