czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

菜单完善,设置店铺默认角色

Browse Source
This commit is contained in:
张松
2025-03-11 18:55:52 +08:00
parent ae3c4af331
commit aa00bacfca
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cash-api/account-server/src/main/java/com/czg/controller/admin/MenuController.java
View File

@@ -40,7 +40,7 @@ public class MenuController {
* @return 菜单结构 * @return 菜单结构
*/ */
@SaAdminCheckRole("管理员") @SaAdminCheckRole("管理员")
// @SaAdminCheckPermission("menu:list") @SaAdminCheckPermission(value = "menu:list", name = "菜单列表")
@GetMapping("/list") @GetMapping("/list")
public CzgResult<List<MenuVO>> all(String title, String startTime, String endTime) { public CzgResult<List<MenuVO>> all(String title, String startTime, String endTime) {
return CzgResult.success(menuService.getAll(title, startTime, endTime)); return CzgResult.success(menuService.getAll(title, startTime, endTime));
@@ -51,7 +51,7 @@ public class MenuController {
* @return 菜单结构 * @return 菜单结构
*/ */
@SaAdminCheckRole("管理员") @SaAdminCheckRole("管理员")
// @SaAdminCheckPermission("menu:detail") @SaAdminCheckPermission(value = "menu:detail", name = "菜单详情")
@GetMapping("/detail") @GetMapping("/detail")
public CzgResult<SysMenu> detail(@RequestParam Integer id) { public CzgResult<SysMenu> detail(@RequestParam Integer id) {
return CzgResult.success(menuService.getById(id)); return CzgResult.success(menuService.getById(id));
@@ -62,7 +62,7 @@ public class MenuController {
* @return 是否成功 * @return 是否成功
*/ */
@SaAdminCheckRole("管理员") @SaAdminCheckRole("管理员")
// @SaAdminCheckPermission("menu:add") @SaAdminCheckPermission(value = "menu:add", name = "菜单添加")
@PostMapping @PostMapping
public CzgResult<Boolean> add(@RequestBody @Validated MenuAddDTO menuAddDTO) { public CzgResult<Boolean> add(@RequestBody @Validated MenuAddDTO menuAddDTO) {
return CzgResult.success(menuService.add(menuAddDTO)); return CzgResult.success(menuService.add(menuAddDTO));
@@ -73,7 +73,7 @@ public class MenuController {
* @return 是否成功 * @return 是否成功
*/ */
@SaAdminCheckRole("管理员") @SaAdminCheckRole("管理员")
// @SaAdminCheckPermission("menu:edit") @SaAdminCheckPermission(value = "menu:edit", name = "菜单编辑")
@PutMapping() @PutMapping()
public CzgResult<Boolean> edit(@RequestBody @Validated MenuEditDTO menuEditDTO) { public CzgResult<Boolean> edit(@RequestBody @Validated MenuEditDTO menuEditDTO) {
return CzgResult.success(menuService.edit(menuEditDTO)); return CzgResult.success(menuService.edit(menuEditDTO));
@@ -84,7 +84,7 @@ public class MenuController {
* @return 是否成功 * @return 是否成功
*/ */
@SaAdminCheckRole("管理员") @SaAdminCheckRole("管理员")
// @SaAdminCheckPermission("menu:del") @SaAdminCheckPermission(value = "menu:del", name = "菜单删除")
@DeleteMapping() @DeleteMapping()
public CzgResult<Boolean> edit(@RequestBody @Validated MenuDelDTO menuDelDTO) { public CzgResult<Boolean> edit(@RequestBody @Validated MenuDelDTO menuDelDTO) {
return CzgResult.success(menuService.removeById(menuDelDTO.getId())); return CzgResult.success(menuService.removeById(menuDelDTO.getId()));

3
cash-api/account-server/src/main/java/com/czg/controller/admin/RoleController.java
View File

@@ -85,6 +85,9 @@ public class RoleController {
@SaAdminCheckPermission(value = "role:remove", name = "角色删除") @SaAdminCheckPermission(value = "role:remove", name = "角色删除")
@DeleteMapping @DeleteMapping
public CzgResult<Boolean> remove(@RequestBody @Validated RoleRemoveDTO roleRemoveDTO) { public CzgResult<Boolean> remove(@RequestBody @Validated RoleRemoveDTO roleRemoveDTO) {
if (roleRemoveDTO.id() == 1L || roleRemoveDTO.id() == 2L) {
return CzgResult.failure("超级管理员角色不可删除");
}
return CzgResult.success(roleService.removeById(roleRemoveDTO.id())); return CzgResult.success(roleService.removeById(roleRemoveDTO.id()));
} }
} }

2
cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java
View File

@@ -117,7 +117,7 @@ public class ShopInfoServiceImpl extends ServiceImpl<ShopInfoMapper, ShopInfo> i
} }
// 添加系统账号 // 添加系统账号
shopInfoAddDTO.setRoleId(shopInfoAddDTO.getRoleId() == null ? 1L : shopInfoAddDTO.getRoleId()); shopInfoAddDTO.setRoleId(shopInfoAddDTO.getRoleId() == null ? 2L : shopInfoAddDTO.getRoleId());
SysUser sysUser = sysUserService.addUser(shopInfoAddDTO.getShopName(), shopInfoAddDTO.getAccountName(), shopInfoAddDTO.getAccountPwd(), shopInfoAddDTO.getPhone(), shopInfoAddDTO.getRoleId()); SysUser sysUser = sysUserService.addUser(shopInfoAddDTO.getShopName(), shopInfoAddDTO.getAccountName(), shopInfoAddDTO.getAccountPwd(), shopInfoAddDTO.getPhone(), shopInfoAddDTO.getRoleId());
// 保存店铺信息 // 保存店铺信息