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 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 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 implements ISarMenuStandardNewService { @@ -37,7 +45,10 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl menuUpdateWrapper = new LambdaUpdateWrapper<>(); + menuUpdateWrapper.eq(SarMenuStandard::getId, menuId); + this.dao.delete(menuUpdateWrapper); + log.info("删除主表中的节点成功"); + // 删除国标外标体系关联关系 + LambdaUpdateWrapper gbWrapper = new LambdaUpdateWrapper<>(); + gbWrapper.eq(SarStandMenu::getMenuId, menuId); + sarStandMenuService.remove(gbWrapper); + log.info("删除国标外标主表中的相应字段成功"); + // 删除企标体系关联关系 + LambdaUpdateWrapper esWrapper = new LambdaUpdateWrapper<>(); + esWrapper.eq(SarBussStandMenu::getMenuId, menuId); + sarBussStandMenuService.remove(esWrapper); + log.info("删除企标主表中的相应字段成功"); + // TODO 理论上这里应该删除国标外标企标主表中的中文字段 } /**