From a890f7f678b35b8d44133bfbb0026443a35c9244 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Mon, 13 Nov 2023 17:55:11 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=A0=87=E5=87=86=E4=BD=93=E7=B3=BB?=
 =?UTF-8?q?=E7=89=A9=E7=90=86=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SarMenuStandardNewController.java         |  9 +++-
 .../service/ISarMenuStandardNewService.java   |  4 +-
 .../SarMenuStandardNewServiceNewImpl.java     | 41 ++++++++++++++++---
 3 files changed, 46 insertions(+), 8 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/controller/SarMenuStandardNewController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/controller/SarMenuStandardNewController.java
index 95a63b1f..f90674f2 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/controller/SarMenuStandardNewController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/controller/SarMenuStandardNewController.java
@@ -86,6 +86,13 @@ public class SarMenuStandardNewController extends BaseController<SarMenuStandard
         if (StringUtils.isBlank(menuId)) {
             return Result.error("删除失败，菜单ID为空");
         }
-        return Result.success(iSarMenuStandardNewService.deleteMenuStandard(menuId));
+        iSarMenuStandardNewService.deleteMenuStandard(menuId);
+        return Result.success();
+    }
+
+    @ApiOperation("体系搜索三层树")
+    @DeleteMapping("/standardSystemTree")
+    public ResponseMessage<?> standardSystemTree() {
+        return Result.success(iSarMenuStandardNewService.standardSystemTree());
     }
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/ISarMenuStandardNewService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/ISarMenuStandardNewService.java
index bbd48c1b..1488dc39 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/ISarMenuStandardNewService.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/ISarMenuStandardNewService.java
@@ -26,7 +26,9 @@ public interface ISarMenuStandardNewService extends IService<SarMenuStandardNew>
 
     Integer updateMenuStandard(SarMenuStandardNew sarMenuStandardNew);
 
-    Integer deleteMenuStandard(String menuId);
+    void deleteMenuStandard(String menuId);
 
     SarMenuStandard getMenuStandardById(String menuId);
+
+    Object standardSystemTree();
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java
index 630b7970..c09ca14f 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java
@@ -1,20 +1,27 @@
 package com.adc.da.slrs.sarMenuStandard.service.impl;
 
+import com.adc.da.slrs.sarBussStandMenu.entity.SarBussStandMenu;
+import com.adc.da.slrs.sarBussStandMenu.service.ISarBussStandMenuService;
 import com.adc.da.slrs.sarMenuStandard.dao.SarMenuStandardNewDao;
 import com.adc.da.slrs.sarMenuStandard.entity.SarMenuStandardNew;
 import com.adc.da.slrs.sarMenuStandard.service.ISarMenuStandardNewService;
 import com.adc.da.slrs.sarResource.dao.TsResourceDao;
 import com.adc.da.slrs.sarRole.dao.TsRoleDao;
+import com.adc.da.slrs.sarStandMenu.entity.SarStandMenu;
+import com.adc.da.slrs.sarStandMenu.service.ISarStandMenuService;
 import com.adc.da.sys.sarMenuStandard.dao.SarMenuStandardDao;
 import com.adc.da.sys.sarMenuStandard.entity.SarMenuStandard;
 import com.adc.da.util.LoginUserUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.*;
@@ -28,6 +35,7 @@ import java.util.stream.Collectors;
  * @author super_liu
  * @since 2021-07-07
  */
+@Slf4j
 @Service
 public class SarMenuStandardNewServiceNewImpl extends ServiceImpl<SarMenuStandardNewDao, SarMenuStandardNew> implements ISarMenuStandardNewService {
 
@@ -37,7 +45,10 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl<SarMenuStandar
     private TsRoleDao tsRoleDao;
     @Resource
     private TsResourceDao resourceDao;
-
+    @Resource
+    private ISarStandMenuService sarStandMenuService;
+    @Resource
+    private ISarBussStandMenuService sarBussStandMenuService;
 
     @Override
     public String getTopMenu(SarMenuStandardNew sarMenuStandardNew){
@@ -112,6 +123,11 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl<SarMenuStandar
         return sarMenuStandard;
     }
 
+    @Override
+    public Object standardSystemTree() {
+        return null;
+    }
+
     @Override
     public Integer updateMenuStandard(SarMenuStandardNew sarMenuStandardNew) {
         SarMenuStandard menuStandarddb = dao.selectById(sarMenuStandardNew.getId());
@@ -122,12 +138,25 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl<SarMenuStandar
         return dao.updateById(menuStandarddb);
     }
 
+    @Transactional(rollbackFor = Exception.class)
     @Override
-    public Integer deleteMenuStandard(String menuId) {
-        SarMenuStandard menuStandard = new SarMenuStandard();
-        menuStandard.setId(menuId);
-        menuStandard.setValidFlag(1);
-        return dao.updateById(menuStandard);
+    public void deleteMenuStandard(String menuId) {
+        // 删除主表中的节点
+        LambdaUpdateWrapper<SarMenuStandard> menuUpdateWrapper = new LambdaUpdateWrapper<>();
+        menuUpdateWrapper.eq(SarMenuStandard::getId, menuId);
+        this.dao.delete(menuUpdateWrapper);
+        log.info("删除主表中的节点成功");
+        // 删除国标外标体系关联关系
+        LambdaUpdateWrapper<SarStandMenu> gbWrapper = new LambdaUpdateWrapper<>();
+        gbWrapper.eq(SarStandMenu::getMenuId, menuId);
+        sarStandMenuService.remove(gbWrapper);
+        log.info("删除国标外标主表中的相应字段成功");
+        // 删除企标体系关联关系
+        LambdaUpdateWrapper<SarBussStandMenu> esWrapper = new LambdaUpdateWrapper<>();
+        esWrapper.eq(SarBussStandMenu::getMenuId, menuId);
+        sarBussStandMenuService.remove(esWrapper);
+        log.info("删除企标主表中的相应字段成功");
+        // TODO 理论上这里应该删除国标外标企标主表中的中文字段
     }
 
     /**