From f8ed976a0608a1b41676252a8d3f5b54eff76096 Mon Sep 17 00:00:00 2001
From: liu <liujiatong112@163.com>
Date: Fri, 19 Jul 2024 09:10:02 +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

---
 .../police/mapper/ModelAtomicResultMapper.java   |  1 +
 .../police/service/impl/ModelServiceImpl.java    | 16 ++++++++++++++--
 .../resources/mapper/ModelAtomicResultMapper.xml |  3 +++
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/supervision/police/mapper/ModelAtomicResultMapper.java b/src/main/java/com/supervision/police/mapper/ModelAtomicResultMapper.java
index d0280e2..db133e8 100644
--- a/src/main/java/com/supervision/police/mapper/ModelAtomicResultMapper.java
+++ b/src/main/java/com/supervision/police/mapper/ModelAtomicResultMapper.java
@@ -13,6 +13,7 @@ import org.apache.ibatis.annotations.Param;
 public interface ModelAtomicResultMapper extends BaseMapper<ModelAtomicResult> {
 
     ModelAtomicResult selectByCaseIdAndAtomicId(@Param("caseId") String caseId,
+                                                @Param("casePersonId") String casePersonId,
                                                 @Param("atomicId") String atomicId);
 
 }
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 25e36fd..42bb802 100644
--- a/src/main/java/com/supervision/police/service/impl/ModelServiceImpl.java
+++ b/src/main/java/com/supervision/police/service/impl/ModelServiceImpl.java
@@ -1,7 +1,10 @@
 package com.supervision.police.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.json.JSONUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.supervision.common.domain.R;
 import com.supervision.common.utils.StringUtils;
 import com.supervision.neo4j.dto.ResultDTO;
@@ -38,15 +41,24 @@ public class ModelServiceImpl implements ModelService {
 
     private final ModelIndexResultMapper modelIndexResultMapper;
 
+    private final CasePersonMapper casePersonMapper;
+
     @Override
     public R<?> analyseCase(AnalyseCaseDTO analyseCaseDTO) {
         ModelCase modelCase = modelCaseMapper.selectById(analyseCaseDTO.getCaseId());
+        // 获取行为人ID
+        CasePerson casePerson = casePersonMapper.selectOne(new LambdaQueryWrapper<CasePerson>().eq(CasePerson::getCaseId, analyseCaseDTO.getCaseId())
+                .eq(CasePerson::getRoleCode, "1").eq(CasePerson::getName, analyseCaseDTO.getLawActor()));
+        if (ObjectUtil.isEmpty(casePerson)) {
+            throw new RuntimeException("未找到的行为人" + analyseCaseDTO.getLawActor());
+        }
         //原子指标
         List<ModelAtomicIndex> atomicIndices = modelAtomicIndexMapper.selectByCaseType(modelCase.getCaseType());
         Map<String, Boolean> atomicResultMap = new HashMap<>();
         for (ModelAtomicIndex atomicIndex : atomicIndices) {
             //原子指标结果
             ModelAtomicResult result = new ModelAtomicResult();
+            result.setCasePersonId(casePerson.getId());
             result.setCaseId(analyseCaseDTO.getCaseId());
             result.setAtomicId(atomicIndex.getId());
             //查询语句
@@ -70,10 +82,10 @@ public class ModelServiceImpl implements ModelService {
                     //
                 }
             } catch (Exception e) {
-                e.printStackTrace();
+                log.error(e.getMessage(), e);
             }
             //保存原子指标结果表
-            ModelAtomicResult exist = modelAtomicResultMapper.selectByCaseIdAndAtomicId(analyseCaseDTO.getCaseId(), atomicIndex.getId());
+            ModelAtomicResult exist = modelAtomicResultMapper.selectByCaseIdAndAtomicId(analyseCaseDTO.getCaseId(), casePerson.getId(), atomicIndex.getId());
             if (exist == null) {
                 modelAtomicResultMapper.insert(result);
             } else {
diff --git a/src/main/resources/mapper/ModelAtomicResultMapper.xml b/src/main/resources/mapper/ModelAtomicResultMapper.xml
index 8a65d28..98a55ba 100644
--- a/src/main/resources/mapper/ModelAtomicResultMapper.xml
+++ b/src/main/resources/mapper/ModelAtomicResultMapper.xml
@@ -10,6 +10,9 @@
             <if test="atomicId != null and atomicId != ''">
                 and atomic_id = #{atomicId}
             </if>
+            <if test="casePersonId != null and casePersonId != ''">
+                and case_person_id = #{casePersonId}
+            </if>
         </where>
     </select>
 </mapper>
\ No newline at end of file