From 081652b8fbe157ffa2a58524a628fbe180214a5b Mon Sep 17 00:00:00 2001
From: "DESKTOP-DDTUS3E\\yaxin" <daixiaoyi0622@gmail.com>
Date: Thu, 7 Nov 2024 17:29:09 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E7=94=A8indexRule=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E5=B9=B6=E4=BF=9D=E5=AD=98=E5=85=B3=E8=81=94=E7=9A=84=E5=8E=9F?=
 =?UTF-8?q?=E5=AD=90=E6=8C=87=E6=A0=87=E5=85=B3=E8=81=94=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ModelIndexAtomicRelationServiceImpl.java    | 17 ++---------------
 .../service/impl/ModelIndexServiceImpl.java     |  2 +-
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/supervision/police/service/impl/ModelIndexAtomicRelationServiceImpl.java b/src/main/java/com/supervision/police/service/impl/ModelIndexAtomicRelationServiceImpl.java
index 75274e4..e3188dc 100644
--- a/src/main/java/com/supervision/police/service/impl/ModelIndexAtomicRelationServiceImpl.java
+++ b/src/main/java/com/supervision/police/service/impl/ModelIndexAtomicRelationServiceImpl.java
@@ -47,23 +47,10 @@ public class ModelIndexAtomicRelationServiceImpl extends ServiceImpl<ModelIndexA
             log.warn("saveByModelIndex: modelIndexId 为空，不保存关联关系....modelIndex:{}", JSONUtil.toJsonStr(modelIndex));
             return;
         }
-        String judgeLogic = modelIndex.getJudgeLogic();
         IndexRule indexRule = modelIndex.getIndexRule();
-        if (StrUtil.isNotEmpty(judgeLogic)){
-            List<String> atomicIndexIds = JudgeLogicUtil.pickAtomicIndexIds(judgeLogic);
-            atomicIndexIds.forEach(atomicIndexId -> {
-                ModelIndexAtomicRelation modelIndexAtomicRelation = new ModelIndexAtomicRelation();
-                modelIndexAtomicRelation.setModelIndexId(modelIndex.getId());
-                modelIndexAtomicRelation.setAtomicIndexId(atomicIndexId);
-                super.save(modelIndexAtomicRelation);
-            });
-        }else if(Objects.nonNull(indexRule)){
+        if(Objects.nonNull(indexRule)){
             Set<String> ids = new HashSet<>();
-            indexRule.getRuleConditionGroupList().forEach(ruleConditionGroup -> {
-                ruleConditionGroup.getRuleConditionList().forEach(ruleCondition -> {
-                    ids.add(ruleCondition.getAtomicIndexId());
-                });
-            });
+            indexRule.getRuleConditionGroupList().forEach(ruleConditionGroup -> ruleConditionGroup.getRuleConditionList().forEach(ruleCondition -> ids.add(ruleCondition.getAtomicIndexId())));
             ids.forEach(atomicIndexId -> {
                 ModelIndexAtomicRelation modelIndexAtomicRelation = new ModelIndexAtomicRelation();
                 modelIndexAtomicRelation.setModelIndexId(modelIndex.getId());
diff --git a/src/main/java/com/supervision/police/service/impl/ModelIndexServiceImpl.java b/src/main/java/com/supervision/police/service/impl/ModelIndexServiceImpl.java
index 8bc7735..33b9a9b 100644
--- a/src/main/java/com/supervision/police/service/impl/ModelIndexServiceImpl.java
+++ b/src/main/java/com/supervision/police/service/impl/ModelIndexServiceImpl.java
@@ -148,7 +148,7 @@ public class ModelIndexServiceImpl extends ServiceImpl<ModelIndexMapper, ModelIn
     @Override
     @Transactional(transactionManager = "dataSourceTransactionManager", rollbackFor = Exception.class)
     public R<?> addOrUpd(ModelIndex modelIndex) {
-        int i = 0;
+         int i;
         if (StringUtils.isEmpty(modelIndex.getId())) {
             i = modelIndexMapper.insert(modelIndex);
             modelIndexAtomicRelationService.saveByModelIndex(modelIndex);