diff --git a/src/main/java/com/supervision/chat/UploadParamEnum.java b/src/main/java/com/supervision/chat/UploadParamEnum.java index cf6856e..74e2d61 100644 --- a/src/main/java/com/supervision/chat/UploadParamEnum.java +++ b/src/main/java/com/supervision/chat/UploadParamEnum.java @@ -4,6 +4,7 @@ import org.springframework.web.bind.annotation.RequestPart; public enum UploadParamEnum { to_vector_store(null, true, null), + override(null, false, null), not_refresh_vs_cache(null, false, null), chunk_size(null, null, 250), 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 fc8c3d8..2f7d85f 100644 --- a/src/main/java/com/supervision/police/service/impl/ModelServiceImpl.java +++ b/src/main/java/com/supervision/police/service/impl/ModelServiceImpl.java @@ -82,9 +82,12 @@ public class ModelServiceImpl implements ModelService { Assert.isTrue(StrUtil.isEmpty(check), check); ModelCase modelCase = modelCaseMapper.selectById(analyseCaseDTO.getCaseId()); - // 获取行为人ID - CasePerson casePerson = casePersonMapper.selectOne(new LambdaQueryWrapper().eq(CasePerson::getCaseId, analyseCaseDTO.getCaseId()) - .eq(CasePerson::getRoleCode, "1").eq(CasePerson::getName, analyseCaseDTO.getLawActorName())); + // 获取案件行为人ID + CasePerson casePerson = casePersonMapper.selectOne(new LambdaQueryWrapper() + .eq(CasePerson::getCaseId, analyseCaseDTO.getCaseId()) + .eq(CasePerson::getCaseActorFlag, 1) + .eq(CasePerson::getRoleCode, "1") + .eq(CasePerson::getName, analyseCaseDTO.getLawActorName())); if (ObjectUtil.isEmpty(casePerson)) { throw new RuntimeException("未找到的行为人" + analyseCaseDTO.getLawActorName()); } @@ -125,7 +128,7 @@ public class ModelServiceImpl implements ModelService { log.error(e.getMessage(), e); } // 非人工填写的,需要进行更新结果,人工填写的不更新(人工填写的编码,需要进行特殊处理) - if (!"1".equals(atomicIndex.getIndexSource())){ + if (!"1".equals(atomicIndex.getIndexSource())) { //保存原子指标结果表 ModelAtomicResult exist = modelAtomicResultMapper.selectByCaseIdAndAtomicId(analyseCaseDTO.getCaseId(), casePerson.getId(), atomicIndex.getId()); if (exist == null) { @@ -139,7 +142,7 @@ public class ModelServiceImpl implements ModelService { // 所有原子指标id,判断结果 Set checkAtomicResult = Set.of("-1", "0", "1"); if (StrUtil.isNotBlank(result.getAtomicResult()) && !checkAtomicResult.contains(result.getAtomicResult())) { - log.error("TEST:不被支持的校核结果,需排查BUG,atomicId:" + result.getAtomicId() + " result:" + result.getAtomicResult()); + log.error("TEST:不被支持的校核结果,需排查BUG,atomicId:" + result.getAtomicId() + " result:" + result.getAtomicResult()); } atomicResultMap.put(result.getAtomicId(), result.getAtomicResult()); } @@ -261,7 +264,7 @@ public class ModelServiceImpl implements ModelService { String atomicIndexResult = atomicResultMap.getOrDefault(data.getAtomicIndex(), "-1"); String relationalSymbol = data.getRelationalSymbol(); JudgeResultEnum instance = JudgeResultEnum.getInstance(relationalSymbol); - boolean ato = StrUtil.equals(atomicIndexResult,instance.getTranslateResult()); + boolean ato = StrUtil.equals(atomicIndexResult, instance.getTranslateResult()); if (j == 0) { innerGroupJudge = ato; } else { @@ -334,7 +337,7 @@ public class ModelServiceImpl implements ModelService { run = session.run(ql, params); } catch (Exception e) { result.setAtomicResult("-1"); - log.error("图数据库查询出现错误,查询语句{},参数{}", ql, JSONUtil.toJsonStr(params),e); + log.error("图数据库查询出现错误,查询语句{},参数{}", ql, JSONUtil.toJsonStr(params), e); return; }