diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/AdministratorController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/AdministratorController.java index 9b09a87..a9678c8 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/AdministratorController.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/AdministratorController.java @@ -126,4 +126,6 @@ public class AdministratorController { } return R.data(false); } + + } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java index c63dca9..765d615 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java @@ -41,7 +41,6 @@ public class DisasterInfoController { private final WebsitesService websitesService; - private final NewsService newsService; private final PictureInfoService pictureInfoService; @@ -49,9 +48,6 @@ public class DisasterInfoController { private final GuestManageDisasterRefService guestManageDisasterRefService; - //下载次数记录 - private final DownloadRecordService downloadRecordService; - private final DisasterInfoVoService disasterInfoVoService; /** @@ -597,6 +593,18 @@ public class DisasterInfoController { } + /** + * 根据灾害访问次数进行排序 + * @return + */ + @GetMapping("/getTenDisasterInfo") + public R> getTenDisasterInfo() { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.orderByDesc(DisasterInfo::getVisitCount); + return R.data(disasterInfoService.list(queryWrapper)); + } + + /** * 按月统计当年每个月的响应或者申请量 * diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/MenuController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/MenuController.java index 69a97a9..2b9b8de 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/MenuController.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/MenuController.java @@ -98,6 +98,15 @@ public class MenuController extends BladeController { return R.data(vo); } + /** + * 获取权限分配树形结构 + */ + @GetMapping("/role-tree-keys-new") + @ApiOperation(value = "角色所分配的树", notes = "角色所分配的树") + public R> roleTreeKeysNew(String roleIds) { + return R.data(menuService.roleTreeKeysNew(roleIds)); + } + /** * 懒加载列表 */ diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml index a91c19d..a8e32a1 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml @@ -1668,4 +1668,5 @@ GROUP BY d.`key` ORDER BY d.`key` + diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/IMenuService.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/IMenuService.java index 2235229..b4deeff 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/IMenuService.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/IMenuService.java @@ -154,4 +154,11 @@ public interface IMenuService extends IService { */ boolean submit(Menu menu); + /** + * 默认选中节点 + * + * @param roleIds + * @return + */ + List roleTreeKeysNew(String roleIds); } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/MenuServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/MenuServiceImpl.java index 5983b16..3183e20 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/MenuServiceImpl.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/MenuServiceImpl.java @@ -197,4 +197,15 @@ public class MenuServiceImpl extends ServiceImpl implements IM return saveOrUpdate(menu); } + @Override + public List roleTreeKeysNew(String roleIds) { + List roleMenus = roleMenuService.list(Wrappers.query().lambda().in(RoleMenu::getRoleId, Func.toLongList(roleIds))); + List menuList = new ArrayList<>(); + roleMenus.stream().forEach(roleMenu -> { + Menu byId = this.baseMapper.selectById(roleMenu.getMenuId()); + menuList.add(byId); + }); + return menuList; + } + }