/*result_analysis insert逻辑修改*/

inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/domain/ResultAnalysis.java

@@ -77,6 +77,7 @@ public class ResultAnalysis extends BaseEntity {
 
     public boolean checkCode(String code, String desc) {
         if (AnalyseConstants.ANALYSE_OK.equals(code)) {
+            setCreateTime(new Date());
             return true;
         }
 
@@ -424,6 +425,7 @@ public class ResultAnalysis extends BaseEntity {
                 ", pointStatus='" + pointStatus + '\'' +
                 ", beginTime='" + beginTime + '\'' +
                 ", endTime='" + endTime + '\'' +
+                ", createTime='" + super.getCreateTime() + '\'' +
                 ", suggestion='" + suggestion + '\'' +
                 ", objectId='" + objectId + '\'' +
                 ", description='" + description + '\'' +

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

@@ -69,7 +69,7 @@ public class AnalysisServiceImpl implements IAnalysisService {
         String keyId = AnalyseConstants.ANALYSE_REQUEST_ID.concat(requestId);
         if (!redisService.hasKey(keyId)) {
             log.error("picAnalyseRetNotify isTest: {}, NO keyId={}, REQUEST_ID={} in REDIS!", analyseResult.isTest(), keyId, requestId);
-            if(!analyseResult.isTest()) {
+            if (!analyseResult.isTest()) {
                 return;
             }
             //redisService.setCacheObject(keyId, "123456789");
@@ -91,17 +91,17 @@ public class AnalysisServiceImpl implements IAnalysisService {
             log.info("picAnalyseRetNotify FILTER bDefect={}, algorithmType={}", bDefect, analyseResPoint.getType());
             analyseResult.reloadReq(analyseRequest);
             /*
-            *大致两种情况：1. 算法是表计(meter); 2. 算法不是表计(meter)
-            * 1. 算法不是表计(meter)
-            * 1.1 初筛结果有缺陷：继续发给大模型处理
-            * 1.2 初筛结果无缺陷：不用调用大模型，流程就此结束
-            * 2. 算法是表计(meter)
-            * 不论初筛结果有没有缺陷，都要继续调用大模型，因为大模型调用了表计(meter)识别算法
+             *大致两种情况：1. 算法是表计(meter); 2. 算法不是表计(meter)
+             * 1. 算法不是表计(meter)
+             * 1.1 初筛结果有缺陷：继续发给大模型处理
+             * 1.2 初筛结果无缺陷：不用调用大模型，流程就此结束
+             * 2. 算法是表计(meter)
+             * 不论初筛结果有没有缺陷，都要继续调用大模型，因为大模型调用了表计(meter)识别算法
              */
             if (bDefect || "meter".equals(analyseResPoint.getType())) {
                 /*
-                * 先检查结果有缺无缺陷，如果有缺陷不用判断算法直接调用大模型；*
-                * 如果无缺陷，再去判断算法，如果算法是meter就继续调用大模型。*
+                 * 先检查结果有缺无缺陷，如果有缺陷不用判断算法直接调用大模型；*
+                 * 如果无缺陷，再去判断算法，如果算法是meter就继续调用大模型。*
                  */
                 analyseResult.setResult("0");
                 flag = true;
@@ -128,7 +128,7 @@ public class AnalysisServiceImpl implements IAnalysisService {
         //calculateProcess(analyseResult);
         log.info(Color.CYAN + "###### 分析算法模块返回的表计识别结果 end ######" + Color.END);
 
-        if(flag) {
+        if (flag) {
             log.info("picAnalyseRetNotify CALL BIG_MODEL REQUEST_ID={}", requestId);
             ispAlgorithmRequestService.sendRequest(analyseRequest);
         }
@@ -641,16 +641,19 @@ public class AnalysisServiceImpl implements IAnalysisService {
             StringJoiner valueJoiner = new StringJoiner(StringUtils.COMMA);
 
             for (AnalyseResPoint analyseResPoint : resItem.getResults()) {
-                ResultAnalysis resultAnalysis =
-                        combineAnalyse(analyseResult,
-                                String.valueOf(resMap.get(resItem.getObjectId()).getLineId()),
-                                resItem.getObjectId(),
-                                patrolResult.getFilePath(),
-                                analyseResPoint);
+                ResultAnalysis resultAnalysis = combineAnalyse(analyseResult,
+                        String.valueOf(resMap.get(resItem.getObjectId()).getLineId()),
+                        resItem.getObjectId(),
+                        patrolResult.getFilePath(),
+                        analyseResPoint);
                 resultAnalysisList.add(resultAnalysis);
                 valueJoiner.add(resultAnalysis.getResValue());
-                log.info(Color.MAGENTA + "[analysis] insertResultAnalysis: {}" + Color.END, resultAnalysis);
-                resultAnalysisService.insertResultAnalysis(resultAnalysis);
+                log.info(Color.GREEN + "[analysis] createTime: {}, insertResultAnalysis: {}" + Color.END, resultAnalysis.getCreateTime(), resultAnalysis);
+                try {
+                    resultAnalysisService.insertResultAnalysis(resultAnalysis);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
             }
 
             patrolResult.setValue(valueJoiner.toString());