diff --git a/src/main/java/com/supervision/neo4j/dto/ResultDTO.java b/src/main/java/com/supervision/neo4j/dto/ResultDTO.java index 9dd9240..d3b571f 100644 --- a/src/main/java/com/supervision/neo4j/dto/ResultDTO.java +++ b/src/main/java/com/supervision/neo4j/dto/ResultDTO.java @@ -11,19 +11,19 @@ public class ResultDTO { private String relId; - private String recordId; + private String recordSplitId; - private String recordsId; + private String recordId; public ResultDTO() { } - public ResultDTO(String startId, String endId, String relId, String recordId, String recordsId) { + public ResultDTO(String startId, String endId, String relId, String recordId, String recordSplitId) { this.startId = startId; this.endId = endId; this.relId = relId; this.recordId = recordId; - this.recordsId = recordsId; + this.recordSplitId = recordSplitId; } } diff --git a/src/main/java/com/supervision/neo4j/utils/Neo4jUtils.java b/src/main/java/com/supervision/neo4j/utils/Neo4jUtils.java index 233cd7b..2e371dd 100644 --- a/src/main/java/com/supervision/neo4j/utils/Neo4jUtils.java +++ b/src/main/java/com/supervision/neo4j/utils/Neo4jUtils.java @@ -92,9 +92,9 @@ public class Neo4jUtils { resultDTO.setRelId(valueTransportString(record.get("relId"))); resultDTO.setRelId(valueTransportString(record.get("relId"))); // 这里注意,neo4j的recordId对应的是note_record_split的数据 - resultDTO.setRecordId(valueTransportString(record.get("recordId"))); + resultDTO.setRecordSplitId(valueTransportString(record.get("recordSplitId"))); // recordsId对应数据库note_record - resultDTO.setRecordsId(valueTransportString(record.get("recordsId"))); + resultDTO.setRecordId(valueTransportString(record.get("recordId"))); list.add(resultDTO); } return list; diff --git a/src/main/java/com/supervision/police/domain/NoteRecordSplit.java b/src/main/java/com/supervision/police/domain/NoteRecordSplit.java index 2818312..966585b 100644 --- a/src/main/java/com/supervision/police/domain/NoteRecordSplit.java +++ b/src/main/java/com/supervision/police/domain/NoteRecordSplit.java @@ -56,7 +56,7 @@ public class NoteRecordSplit implements Serializable { /** * 完整笔录id */ - private String noteRecordsId; + private String noteRecordId; /** * 创建人ID diff --git a/src/main/java/com/supervision/police/service/impl/ExtractTripleInfoServiceImpl.java b/src/main/java/com/supervision/police/service/impl/ExtractTripleInfoServiceImpl.java index 6d126fe..4b9b2be 100644 --- a/src/main/java/com/supervision/police/service/impl/ExtractTripleInfoServiceImpl.java +++ b/src/main/java/com/supervision/police/service/impl/ExtractTripleInfoServiceImpl.java @@ -58,7 +58,7 @@ public class ExtractTripleInfoServiceImpl implements ExtractTripleInfoService { @Transactional(transactionManager = "dataSourceTransactionManager", rollbackFor = Exception.class) public void extractTripleInfo(String caseId, String name, String recordId) { // 首先获取所有切分后的笔录 - List recordSplitList = noteRecordSplitService.lambdaQuery().eq(StrUtil.isNotBlank(recordId), NoteRecordSplit::getNoteRecordsId, recordId) + List recordSplitList = noteRecordSplitService.lambdaQuery().eq(StrUtil.isNotBlank(recordId), NoteRecordSplit::getNoteRecordId, recordId) .eq(NoteRecordSplit::getCaseId, caseId).eq(NoteRecordSplit::getPersonName, name).list(); // 获取所有的分类 List allTypeList = modelRecordTypeService.list(); 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 f7d27ac..27c14e2 100644 --- a/src/main/java/com/supervision/police/service/impl/ModelServiceImpl.java +++ b/src/main/java/com/supervision/police/service/impl/ModelServiceImpl.java @@ -328,8 +328,8 @@ public class ModelServiceImpl implements ModelService { if (StringUtils.isNotEmpty(resultDTO.getRelId())) { //存在关系 result.setAtomicResult("1"); - result.setRecordSplitId(resultDTO.getRecordId()); - result.setRecordId(resultDTO.getRecordsId()); + result.setRecordSplitId(resultDTO.getRecordSplitId()); + result.setRecordId(resultDTO.getRecordId()); break; } else { result.setAtomicResult("0"); diff --git a/src/main/java/com/supervision/police/service/impl/NoteRecordSplitServiceImpl.java b/src/main/java/com/supervision/police/service/impl/NoteRecordSplitServiceImpl.java index 0175406..589fc41 100644 --- a/src/main/java/com/supervision/police/service/impl/NoteRecordSplitServiceImpl.java +++ b/src/main/java/com/supervision/police/service/impl/NoteRecordSplitServiceImpl.java @@ -108,7 +108,7 @@ public class NoteRecordSplitServiceImpl extends ServiceImpl