权限修改
This commit is contained in:
@@ -3,6 +3,7 @@ package com.czg.controller.admin;
|
||||
import com.czg.account.dto.PageDTO;
|
||||
import com.czg.account.dto.role.RoleAddDTO;
|
||||
import com.czg.account.dto.role.RoleEditDTO;
|
||||
import com.czg.account.dto.role.RolePermissionDTO;
|
||||
import com.czg.account.dto.role.RoleRemoveDTO;
|
||||
import com.czg.account.entity.SysRole;
|
||||
import com.czg.account.service.SysRoleService;
|
||||
@@ -44,12 +45,13 @@ public class RoleController {
|
||||
* 获取角色对应的菜单
|
||||
* 权限标识: role:menu
|
||||
* @param id 角色id
|
||||
* @param type 0管理端 1收银机
|
||||
* @return 分页数据
|
||||
*/
|
||||
@SaAdminCheckPermission(value = "role:menu", name = "角色菜单")
|
||||
@GetMapping("/menu")
|
||||
public CzgResult<List<Long>> getRoleMenu(@RequestParam Integer id) {
|
||||
return CzgResult.success(roleService.getRoleMenu(StpKit.USER.getLoginIdAsLong(), id));
|
||||
public CzgResult<List<Long>> getRoleMenu(@RequestParam Integer id, @RequestParam Integer type) {
|
||||
return CzgResult.success(roleService.getRoleMenu(StpKit.USER.getLoginIdAsLong(), id, type));
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -64,6 +66,16 @@ public class RoleController {
|
||||
return CzgResult.success(roleService.add(roleAddDTO));
|
||||
}
|
||||
|
||||
/**
|
||||
* 权限编辑
|
||||
* @param rolePermissionDTO 权限编辑
|
||||
* @return 是否成功
|
||||
*/
|
||||
@PutMapping("/permission")
|
||||
public CzgResult<Boolean> editPermission(@RequestBody @Validated RolePermissionDTO rolePermissionDTO) {
|
||||
return CzgResult.success(roleService.editPermission(StpKit.USER.getLoginIdAsLong(), rolePermissionDTO));
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑角色
|
||||
* 权限标识: role:edit
|
||||
|
||||
@@ -76,7 +76,7 @@ public class UserAuthorizationController {
|
||||
*/
|
||||
@PostMapping("/test")
|
||||
public CzgResult<String> login(@RequestParam long id) {
|
||||
StpKit.USER.login(id, "2342", null, "", MyStpLogic.LoginType.USER, false);
|
||||
StpKit.USER.login(id, "2342", null, "", MyStpLogic.LoginType.USER, false, "");
|
||||
return CzgResult.success(StpKit.USER.getTokenValue());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -95,7 +95,7 @@ public class StatisticTask {
|
||||
LocalDate endDate = LocalDate.now();
|
||||
List<Long> shopIdList = DbChain.table("tb_shop_info").select("id").objListAs(Long.class);
|
||||
List<List<Long>> split = CollUtil.split(shopIdList, 10);
|
||||
// 1.清除历史统计的数据
|
||||
// 1.清除历史统计的数据
|
||||
for (List<Long> splitIdList : split) {
|
||||
splitIdList.parallelStream().forEach(shopId -> {
|
||||
shopOrderStatisticMapper.deleteByQuery(QueryWrapper.create().eq(ShopOrderStatistic::getShopId, shopId));
|
||||
|
||||
Reference in New Issue
Block a user