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 @@