From 869bcdbad8527ec39f125e534eb0917132fcdbf2 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Wed, 3 Nov 2021 13:00:33 +0800 Subject: [PATCH 1/2] feat: There is no way the --- .../controller/SarLawsMenuController.java | 4 +- .../SarLawsStandInfoController.java | 57 +++++++++++++++++++ .../service/ISarLawsStandInfoService.java | 2 + .../impl/SarLawsStandInfoServiceImpl.java | 32 ++++++++++- .../mapper/sarLawsMenu/SarLawsMenuMapper.xml | 13 +++-- .../SarLawsStandInfoMapper.xml | 10 ++-- 6 files changed, 106 insertions(+), 12 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsMenu/controller/SarLawsMenuController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsMenu/controller/SarLawsMenuController.java index de02d5af..8914f59b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsMenu/controller/SarLawsMenuController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsMenu/controller/SarLawsMenuController.java @@ -31,7 +31,7 @@ import java.util.List; */ @RestController @Api(description = "|SarLawsMenu|") -@RequestMapping("/sarLawsMenu/sar-laws-menu") +@RequestMapping("/${restPath}/lawss/sarLawsMenu") public class SarLawsMenuController extends BaseController { @Autowired @@ -63,7 +63,7 @@ public class SarLawsMenuController extends BaseController { if (getList == null || getList.isEmpty()) { // 查询根节点 TsResource sarMenuEO = new TsResource(); - sarMenuEO.setSorDivide("BUSINESS_STAND"); + sarMenuEO.setSorDivide("LAWS_STAND"); List getRootMenu = sarMenuEOService.queryMenuByDis(sarMenuEO); menuEO.setMenuId(getRootMenu.get(0).getId()); menuEO.setId(UUIDUtils.randomUUID20()); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/controller/SarLawsStandInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/controller/SarLawsStandInfoController.java index 6fe6490b..b8239e7a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/controller/SarLawsStandInfoController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/controller/SarLawsStandInfoController.java @@ -127,6 +127,63 @@ public class SarLawsStandInfoController extends BaseController return Result.success(getPageInfo(page.getPager(), rows)); } + @ApiOperation(value = "|SarLawsInfoEO|分页查询") + @GetMapping("/pageLaws") + /*@RequiresPermissions("lawss:sarLawsInfo:page")*/ + public ResponseMessage> pageLaws(SarLawsStandInfoPage page) throws Exception { + if (null != page.getNowOrderBy()) { + switch (page.getNowOrderBy()) { + case 1: + page.setOrderByA("a.issueTime");//发布日期 + break; + case 2: + page.setOrderByA("SAR_LAWS_ATTR_INFO.XCXSSRQLAWS");//新车型实施日期 + break; + case 3: + page.setOrderByA("SAR_LAWS_ATTR_INFO.ZCXSSRQLAWS");//在产车实施日期 + break; + case 4: + page.setOrderByA("a.LAWS_TEXT_STATE");//文本状态 + break; + case 5: + page.setOrderByA("paixu"); + break; + case 6: + page.setOrderByA("SAR_LAWS_ATTR_INFO.SSRQ"); + break; + default: + page.setNowOrder(null); + break; + } + if (null != page.getNowOrder()) { + switch (page.getNowOrder()) { + case 1: + page.setOrder1("desc"); + break; + case 2: + page.setOrder1("asc"); + default: + page.setOrder1(null); + break; + } + } + } + + + if (com.adc.da.util.utils.StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) { + List searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class); + String advanceStr = SarAdvanceSearchUtil.createSql(searchList,"SAR_LAWS_ATTR_INFO"); + if (StringUtils.isNotBlank(advanceStr)) { + page.setAdvanceSearchStr(advanceStr); + } else { + page.setAdvanceSearchStr(null); + } + } + + List rows = sarLawsInfoEOService.getSarStandardsInfoPage(page); + return Result.success(getPageInfo(page.getPager(), rows)); + } + @ApiOperation(value = "|SarLawsStandInfo|详情") @GetMapping("/getStandInfoById") //@RequiresPermissions("lawss:sarStandardsInfo:get") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/ISarLawsStandInfoService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/ISarLawsStandInfoService.java index 19c33c58..a4a7b022 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/ISarLawsStandInfoService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/ISarLawsStandInfoService.java @@ -36,6 +36,8 @@ public interface ISarLawsStandInfoService extends IService { List getSarStandardsInfoPage(SarLawsStandInfoPage page) throws Exception; + List getSarStandardsInfoPageBak(SarLawsStandInfoPage page) throws Exception; + SarLawsStandInfo selectStandardsInfoByKey(String id) throws Exception; SarLawsStandInfo selectStandardsInfoUpdateByKey(String id) throws Exception; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java index a8325bbe..b3c824b4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java @@ -157,7 +157,7 @@ public class SarLawsStandInfoServiceImpl extends ServiceImpl ids = iTsResourceService.getChildMenuList(userId); + List ids = iTsResourceService.getChildMenuList(page.getMenuId()); if (ids != null && !ids.isEmpty()) { page.setMenuAllChildrenIdList(ids); } @@ -170,6 +170,36 @@ public class SarLawsStandInfoServiceImpl extends ServiceImpl getSarStandardsInfoPageBak(SarLawsStandInfoPage page) throws Exception { + //查询当前登录人角色拥有权限的菜单 + String userId = UserUtils.getUserId(); + if(page.getMenuId() != null && page.getUserId() != null && StringUtils.isNotBlank(userId)){ + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("ID",page.getMenuId()); + qw.isNull("PARENT_ID"); + List children = iTsResourceService.list(qw); + if(children.isEmpty() && !page.getMenuId().equals("nomenu")){ + List getMenuIdList = tsUserService.getResourceUserId(userId); + if (!getMenuIdList.isEmpty()) { + page.setMenuRoleList(getMenuIdList); + } else { + page.setMenuRoleList(null); + } + List ids = iTsResourceService.getChildMenuList(userId); + if (ids != null && !ids.isEmpty()) { + page.setMenuAllChildrenIdList(ids); + } + } + } + Integer rowCount = this.baseMapper.getSarStandardsInfoCount(page); + page.getPager().setRowCount(rowCount); + List rows = this.baseMapper.getSarStandardsInfoPage(page); + attrInfo(rows); + return rows; + } + + /*** * @Description: 处理属性表数据 * @Param: [sarlist] diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsMenu/SarLawsMenuMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsMenu/SarLawsMenuMapper.xml index 04021a76..43ca0a2c 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsMenu/SarLawsMenuMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsMenu/SarLawsMenuMapper.xml @@ -159,11 +159,14 @@ - update SAR_BUSS_STAND_MENU + update SAR_LAWS_MENU menu_id = #{menuId}, @@ -179,8 +182,10 @@ delete from SAR_LAWS_MENU where laws_id = #{lawsId} - and MENU_ID in (select SAR_MENU.id from SAR_MENU - where VALID_FLAG=0 start with id=#{oldMenuId} connect by prior id= parent_id) + and MENU_ID in + + #{item} + From b023cba2d2304f5d837635aefc0ef4be47280a3d Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Wed, 3 Nov 2021 13:04:56 +0800 Subject: [PATCH 2/2] feat: There is no way the --- .../sarLawsStandInfo/controller/SarLawsStandInfoController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/controller/SarLawsStandInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/controller/SarLawsStandInfoController.java index b8239e7a..d3aefe07 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/controller/SarLawsStandInfoController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/controller/SarLawsStandInfoController.java @@ -180,7 +180,7 @@ public class SarLawsStandInfoController extends BaseController } } - List rows = sarLawsInfoEOService.getSarStandardsInfoPage(page); + List rows = sarLawsInfoEOService.getSarStandardsInfoPageBak(page); return Result.success(getPageInfo(page.getPager(), rows)); }