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

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

@@ -1,12 +1,14 @@
 package com.supervision.police.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.supervision.police.domain.CaseEvidence;
 import com.supervision.police.dto.CaseEvidenceDTO;
 import com.supervision.police.dto.CaseEvidenceDetailDTO;
 
 import java.util.List;
 
-public interface CaseEvidenceService {
+public interface CaseEvidenceService /* extends IService<CaseEvidence>*/ {
 
     /**
      * 保存案件证据信息

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

@@ -90,7 +90,7 @@ public class ModelServiceImpl implements ModelService {
                 .eq(CasePerson::getCaseId, analyseCaseDTO.getCaseId())
                 .eq(CasePerson::getCaseActorFlag, 1)
                 .eq(CasePerson::getRoleCode, "1")
-                .eq(CasePerson::getName, analyseCaseDTO.getLawActorName()));
+                .eq(StrUtil.isNotEmpty(analyseCaseDTO.getLawActorName()),CasePerson::getName, analyseCaseDTO.getLawActorName()));
         if (ObjectUtil.isEmpty(casePerson)) {
             throw new RuntimeException("未找到的行为人" + analyseCaseDTO.getLawActorName());
         }

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

@@ -3,8 +3,6 @@ package com.supervision.police.service.impl;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.supervision.chat.UploadParamEnum;
 import com.supervision.chat.client.CustomMultipartFile;
@@ -33,7 +31,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.time.LocalDateTime;

src/test/java/com/supervision/demo/ModelIndexTest.java

@@ -2,16 +2,21 @@ package com.supervision.demo;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.lang.UUID;
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import cn.hutool.poi.excel.ExcelReader;
 import cn.hutool.poi.excel.ExcelUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.supervision.police.domain.CasePerson;
 import com.supervision.police.domain.ModelAtomicIndex;
 import com.supervision.police.domain.ModelIndex;
+import com.supervision.police.domain.NoteRecord;
 import com.supervision.police.dto.AtomicData;
 import com.supervision.police.dto.JudgeLogic;
+import com.supervision.police.mapper.CasePersonMapper;
 import com.supervision.police.mapper.ModelAtomicIndexMapper;
 import com.supervision.police.mapper.ModelIndexMapper;
+import com.supervision.police.mapper.NoteRecordMapper;
 import com.supervision.police.mybatis.RowSqlMapper;
 import com.supervision.police.service.ModelIndexAtomicRelationService;
 import lombok.Data;
@@ -42,6 +47,12 @@ public class ModelIndexTest {
 
     @Autowired
     private RowSqlMapper rowSqlMapper;
+
+    @Autowired
+    private NoteRecordMapper noteRecordMapper;
+
+    @Autowired
+    private CasePersonMapper casePersonMapper;
     //@Test
     public void modelIndexGenerate() {
 
@@ -64,6 +75,44 @@ public class ModelIndexTest {
         }
     }
 
+    /**
+     * 生成案件人员脚本
+     */
+    //@Test
+    public void recordPersonGenerate() {
+
+        List<NoteRecord> noteRecords = noteRecordMapper.selectList(new LambdaQueryWrapper<>());
+
+
+        List<CasePerson> casePersonList = casePersonMapper.selectList(new LambdaQueryWrapper<>());
+
+        Map<String, Map<String, List<CasePerson>>> collect = casePersonList.stream().collect(Collectors.groupingBy(CasePerson::getCaseId, Collectors.groupingBy(CasePerson::getName)));
+
+
+        for (NoteRecord noteRecord : noteRecords) {
+            if (StrUtil.isNotEmpty(noteRecord.getCasePersonId())){
+                log.info("casePersonId is not null continue ..");
+                continue;
+            }
+            if (StrUtil.isEmpty(noteRecord.getName())){
+                log.info("Name is null stop next opt");
+                continue;
+            }
+
+            Map<String, List<CasePerson>> stringListMap = collect.get(noteRecord.getCaseId());
+
+            List<CasePerson> casePersonList1 = stringListMap.get(noteRecord.getName());
+            if (CollUtil.isNotEmpty(casePersonList1)){
+                casePersonList1.forEach(casePerson -> {
+                    noteRecord.setCasePersonId(casePerson.getId());
+                    noteRecordMapper.updateById(noteRecord);
+                });
+            }else {
+                log.info("casePersonList is null stop next opt");
+            }
+        }
+    }
+
     @Test
     public void modelAtomicIndexGenerate() {