From 020b1e6a3f268fc6587d1fa84a8911fe3c3003d7 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Fri, 18 Feb 2022 17:49:04 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E8=A7=92=E8=89=B2=E6=A0=87=E5=87=86=E6=95=B0=E6=8D=AE=E6=9D=83?= =?UTF-8?q?=E9=99=90=E4=BD=93=E7=B3=BB=E4=BC=98=E5=8C=96=20=20=E5=9B=BD?= =?UTF-8?q?=E5=86=85=E6=A0=87=E5=87=86=E5=B7=A6=E4=BE=A7=E6=A0=91=20?= =?UTF-8?q?=E5=8A=A0=E5=85=A5=E6=8A=80=E6=9C=AF=E4=BD=93=E7=B3=BB=20?= =?UTF-8?q?=E5=BE=85=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/TsResourceServiceImpl.java | 8 +-- .../impl/SarStandardsInfoServiceImpl.java | 12 ++--- .../controller/SarMenuStandardController.java | 7 +++ .../service/ISarMenuStandardService.java | 3 ++ .../impl/SarMenuStandardServiceImpl.java | 50 +++++++++++++++++++ 5 files changed, 70 insertions(+), 10 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java index cf74720e..c7df9cb9 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java @@ -149,10 +149,10 @@ public class TsResourceServiceImpl extends ServiceImpl list = new ArrayList<>(); - list.add("INLAND_STAND"); - list.add("FOREIGN_STAND"); - tsResourceQueryWrapper.notIn("SOR_DIVIDE",list); +// List list = new ArrayList<>(); +// list.add("INLAND_STAND"); +// list.add("FOREIGN_STAND"); +// tsResourceQueryWrapper.notIn("SOR_DIVIDE",list); tsResourceQueryWrapper.orderByAsc("DISPLAY_SEQ"); List TsResources=dao.selectList(tsResourceQueryWrapper); for(TsResource TsResource:TsResources){ diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index 244fa967..2378d4bc 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -302,12 +302,12 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl children = iTsResourceService.list(qw); if(children.isEmpty() && !page.getMenuId().equals("nomenu")){ -// List getMenuIdList = tsUserService.getResourceUserId(page.getUserId()); -// if (getMenuIdList != null && !getMenuIdList.isEmpty()) { -// page.setMenuRoleList(getMenuIdList); -// } else { -// page.setMenuRoleList(null); -// } + List getMenuIdList = tsUserService.getResourceUserId(page.getUserId()); + if (getMenuIdList != null && !getMenuIdList.isEmpty()) { + page.setMenuRoleList(getMenuIdList); + } else { + page.setMenuRoleList(null); + } List ids = iTsResourceService.getChildMenuList(page.getMenuId()); if (ids != null && !ids.isEmpty()) { page.setMenuAllChildrenIdList(ids); diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/controller/SarMenuStandardController.java b/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/controller/SarMenuStandardController.java index 6a05ff7e..834a0ed9 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/controller/SarMenuStandardController.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/controller/SarMenuStandardController.java @@ -40,6 +40,13 @@ public class SarMenuStandardController extends BaseController { return Result.success(sarMenus); } + @ApiOperation("查询有权限资源") + @GetMapping("/getListStand") + public ResponseMessage> getListStand(SarMenuStandard sarMenuStandard){ + List tsResources=iSarMenuStandardService.getListStand(sarMenuStandard); + return Result.success(tsResources); + } + @ApiOperation("根据ID查询菜单") @GetMapping("/getSarMenuStandardById") public ResponseMessage getSarMenuStandardById(@RequestParam String menuId){ diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/service/ISarMenuStandardService.java b/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/service/ISarMenuStandardService.java index e87377f6..ec36a862 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/service/ISarMenuStandardService.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/service/ISarMenuStandardService.java @@ -21,6 +21,9 @@ public interface ISarMenuStandardService extends IService { */ List getAll(String dicId); + List getListStand(SarMenuStandard sarMenuStandard); + + /** * 添加菜单 * @param sarMenu：菜单信息 diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/service/impl/SarMenuStandardServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/service/impl/SarMenuStandardServiceImpl.java index c5c3fd33..2992aa20 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/service/impl/SarMenuStandardServiceImpl.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/service/impl/SarMenuStandardServiceImpl.java @@ -12,8 +12,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; +import java.util.Comparator; import java.util.Date; import java.util.List; +import java.util.stream.Collectors; /** *

@@ -34,6 +36,54 @@ public class SarMenuStandardServiceImpl extends ServiceImpl getListStand(SarMenuStandard sarMenuStandard) { + List TsResources = new ArrayList<>(); + + QueryWrapper queryWrapper =new QueryWrapper<>(); + if(sarMenuStandard.getSorDivide()!=null){ + queryWrapper.eq("sor_divide",sarMenuStandard.getSorDivide()); + } + + if(sarMenuStandard.getDicId()!=null){ + queryWrapper.eq("DIC_ID",sarMenuStandard.getDicId()); + } + queryWrapper.isNull("PARENT_ID"); + queryWrapper.orderByAsc("DISPLAY_SEQ"); + TsResources=dao.selectList(queryWrapper); + + for(SarMenuStandard resource:TsResources){ + QueryWrapper TsResourceQueryWrapper=new QueryWrapper<>(); + TsResourceQueryWrapper.like("PARENT_IDS",resource.getId()); + TsResourceQueryWrapper.orderByAsc("DISPLAY_SEQ"); + List children=dao.selectList(TsResourceQueryWrapper); + resource.setChildren(recursionGetListChildrenStand((resource),(children))); + } + + return TsResources; + } + + /** + * 递归调用获取子节点 + * @return List + */ + private List recursionGetListChildrenStand(SarMenuStandard resource,List children){ + List tsResources = children.stream() + .filter(resource1 -> resource1.getParentId().equals(resource.getId())) + .collect(Collectors.toList()); + if(!tsResources.isEmpty()){ + tsResources = tsResources.stream().sorted(Comparator.comparing(resource1 -> resource1.getDisplaySeq())).collect(Collectors.toList()); + tsResources.forEach(resource1 -> { + resource1.setChildren(recursionGetListChildrenStand((resource1),(children))); + }); + } + return tsResources; + } + /** * 查询所有菜单 */