Merge remote-tracking branch 'origin/dev' into dev

topo_dev
xueqingkun 6 months ago
commit 1d9dc1a417

@ -428,13 +428,13 @@ public class ModelCaseServiceImpl extends ServiceImpl<ModelCaseMapper, ModelCase
for (AtomicIndexDTO atomic : atomics) {
// 获取原子指标的判断规则
// 配置的指标的逻辑
Map<String, String> indexJundgeLogicMap = IndexRuleUtil.getIndexJundgeLogicMap(record.getIndexRule());
Map<String, String> indexJudgeLogicMap = IndexRuleUtil.getIndexJudgeLogicMap(record.getIndexRule());
// 需要和原子指标的规则判断是否一致(解决出罪和入罪冲突的问题)
String relationalSymbol = indexJundgeLogicMap.get(atomic.getAtomicIndexId());
String relationalSymbol = indexJudgeLogicMap.get(atomic.getAtomicIndexId());
atomic.judgeWithIndexResult(relationalSymbol);
atomic.setSegmentation(nodeRecordSpliteMap);
atomic.setRecordIfSegmentationAbsent("无");
List<ModelAtomicResult> filterAtomicResultList = atomicResultList.stream().filter(v -> StrUtil.equals(record.getIndexId(), v.getIndexId())).toList();
List<ModelAtomicResult> filterAtomicResultList = atomicResultList.stream().filter(v -> StrUtil.equals(atomic.getAtomicIndexId(), v.getAtomicId())).toList();
List<EvidentIndexResultDTO> evidentResult = getEvidentResult(filterAtomicResultList, caseEvidenceList, rootDirectory);
atomic.setEvidentResultList(evidentResult);

@ -21,7 +21,7 @@ public class IndexRuleUtil {
return atomicIndexIds;
}
public static Map<String, String> getIndexJundgeLogicMap(String indexRule) {
public static Map<String, String> getIndexJudgeLogicMap(String indexRule) {
Map<String, String> indexJundgeLogicMap = new HashMap<>();
Gson gson = new Gson();
IndexRule rule = gson.fromJson(indexRule, IndexRule.class);

Loading…
Cancel
Save