From b820968abe512ba6ddeb2f6add4f8aebec4b5bca Mon Sep 17 00:00:00 2001
From: lijiuwei <lijiuwei@ht-atia.com>
Date: Fri, 18 Apr 2025 10:41:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=A1=E8=A7=86=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E4=B8=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/AnalysisServiceImpl.java     | 19 ++++++++++-
 .../PatrolTaskStatusController.java           |  1 -
 .../mapper/task/ResultAnalysisMapper.xml      | 33 +++++++++++++++++++
 3 files changed, 51 insertions(+), 2 deletions(-)

diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AnalysisServiceImpl.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AnalysisServiceImpl.java
index ddc2314..ea89297 100644
--- a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AnalysisServiceImpl.java
+++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AnalysisServiceImpl.java
@@ -205,6 +205,19 @@ public class AnalysisServiceImpl implements IAnalysisService {
                         resultAnalysis.setResultType("3");
                         description = "GET PICTURE FAIL";
                     }
+
+                    resultAnalysis.setTaskPatrolId(analyseResult.getTaskPatrolId());
+                    resultAnalysis.setRequestId(analyseResult.getRequestId());
+                    resultAnalysis.setAlgType(algorithmInnerResult.getType());
+                    resultAnalysis.setResValue(algorithmInnerResult.getValue());
+                    resultAnalysis.setResCode(algorithmInnerResult.getCode());
+                    resultAnalysis.setResConf(algorithmInnerResult.getConf());
+                    resultAnalysis.setResDesc(algorithmInnerResult.getDesc());
+                    resultAnalysis.setResult(analyseResult.getResult());
+                    resultAnalysis.setResImgUrl(algorithmInnerResult.getResImageUrl());
+                    resultAnalysis.setImageNormalUrlPath(algorithmInnerResult.getImageNormalUrlPath());
+                    resultAnalysis.setResPos(algorithmInnerResult.getPos() == null ? StringUtils.EMPTY : JSONObject.toJSONString(algorithmInnerResult.getPos()));
+                    resultAnalysis.setFilter(analyseResult.getFilter());
                 }
 
                 log.info("doAlgorithmAnalysis BEFORE resultAnalysis: {}", resultAnalysis);
@@ -221,7 +234,11 @@ public class AnalysisServiceImpl implements IAnalysisService {
                     List<ResultAnalysis> resultAnalyses = resultAnalysisService.selectResultAnalysisList(analysis);
                     if (resultAnalyses.isEmpty()) {
                         int analysisRes = resultAnalysisService.insertResultAnalysis(resultAnalysis);
-                        log.info(Color.GREEN + "doAlgorithmAnalysis INSERT analysisRes: {}, lineId: {}" + Color.END, analysisRes, resultAnalysis.getLineId());
+                        log.info(Color.GREEN + "doAlgorithmAnalysis CRUD insert analysisRes: {}, lineId: {}" + Color.END, analysisRes, resultAnalysis.getLineId());
+                    } else {
+                        resultAnalysis.setLineId(resultAnalyses.get(0).getLineId());
+                        int analysisRes = resultAnalysisService.updateResultAnalysis(resultAnalysis);
+                        log.info(Color.GREEN + "doAlgorithmAnalysis CRUD update analysisRes: {}, lineId: {}" + Color.END, analysisRes, resultAnalysis.getLineId());
                     }
                 }
 
diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/controller/PatrolTaskStatusController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/controller/PatrolTaskStatusController.java
index 1e136df..b7303cd 100644
--- a/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/controller/PatrolTaskStatusController.java
+++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/controller/PatrolTaskStatusController.java
@@ -701,7 +701,6 @@ public class PatrolTaskStatusController extends BaseController {
         return toAjax(res);
     }
 
-    //没有用到
     public void issueTask(PatrolTaskStatus patrolTaskStatus) {
         String posType = patrolTaskStatus.getPosType();//预置位类型 0-视频 1-机器人 2-无人机
         if (StringUtils.isEmpty(posType)) {
diff --git a/inspect-main/inspect-main-task/src/main/resources/mapper/task/ResultAnalysisMapper.xml b/inspect-main/inspect-main-task/src/main/resources/mapper/task/ResultAnalysisMapper.xml
index 28dac2e..434bffa 100644
--- a/inspect-main/inspect-main-task/src/main/resources/mapper/task/ResultAnalysisMapper.xml
+++ b/inspect-main/inspect-main-task/src/main/resources/mapper/task/ResultAnalysisMapper.xml
@@ -305,6 +305,17 @@
             <if test="suggestion != null">suggestion,</if>
             <if test="description != null">description,</if>
             <if test="requestId != null">request_id,</if>
+            <if test="taskPatrolId != null">task_patrol_id,</if>
+            <if test="algType != null">alg_type,</if>
+            <if test="resValue != null">res_value,</if>
+            <if test="resCode != null">res_code,</if>
+            <if test="resConf != null">res_conf,</if>
+            <if test="resDesc != null">res_desc,</if>
+            <if test="result != null">result,</if>
+            <if test="resImgUrl != null">res_img_url,</if>
+            <if test="imageNormalUrlPath != null">image_normal_url_path,</if>
+            <if test="resPos != null">res_pos,</if>
+            <if test="filter != null">filter,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="lineId != null">#{lineId},</if>
@@ -318,6 +329,17 @@
             <if test="suggestion != null">#{suggestion},</if>
             <if test="description != null">#{description},</if>
             <if test="requestId != null">#{requestId},</if>
+            <if test="taskPatrolId != null">#{taskPatrolId},</if>
+            <if test="algType != null">#{algType},</if>
+            <if test="resValue != null">#{resValue},</if>
+            <if test="resCode != null">#{resCode},</if>
+            <if test="resConf != null">#{resConf},</if>
+            <if test="resDesc != null">#{resDesc},</if>
+            <if test="result != null">#{result},</if>
+            <if test="resImgUrl != null">#{resImgUrl},</if>
+            <if test="imageNormalUrlPath != null">#{imageNormalUrlPath},</if>
+            <if test="resPos != null">#{resPos},</if>
+            <if test="filter != null">#{filter},</if>
         </trim>
     </insert>
 
@@ -333,6 +355,17 @@
             <if test="suggestion != null">suggestion = #{suggestion},</if>
             <if test="description != null">description = #{description},</if>
             <if test="requestId != null">request_id = #{requestId},</if>
+            <if test="taskPatrolId != null">task_patrol_id  = #{taskPatrolId},</if>
+            <if test="algType != null">alg_type = #{algType},</if>
+            <if test="resValue != null">res_value = #{resValue},</if>
+            <if test="resCode != null">res_code = #{resCode},</if>
+            <if test="resConf != null">res_conf = #{resConf},</if>
+            <if test="resDesc != null">res_desc = #{resDesc},</if>
+            <if test="result != null">result = #{result},</if>
+            <if test="resImgUrl != null">res_img_url = #{resImgUrl},</if>
+            <if test="imageNormalUrlPath != null">image_normal_url_path = #{imageNormalUrlPath},</if>
+            <if test="resPos != null">res_pos = #{resPos},</if>
+            <if test="filter != null">filter = #{filter},</if>
         </trim>
         where line_id = #{lineId}
     </update>