Merge remote-tracking branch 'origin/dev_1.0.0' into dev_1.0.0

src/main/java/com/supervision/police/controller/RecordController.java

@@ -96,7 +96,7 @@ public class RecordController {
     @ApiOperation("将三元组信息保存到知识图谱")
     @PostMapping("/addNeo4j")
     public R<String> addNeo4j(@RequestBody ListDTO list) {
-        return R.ok(modelRecordTypeService.addNeo4j(list.getIds()));
+        return R.ok(modelRecordTypeService.addNeo4j(list.getIds(),list.getRecordId()));
     }
 
     /**

src/main/java/com/supervision/police/dto/ListDTO.java

@@ -9,4 +9,6 @@ public class ListDTO {
 
     public List<String> ids;
 
+    private String recordId;
+
 }

src/main/java/com/supervision/police/dto/NoteRecordDetailDTO.java

@@ -57,7 +57,7 @@ public class NoteRecordDetailDTO {
     /**
      * 供述材料
      */
-    private Integer confessionMaterial;
+    private String confessionMaterial;
 
     /**
      * 询问人
@@ -100,7 +100,7 @@ public class NoteRecordDetailDTO {
         this.personId = noteRecordDTO.getCasePersonId();
         this.name = noteRecordDTO.getName();
         this.role = noteRecordDTO.getRole();
-        this.confessionMaterial = noteRecordDTO.getConfessionMaterial();
+        this.confessionMaterial = String.valueOf(noteRecordDTO.getConfessionMaterial());
         this.lawAsker = noteRecordDTO.getLawAsker();
         this.confessionStartTime = noteRecordDTO.getConfessionStartTime();
         this.confessionEndTime = noteRecordDTO.getConfessionEndTime();

src/main/java/com/supervision/police/service/ModelRecordTypeService.java

@@ -27,5 +27,5 @@ public interface ModelRecordTypeService extends IService<ModelRecordType> {
 
     void testExtractThreeInfo();
 
-    String addNeo4j(List<String> ids);
+    String addNeo4j(List<String> ids,String recordId);
 }

src/main/java/com/supervision/police/service/impl/ModelRecordTypeServiceImpl.java

@@ -403,10 +403,11 @@ public class ModelRecordTypeServiceImpl extends ServiceImpl<ModelRecordTypeMappe
 
 
     @Override
-    public String addNeo4j(List<String> ids) {
+    public String addNeo4j(List<String> ids, String recordId) {
-        if (CollUtil.isEmpty(ids)) {
+        if (StrUtil.isBlank(recordId)){
-            return "成功插入0条信息";
+            throw new BusinessException("记录ID不能为空");
         }
+        if (CollUtil.isNotEmpty(ids)) {
             List<TripleInfo> tripleInfos = tripleInfoService.listByIds(ids);
             int i = 0;
             for (TripleInfo tripleInfo : tripleInfos) {
@@ -446,11 +447,8 @@ public class ModelRecordTypeServiceImpl extends ServiceImpl<ModelRecordTypeMappe
                     log.error(e.getMessage(), e);
                 }
             }
+        }
         // 删除的要进行移除
-        Optional<TripleInfo> any = tripleInfos.stream().findAny();
-        if (any.isPresent()) {
-            TripleInfo anyTripleInfo = any.get();
-            String recordId = anyTripleInfo.getRecordId();
         List<TripleInfo> existNeoList = tripleInfoService.lambdaQuery().eq(TripleInfo::getRecordId, recordId).eq(TripleInfo::getAddNeo4j, "1").list();
         Map<String, TripleInfo> existNeoMap = existNeoList.stream().collect(Collectors.toMap(TripleInfo::getId, Function.identity()));
         // 去掉已经添加的
@@ -483,10 +481,8 @@ public class ModelRecordTypeServiceImpl extends ServiceImpl<ModelRecordTypeMappe
                     .set(TripleInfo::getRelGraphId, null)
                     .set(TripleInfo::getStartNodeGraphId, null)
                     .eq(TripleInfo::getId, needDeleteId).update();
-            }
 
         }
-
+        return "保存三元组成功";
-        return ("成功插入" + i + "条信息");
     }
 }

src/main/java/com/supervision/police/service/impl/NoteRecordSplitServiceImpl.java

@@ -21,6 +21,7 @@ import com.supervision.minio.service.MinioService;
 import com.supervision.neo4j.service.Neo4jService;
 import com.supervision.police.domain.*;
 import com.supervision.police.dto.NoteRecordDTO;
+import com.supervision.police.dto.NoteRecordFileDTO;
 import com.supervision.police.vo.NoteRecordReqVO;
 import com.supervision.police.dto.NoteRecordDetailDTO;
 import com.supervision.police.mapper.NoteRecordSplitMapper;
@@ -86,7 +87,7 @@ public class NoteRecordSplitServiceImpl extends ServiceImpl<NoteRecordSplitMappe
     public String uploadRecords(NoteRecordReqVO records) throws IOException {
         int i;
         ModelCase modelCase = modelCaseService.getById(records.getCaseId());
-        if (StringUtils.isEmpty(modelCase.getCaseNo())){
+        if (StringUtils.isEmpty(modelCase.getCaseNo())) {
             throw new BusinessException("案件编号不能为空");
         }
         NoteRecord record = records.toNoteRecord();
@@ -111,7 +112,7 @@ public class NoteRecordSplitServiceImpl extends ServiceImpl<NoteRecordSplitMappe
                 }
                 String context = WordReadUtil.readWord(inputStream);
                 List<QARecordNodeDTO> qaList = RecordRegexUtil.recordRegex(context, record.getName());
-                log.info("拆分问答对:{}",qaList.size());
+                log.info("拆分问答对:{}", qaList.size());
                 List<NoteRecordSplit> splitList = new ArrayList<>();
                 for (QARecordNodeDTO qa : qaList) {
                     try {
@@ -152,7 +153,7 @@ public class NoteRecordSplitServiceImpl extends ServiceImpl<NoteRecordSplitMappe
      * @param recordId
      * @return 没有执行过, 返回true, 没有执行过, 返回false
      */
-    private boolean saveRecordProcessTask(String caseId, String recordId,Integer splitSize) {
+    private boolean saveRecordProcessTask(String caseId, String recordId, Integer splitSize) {
         // 首先查询是否存在任务,如果不存在,就新建
         Optional<CaseTaskRecord> caseTaskRecordOpt = caseTaskRecordService.lambdaQuery()
                 .eq(CaseTaskRecord::getCaseId, caseId).eq(CaseTaskRecord::getRecordId, recordId).oneOpt();
@@ -172,7 +173,7 @@ public class NoteRecordSplitServiceImpl extends ServiceImpl<NoteRecordSplitMappe
             newCaseTaskRecord.setSubmitTime(LocalDateTime.now());
             caseTaskRecordService.save(newCaseTaskRecord);
             return false;
-        }else {
+        } else {
             // 如果存在,则校验时间是否已经超过1天,如果超过了1天还没有执行完毕,就重新提交这个任务
             CaseTaskRecord caseTaskRecord = caseTaskRecordOpt.get();
             // 如果未执行,则提交执行
@@ -241,7 +242,7 @@ public class NoteRecordSplitServiceImpl extends ServiceImpl<NoteRecordSplitMappe
             // 从key中获取noteRecordDetailDTO需要的数据
             List<NoteRecordDetailDTO> noteRecordDetailDTOS = nameMap.get(name);
             NoteRecordDetailDTO first = CollUtil.getFirst(noteRecordDetailDTOS);
-            if (Objects.nonNull(first)){
+            if (Objects.nonNull(first)) {
                 noteRecordDetailDTO.setPersonId(first.getPersonId());
                 noteRecordDetailDTO.setRole(first.getRole());
                 noteRecordDetailDTO.setRoleName(caseRoleDicMap.get(first.getRole()));
@@ -251,6 +252,9 @@ public class NoteRecordSplitServiceImpl extends ServiceImpl<NoteRecordSplitMappe
             int fileCount = 0;
             for (NoteRecordDetailDTO recordDetailDTO : noteRecordDetailDTOS) {
                 fileCount = fileCount + recordDetailDTO.getFileList().size();
+                // 获取文件的文件名称
+                Set<String> fileNameSet = recordDetailDTO.getFileList().stream().map(NoteRecordFileDTO::getFileName).collect(Collectors.toSet());
+                recordDetailDTO.setConfessionMaterial(CollUtil.join(fileNameSet, ";"));
                 CaseTaskRecord caseTaskRecord = taskRecordMap.get(recordDetailDTO.getId());
                 if (ObjectUtil.isNotEmpty(caseTaskRecord)) {
                     if (caseTaskRecord.getStatus() == 2) {
@@ -271,7 +275,7 @@ public class NoteRecordSplitServiceImpl extends ServiceImpl<NoteRecordSplitMappe
             }
             noteRecordDetailDTO.setChildren(noteRecordDetailDTOS);
             // 统计所有children的文件数量
-            noteRecordDetailDTO.setConfessionMaterial(fileCount);
+            noteRecordDetailDTO.setConfessionMaterial(String.valueOf(fileCount));
             res.add(noteRecordDetailDTO);
         }
         List<NoteRecordDetailDTO> pager = ListUtils.Pager(size, page, res);