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

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

@@ -16,7 +16,7 @@ public class AnalyseCaseDTO {
     /**
      * 行为人
      */
-    private String lawActor;
+    private String lawActorName;
 
     /**
      * 受害人

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

@@ -114,11 +114,11 @@ public class ModelRecordTypeServiceImpl extends ServiceImpl<ModelRecordTypeMappe
 
     @Override
     public List<TripleInfo> getThreeInfo(String caseId, String name, String recordId) {
-        boolean taskStatus = taskExtractStatusCheck(caseId, recordId);
+        //boolean taskStatus = taskExtractStatusCheck(caseId, recordId);
         // 如果校验结果为false,则说明需要进行提取三元组操作
-        if (!taskStatus) {
-            extractTripleInfo.extractTripleInfo(caseId, name, recordId);
-        }
+        //if (!taskStatus) {
+        //    extractTripleInfo.extractTripleInfo(caseId, name, recordId);
+        //}
         // 这里进行查询
         return tripleInfoService.lambdaQuery().eq(TripleInfo::getRecordId, recordId).list();
     }

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

@@ -49,9 +49,9 @@ public class ModelServiceImpl implements ModelService {
         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()));
+                .eq(CasePerson::getRoleCode, "1").eq(CasePerson::getName, analyseCaseDTO.getLawActorName()));
         if (ObjectUtil.isEmpty(casePerson)) {
-            throw new RuntimeException("未找到的行为人" + analyseCaseDTO.getLawActor());
+            throw new RuntimeException("未找到的行为人" + analyseCaseDTO.getLawActorName());
         }
         //原子指标
         List<ModelAtomicIndex> atomicIndices = modelAtomicIndexMapper.selectByCaseType(modelCase.getCaseType());
@@ -232,7 +232,7 @@ public class ModelServiceImpl implements ModelService {
         int i = 1;
         Map<String, Object> params = new HashMap<>();
         // 行为人
-        params.put("lawActor", analyseCaseDTO.getLawActor());
+        params.put("lawActor", analyseCaseDTO.getLawActorName());
         // 案号
         params.put("caseId", analyseCaseDTO.getCaseId());
         // 参数中是否传了受害人