From 585b7d6b7517035c3f71bd11944d970b4db2c7d2 Mon Sep 17 00:00:00 2001
From: zhangyanduan <yanduan0908@hotmail.com>
Date: Mon, 10 Oct 2022 16:37:21 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E4=BC=81=E6=A0=87?=
 =?UTF-8?q?=E4=BD=93=E7=B3=BB=E6=95=B0=E6=8D=AE=E6=8C=82=E9=9D=A0=E7=9B=AE?=
 =?UTF-8?q?=E5=BD=95=E5=85=B3=E7=B3=BB=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SarBussionessStandServiceImpl.java   | 44 +++++++++++++++++++
 .../service/impl/SarModelTreeServiceImpl.java |  4 +-
 2 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
index 88ee51e1..e59a3a23 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
@@ -620,6 +620,50 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                 }
             }
             createStandAttrInfo(sarBussionessStandEO,true);
+            //此处需要增加根据技术体系更新菜单数据关联得操作，之前是在点编辑得时候处理，但是前端没有处理好
+            if(StringUtils.isNotBlank(sarBussionessStandEO.getSarStandAttrEOStr())){
+                String sarStandAttrEOStr = sarBussionessStandEO.getSarStandAttrEOStr();
+                Map<String,String> sarStandAttrMap = JSONObject.fromObject(sarStandAttrEOStr);
+                if(sarStandAttrMap.containsKey("TXLBBUSS") && StringUtils.isNotBlank(sarStandAttrMap.get("TXLBBUSS"))){
+                    QueryWrapper<SarBussStandMenu> menuQueryWrapper = new QueryWrapper<>();
+                    menuQueryWrapper.eq("BUSS_STAND_ID",sarBussionessStandEO.getId());
+//                    menuQueryWrapper.eq("MENU_ID",sarStandAttrMap.get("TXLBBUSS"));
+                    menuQueryWrapper.eq("VALID_FLAG",0);
+                    menuQueryWrapper.eq("TREE_TYPE","sarMs");
+                    List<SarBussStandMenu> sarBussStandMenus = sarBussStandMenuEODao.selectList(menuQueryWrapper);
+                    if(sarBussStandMenus !=null && !sarBussStandMenus.isEmpty()){
+                        boolean upFlag = true;
+                        List<String> delIds = new ArrayList<>();
+                        for(SarBussStandMenu m: sarBussStandMenus){
+                            if(StringUtils.equals(m.getMenuId(),sarStandAttrMap.get("TXLBBUSS"))){
+                                upFlag= false;
+                            }else{
+                                delIds.add(m.getId());
+                            }
+                        }
+                        if(upFlag){
+                            SarBussStandMenu jsMenu = new SarBussStandMenu();
+                            jsMenu.setMenuId(sarStandAttrMap.get("TXLBBUSS"));
+                            jsMenu.setValidFlag(0);
+                            jsMenu.setTreeType("sarMs");
+                            jsMenu.setBussStandId(sarBussionessStandEO.getId());
+                            jsMenu.setId(UUIDUtils.randomUUID(32));
+                            sarBussStandMenuEODao.insert(jsMenu);
+                        }
+                        if(!delIds.isEmpty()){
+                            sarBussStandMenuEODao.deleteBatchIds(delIds);
+                        }
+                    }else{
+                        SarBussStandMenu jsMenu = new SarBussStandMenu();
+                        jsMenu.setMenuId(sarStandAttrMap.get("TXLBBUSS"));
+                        jsMenu.setValidFlag(0);
+                        jsMenu.setTreeType("sarMs");
+                        jsMenu.setBussStandId(sarBussionessStandEO.getId());
+                        jsMenu.setId(UUIDUtils.randomUUID(32));
+                        sarBussStandMenuEODao.insert(jsMenu);
+                    }
+                }
+            }
             //修改收藏分享编号名称
             updateCollectAndShare(sarBussionessStandEO);
 
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModelTreeServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModelTreeServiceImpl.java
index accf3622..3abf14e8 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModelTreeServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModelTreeServiceImpl.java
@@ -113,7 +113,9 @@ public class SarModelTreeServiceImpl extends ServiceImpl<SarModelTreeDao, SarMod
     @Transactional(rollbackFor = {RuntimeException.class,Exception.class})
     @Override
     public ResponseDto syncModelTreeDataToDB(String json){
-
+        logger.info("=========================接收模块单元数据===========================");
+        logger.info(json);
+        logger.info("=========================接收模块单元数据===========================");
         String rootId = "10000";
         String rootPID = "根节点";