From f11ea5219c5309719a509819e1da091bc11de737 Mon Sep 17 00:00:00 2001
From: liu <liujiatong112@163.com>
Date: Thu, 18 Jul 2024 11:40:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=9F=E5=AD=90=E6=8C=87=E6=A0=87=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/supervision/neo4j/utils/Neo4jUtils.java |  4 +++-
 .../supervision/police/domain/ModelAtomicResult.java |  4 ++--
 .../police/service/impl/ModelServiceImpl.java        |  5 ++---
 src/main/resources/mapper/ModelCaseMapper.xml        | 12 ++++++++----
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/supervision/neo4j/utils/Neo4jUtils.java b/src/main/java/com/supervision/neo4j/utils/Neo4jUtils.java
index 69f91a2..e4593d0 100644
--- a/src/main/java/com/supervision/neo4j/utils/Neo4jUtils.java
+++ b/src/main/java/com/supervision/neo4j/utils/Neo4jUtils.java
@@ -91,8 +91,10 @@ public class Neo4jUtils {
             resultDTO.setEndId(valueTransportString(record.get("endId")));
             resultDTO.setRelId(valueTransportString(record.get("relId")));
             resultDTO.setRelId(valueTransportString(record.get("relId")));
+            // 这里注意,neo4j的recordId对应的是note_record_split的数据
             resultDTO.setRecordId(valueTransportString(record.get("recordId")));
-            resultDTO.setRecordId(valueTransportString(record.get("recordsId")));
+            // recordsId对应数据库note_record
+            resultDTO.setRecordsId(valueTransportString(record.get("recordsId")));
             list.add(resultDTO);
         }
         return list;
diff --git a/src/main/java/com/supervision/police/domain/ModelAtomicResult.java b/src/main/java/com/supervision/police/domain/ModelAtomicResult.java
index 82affab..3440e4a 100644
--- a/src/main/java/com/supervision/police/domain/ModelAtomicResult.java
+++ b/src/main/java/com/supervision/police/domain/ModelAtomicResult.java
@@ -47,12 +47,12 @@ public class ModelAtomicResult implements Serializable {
     /**
      * 笔录片段id
      */
-    private String recordId;
+    private String recordSplitId;
     
     /**
      * 笔录id
      */
-    private String recordsId;
+    private String recordId;
 
     /**
      * 备注
diff --git a/src/main/java/com/supervision/police/service/impl/ModelServiceImpl.java b/src/main/java/com/supervision/police/service/impl/ModelServiceImpl.java
index 265fcf2..25e36fd 100644
--- a/src/main/java/com/supervision/police/service/impl/ModelServiceImpl.java
+++ b/src/main/java/com/supervision/police/service/impl/ModelServiceImpl.java
@@ -17,7 +17,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.neo4j.driver.Driver;
 import org.neo4j.driver.Result;
 import org.neo4j.driver.Session;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
@@ -206,8 +205,8 @@ public class ModelServiceImpl implements ModelService {
                 if (StringUtils.isNotEmpty(resultDTO.getRelId())) {
                     //存在关系
                     result.setAtomicResult("1");
-                    result.setRecordId(resultDTO.getRecordId());
-                    result.setRecordsId(resultDTO.getRecordsId());
+                    result.setRecordSplitId(resultDTO.getRecordId());
+                    result.setRecordId(resultDTO.getRecordsId());
                     break;
                 } else {
                     result.setAtomicResult("0");
diff --git a/src/main/resources/mapper/ModelCaseMapper.xml b/src/main/resources/mapper/ModelCaseMapper.xml
index 7387a85..37fb2e3 100644
--- a/src/main/resources/mapper/ModelCaseMapper.xml
+++ b/src/main/resources/mapper/ModelCaseMapper.xml
@@ -33,13 +33,17 @@
         </if>
     </select>
     <select id="selectMaxIndex" resultType="java.lang.Integer">
-        select ifnull(max(index_num), 0) from model_case where data_status = '1'
+        select ifnull(max(index_num), 0)
+        from model_case
+        where data_status = '1'
     </select>
     <select id="getIndexDetail" resultType="com.supervision.police.dto.IndexDetail">
         select mi.name as indexName, mi.index_score as score, mir.index_result, mir.atomic_ids
         from model_index mi
-        left join model_index_result mir on mi.id = mir.index_id
-        WHERE mi.data_status = '1' and mir.case_id = #{caseId} and mi.index_type = #{indexType}
+                 left join model_index_result mir on mi.id = mir.index_id
+        WHERE mi.data_status = '1'
+          and mir.case_id = #{caseId}
+          and mi.index_type = #{indexType}
     </select>
     <select id="getAtomicDetail" resultType="com.supervision.police.dto.AtomicIndexDTO">
         select mai.name as indexName,
@@ -47,7 +51,7 @@
         concat(nrs.question, nrs.answer) as record
         from model_atomic_result mar
         left join model_atomic_index mai on mar.atomic_id = mai.id
-        left join note_record_split nrs on mar.record_id = nrs.id
+        left join note_record_split nrs on mar.record_split_id = nrs.id
         where mar.case_id = #{caseId} and mar.atomic_id in
         <foreach collection="atomicIds" item="item" open="(" close=")" separator=",">
             #{item}