glj-代码提交
This commit is contained in:
parent
620c328c92
commit
361a4425b7
|
@ -126,4 +126,6 @@ public class AdministratorController {
|
||||||
}
|
}
|
||||||
return R.data(false);
|
return R.data(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -41,7 +41,6 @@ public class DisasterInfoController {
|
||||||
|
|
||||||
private final WebsitesService websitesService;
|
private final WebsitesService websitesService;
|
||||||
|
|
||||||
private final NewsService newsService;
|
|
||||||
|
|
||||||
private final PictureInfoService pictureInfoService;
|
private final PictureInfoService pictureInfoService;
|
||||||
|
|
||||||
|
@ -49,9 +48,6 @@ public class DisasterInfoController {
|
||||||
|
|
||||||
private final GuestManageDisasterRefService guestManageDisasterRefService;
|
private final GuestManageDisasterRefService guestManageDisasterRefService;
|
||||||
|
|
||||||
//下载次数记录
|
|
||||||
private final DownloadRecordService downloadRecordService;
|
|
||||||
|
|
||||||
private final DisasterInfoVoService disasterInfoVoService;
|
private final DisasterInfoVoService disasterInfoVoService;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -597,6 +593,18 @@ public class DisasterInfoController {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 根据灾害访问次数进行排序
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@GetMapping("/getTenDisasterInfo")
|
||||||
|
public R<List<DisasterInfo>> getTenDisasterInfo() {
|
||||||
|
LambdaQueryWrapper<DisasterInfo> queryWrapper = new LambdaQueryWrapper<>();
|
||||||
|
queryWrapper.orderByDesc(DisasterInfo::getVisitCount);
|
||||||
|
return R.data(disasterInfoService.list(queryWrapper));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 按月统计当年每个月的响应或者申请量
|
* 按月统计当年每个月的响应或者申请量
|
||||||
*
|
*
|
||||||
|
|
|
@ -98,6 +98,15 @@ public class MenuController extends BladeController {
|
||||||
return R.data(vo);
|
return R.data(vo);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 获取权限分配树形结构
|
||||||
|
*/
|
||||||
|
@GetMapping("/role-tree-keys-new")
|
||||||
|
@ApiOperation(value = "角色所分配的树", notes = "角色所分配的树")
|
||||||
|
public R<List<Menu>> roleTreeKeysNew(String roleIds) {
|
||||||
|
return R.data(menuService.roleTreeKeysNew(roleIds));
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 懒加载列表
|
* 懒加载列表
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -1668,4 +1668,5 @@
|
||||||
GROUP BY d.`key`
|
GROUP BY d.`key`
|
||||||
ORDER BY d.`key`
|
ORDER BY d.`key`
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
</mapper>
|
</mapper>
|
||||||
|
|
|
@ -154,4 +154,11 @@ public interface IMenuService extends IService<Menu> {
|
||||||
*/
|
*/
|
||||||
boolean submit(Menu menu);
|
boolean submit(Menu menu);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 默认选中节点
|
||||||
|
*
|
||||||
|
* @param roleIds
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
List<Menu> roleTreeKeysNew(String roleIds);
|
||||||
}
|
}
|
||||||
|
|
|
@ -197,4 +197,15 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements IM
|
||||||
return saveOrUpdate(menu);
|
return saveOrUpdate(menu);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<Menu> roleTreeKeysNew(String roleIds) {
|
||||||
|
List<RoleMenu> roleMenus = roleMenuService.list(Wrappers.<RoleMenu>query().lambda().in(RoleMenu::getRoleId, Func.toLongList(roleIds)));
|
||||||
|
List<Menu> menuList = new ArrayList<>();
|
||||||
|
roleMenus.stream().forEach(roleMenu -> {
|
||||||
|
Menu byId = this.baseMapper.selectById(roleMenu.getMenuId());
|
||||||
|
menuList.add(byId);
|
||||||
|
});
|
||||||
|
return menuList;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue