From 9905a4de4866c06ff57cf66c5b141d5e4b7d0e3a Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Wed, 16 Jun 2021 17:55:35 +0800 Subject: [PATCH] feat: 111 --- .../SarStandAttrInfoController.java | 2 +- .../controller/SarStandMenuController.java | 59 ++++++++++++++++++- .../sarStandMenu/dao/SarStandMenuDao.java | 5 ++ .../service/ISarStandMenuService.java | 6 ++ .../service/impl/SarStandMenuServiceImpl.java | 22 +++++++ .../SarStandMenu/SarStandMenuMapper.xml | 15 +++++ 6 files changed, 107 insertions(+), 2 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/controller/SarStandAttrInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/controller/SarStandAttrInfoController.java index 38050470..09a2baae 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/controller/SarStandAttrInfoController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/controller/SarStandAttrInfoController.java @@ -17,7 +17,7 @@ import com.adc.da.base.web.BaseController; */ @RestController @Api(description = "|SarStandAttrInfo|") -@RequestMapping("/SarStandAttrInfo/sar-stand-attr-info") +@RequestMapping("/${restPath}/SarStandAttrInfo/sar-stand-attr-info") public class SarStandAttrInfoController extends BaseController { } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/controller/SarStandMenuController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/controller/SarStandMenuController.java index a105fe12..93f94b8e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/controller/SarStandMenuController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/controller/SarStandMenuController.java @@ -1,12 +1,25 @@ package com.adc.da.slrs.sarStandMenu.controller; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.slrs.sarMenu.entity.SarMenu; +import com.adc.da.slrs.sarMenu.service.ISarMenuService; +import com.adc.da.slrs.sarStandMenu.service.ISarStandMenuService; +import com.adc.da.util.UUIDUtils; +import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import com.adc.da.slrs.sarStandMenu.entity.SarStandMenu; import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.RestController; import com.adc.da.base.web.BaseController; +import java.util.List; + /** *

* 前端控制器 @@ -17,7 +30,51 @@ import com.adc.da.base.web.BaseController; */ @RestController @Api(description = "|SarStandMenu|") -@RequestMapping("/SarStandMenu/sar-stand-menu") +@RequestMapping("/${restPath}/lawss/sarStandMenu") public class SarStandMenuController extends BaseController { + @Autowired + private ISarStandMenuService sarStandMenuEOService; + + @Autowired + private ISarMenuService sarMenuEOService; + + @ApiOperation(value = "|SarStandMenuEO|修改") + @PutMapping("/removeStandInfo") +// @RequiresPermissions("lawss:sarStandMenu:update") + public ResponseMessage update(@RequestBody SarStandMenu standardsInfoEO) throws Exception { + String[] idList = standardsInfoEO.getIdlist(); + int count = 0; + if(idList != null){ + for(String id : idList){ + SarStandMenu menuEO = new SarStandMenu(); + menuEO.setStandId(id); + menuEO.setMenuId(standardsInfoEO.getMenuId()); + //删除所选目录下关联 + String oldMenuId = standardsInfoEO.getOldMenuId(); + if (StringUtils.isEmpty(oldMenuId)) { + oldMenuId = standardsInfoEO.getMenuId(); + } + menuEO.setOldMenuId(oldMenuId); + count += sarStandMenuEOService.deleteByMenuId(menuEO); + //查询是否还有与其他节点的关联，若没有则增加与根节点的关联 + List getList = sarStandMenuEOService.selectAllMenuByStandId(menuEO); + if (getList == null || getList.isEmpty()) { + // 查询根节点 + SarMenu sarMenuEO = new SarMenu(); + sarMenuEO.setSorDivide(standardsInfoEO.getStandType() + "_STAND"); + List getRootMenu = sarMenuEOService.queryMenuByDis(sarMenuEO); + menuEO.setMenuId(getRootMenu.get(0).getId()); + menuEO.setId(UUIDUtils.randomUUID20()); + menuEO.setValidFlag(0); + sarStandMenuEOService.saveOrUpdate(menuEO); + } + } + } + if(count>0){ + return Result.success("0","移除成功！",true); + } else { + return Result.error("移除失败!"); + } + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/dao/SarStandMenuDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/dao/SarStandMenuDao.java index 77819729..1c400103 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/dao/SarStandMenuDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/dao/SarStandMenuDao.java @@ -24,4 +24,9 @@ public interface SarStandMenuDao extends BaseMapper { int updateByStandIdAndMenuId(SarStandMenu sarStandMenuEO); int deleteByStandIdAndMenuId(SarStandMenu sarStandMenuEO); + + int deleteByMenuId (SarStandMenu sarStandMenuEO); + + List selectAllMenuByStandId(SarStandMenu sarStandMenuEO); + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/service/ISarStandMenuService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/service/ISarStandMenuService.java index dedace0e..c96f9818 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/service/ISarStandMenuService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/service/ISarStandMenuService.java @@ -3,6 +3,8 @@ package com.adc.da.slrs.sarStandMenu.service; import com.adc.da.slrs.sarStandMenu.entity.SarStandMenu; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + /** *

* 服务类 @@ -13,4 +15,8 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface ISarStandMenuService extends IService { + int deleteByMenuId (SarStandMenu sarStandMenuEO); + + List selectAllMenuByStandId(SarStandMenu sarStandMenuEO); + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/service/impl/SarStandMenuServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/service/impl/SarStandMenuServiceImpl.java index 29a3e62a..e05feb25 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/service/impl/SarStandMenuServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/service/impl/SarStandMenuServiceImpl.java @@ -1,11 +1,15 @@ package com.adc.da.slrs.sarStandMenu.service.impl; +import com.adc.da.slrs.sarMenu.service.ISarMenuService; import com.adc.da.slrs.sarStandMenu.entity.SarStandMenu; import com.adc.da.slrs.sarStandMenu.dao.SarStandMenuDao; import com.adc.da.slrs.sarStandMenu.service.ISarStandMenuService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + /** *

* 服务实现类 @@ -17,4 +21,22 @@ import org.springframework.stereotype.Service; @Service public class SarStandMenuServiceImpl extends ServiceImpl implements ISarStandMenuService { + @Autowired + private SarStandMenuDao dao; + + @Autowired + private ISarMenuService sarMenuEOService; + + @Override + public int deleteByMenuId (SarStandMenu sarStandMenuEO){ + List menuIds = sarMenuEOService.getChildMenuList(sarStandMenuEO.getOldMenuId()); + sarStandMenuEO.setMenuIds(menuIds); + return dao.deleteByMenuId(sarStandMenuEO); + } + + @Override + public List selectAllMenuByStandId(SarStandMenu sarStandMenuEO){ + return dao.selectAllMenuByStandId(sarStandMenuEO); + } + } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml index fa86543d..0425a16a 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml @@ -68,4 +68,19 @@ where stand_id = #{standId, jdbcType=VARCHAR} and MENU_ID = #{menuId, jdbcType=VARCHAR} + + delete from SAR_STAND_MENU + where stand_id = #{standId} + and MENU_ID in + + #{item} + + + + +