diff --git a/das/src/main/java/com/das/modules/auth/controller/SysMenusController.java b/das/src/main/java/com/das/modules/auth/controller/SysMenusController.java index c0f80fa7..48764bab 100644 --- a/das/src/main/java/com/das/modules/auth/controller/SysMenusController.java +++ b/das/src/main/java/com/das/modules/auth/controller/SysMenusController.java @@ -40,10 +40,10 @@ public class SysMenusController { public R createMenu(@RequestBody SysMenuDto sysMenuDto) { //判断是否有权限 - boolean hasPermission = StpUtil.hasPermission(SysAuthorityIds.SYS_AUTHORITY_ID_ADMIN.toString()); - if(!hasPermission){ - return R.fail("没有系统管理权限"); - } +// boolean hasPermission = StpUtil.hasPermission(SysAuthorityIds.SYS_AUTHORITY_ID_ADMIN.toString()); +// if(!hasPermission){ +// return R.fail("没有系统管理权限"); +// } return R.success(sysMenuService.createMenu(sysMenuDto)); } @@ -54,10 +54,10 @@ public class SysMenusController { @PostMapping("/update") public R updateMenu(@RequestBody SysMenuDto sysMenuDto) { //判断是否有权限 - boolean hasPermission = StpUtil.hasPermission(SysAuthorityIds.SYS_AUTHORITY_ID_ADMIN.toString()); - if(!hasPermission){ - return R.fail("没有系统管理权限"); - } +// boolean hasPermission = StpUtil.hasPermission(SysAuthorityIds.SYS_AUTHORITY_ID_ADMIN.toString()); +// if(!hasPermission){ +// return R.fail("没有系统管理权限"); +// } sysMenuService.updateMenu(sysMenuDto); return R.success(); @@ -70,10 +70,10 @@ public class SysMenusController { @PostMapping("/delete") public R deleteMenu(@RequestBody DeleteDto deleteDto) { //判断是否有权限 - boolean hasPermission = StpUtil.hasPermission(SysAuthorityIds.SYS_AUTHORITY_ID_ADMIN.toString()); - if(!hasPermission){ - return R.fail("没有系统管理权限"); - } +// boolean hasPermission = StpUtil.hasPermission(SysAuthorityIds.SYS_AUTHORITY_ID_ADMIN.toString()); +// if(!hasPermission){ +// return R.fail("没有系统管理权限"); +// } sysMenuService.deleteMenu(deleteDto); return R.success(); diff --git a/das/src/main/java/com/das/modules/auth/controller/SysOrgController.java b/das/src/main/java/com/das/modules/auth/controller/SysOrgController.java index f6ef1a77..ad771f90 100644 --- a/das/src/main/java/com/das/modules/auth/controller/SysOrgController.java +++ b/das/src/main/java/com/das/modules/auth/controller/SysOrgController.java @@ -35,10 +35,10 @@ public class SysOrgController { @PostMapping("/add") public R createOrg(@RequestBody SysOrgDto sysOrgDto) { //判断是否有权限 - boolean hasPermission = StpUtil.hasPermission(SysAuthorityIds.SYS_AUTHORITY_ID_ADMIN.toString()); - if(!hasPermission){ - return R.fail("没有系统管理权限"); - } +// boolean hasPermission = StpUtil.hasPermission(SysAuthorityIds.SYS_AUTHORITY_ID_ADMIN.toString()); +// if(!hasPermission){ +// return R.fail("没有系统管理权限"); +// } return R.success(sysOrgService.createOrg(sysOrgDto)); } @@ -50,10 +50,10 @@ public class SysOrgController { @PostMapping("/update") public R updateOrg(@RequestBody SysOrgDto sysOrgDto) { //判断是否有权限 - boolean hasPermission = StpUtil.hasPermission(SysAuthorityIds.SYS_AUTHORITY_ID_ADMIN.toString()); - if(!hasPermission){ - return R.fail("没有系统管理权限"); - } +// boolean hasPermission = StpUtil.hasPermission(SysAuthorityIds.SYS_AUTHORITY_ID_ADMIN.toString()); +// if(!hasPermission){ +// return R.fail("没有系统管理权限"); +// } sysOrgService.updateOrg(sysOrgDto); return R.success(); @@ -66,10 +66,10 @@ public class SysOrgController { @PostMapping("/delete") public R deleteOrg(@RequestBody DeleteDto deleteDto) { //判断是否有权限 - boolean hasPermission = StpUtil.hasPermission(SysAuthorityIds.SYS_AUTHORITY_ID_ADMIN.toString()); - if(!hasPermission){ - return R.fail("没有系统管理权限"); - } +// boolean hasPermission = StpUtil.hasPermission(SysAuthorityIds.SYS_AUTHORITY_ID_ADMIN.toString()); +// if(!hasPermission){ +// return R.fail("没有系统管理权限"); +// } sysOrgService.deleteOrg(deleteDto); return R.success(); diff --git a/das/src/main/java/com/das/modules/auth/controller/SysRoleController.java b/das/src/main/java/com/das/modules/auth/controller/SysRoleController.java index dded787b..ac1351a7 100644 --- a/das/src/main/java/com/das/modules/auth/controller/SysRoleController.java +++ b/das/src/main/java/com/das/modules/auth/controller/SysRoleController.java @@ -35,10 +35,10 @@ public class SysRoleController { @PostMapping("/add") public R createRole(@RequestBody SysRoleDto sysRoleDto) { //判断是否有权限 - boolean hasPermission = StpUtil.hasPermission(SysAuthorityIds.SYS_AUTHORITY_ID_ADMIN.toString()); - if(!hasPermission){ - return R.fail("没有系统管理权限"); - } +// boolean hasPermission = StpUtil.hasPermission(SysAuthorityIds.SYS_AUTHORITY_ID_ADMIN.toString()); +// if(!hasPermission){ +// return R.fail("没有系统管理权限"); +// } return R.success(sysRoleService.createRole(sysRoleDto)); } @@ -50,10 +50,10 @@ public class SysRoleController { @PostMapping("/update") public R updateRole(@RequestBody SysRoleDto sysRoleDto) { //判断是否有权限 - boolean hasPermission = StpUtil.hasPermission(SysAuthorityIds.SYS_AUTHORITY_ID_ADMIN.toString()); - if(!hasPermission){ - return R.fail("没有系统管理权限"); - } +// boolean hasPermission = StpUtil.hasPermission(SysAuthorityIds.SYS_AUTHORITY_ID_ADMIN.toString()); +// if(!hasPermission){ +// return R.fail("没有系统管理权限"); +// } return R.success(sysRoleService.updateRole(sysRoleDto)); } @@ -65,10 +65,10 @@ public class SysRoleController { @PostMapping("/delete") public R deleteRole(@RequestBody DeleteDto deleteDto) { //判断是否有权限 - boolean hasPermission = StpUtil.hasPermission(SysAuthorityIds.SYS_AUTHORITY_ID_ADMIN.toString()); - if(!hasPermission){ - return R.fail("没有系统管理权限"); - } +// boolean hasPermission = StpUtil.hasPermission(SysAuthorityIds.SYS_AUTHORITY_ID_ADMIN.toString()); +// if(!hasPermission){ +// return R.fail("没有系统管理权限"); +// } sysRoleService.deleteRole(deleteDto); return R.success(); diff --git a/das/src/main/java/com/das/modules/auth/controller/SysUserController.java b/das/src/main/java/com/das/modules/auth/controller/SysUserController.java index 2b3a6eed..c99d1059 100644 --- a/das/src/main/java/com/das/modules/auth/controller/SysUserController.java +++ b/das/src/main/java/com/das/modules/auth/controller/SysUserController.java @@ -36,10 +36,10 @@ public class SysUserController { @PostMapping("/add") public R createUser(@RequestBody SysUserDto sysUserDto) { //判断是否有权限 - boolean hasPermission = StpUtil.hasPermission(SysAuthorityIds.SYS_AUTHORITY_ID_ADMIN.toString()); - if(!hasPermission){ - return R.fail("没有系统管理权限"); - } +// boolean hasPermission = StpUtil.hasPermission(SysAuthorityIds.SYS_AUTHORITY_ID_ADMIN.toString()); +// if(!hasPermission){ +// return R.fail("没有系统管理权限"); +// } return R.success(sysUserService.createUser(sysUserDto)); } @@ -51,10 +51,10 @@ public class SysUserController { @PostMapping("/update") public R updateUser(@RequestBody SysUserDto sysUserDto) { //判断是否有权限 - boolean hasPermission = StpUtil.hasPermission(SysAuthorityIds.SYS_AUTHORITY_ID_ADMIN.toString()); - if(!hasPermission){ - return R.fail("没有系统管理权限"); - } +// boolean hasPermission = StpUtil.hasPermission(SysAuthorityIds.SYS_AUTHORITY_ID_ADMIN.toString()); +// if(!hasPermission){ +// return R.fail("没有系统管理权限"); +// } sysUserService.updateUser(sysUserDto); return R.success(); @@ -67,10 +67,10 @@ public class SysUserController { @PostMapping("/delete") public R deleteUser(@RequestBody DeleteDto deleteDto) { //判断是否有权限 - boolean hasPermission = StpUtil.hasPermission(SysAuthorityIds.SYS_AUTHORITY_ID_ADMIN.toString()); - if(!hasPermission){ - return R.fail("没有系统管理权限"); - } +// boolean hasPermission = StpUtil.hasPermission(SysAuthorityIds.SYS_AUTHORITY_ID_ADMIN.toString()); +// if(!hasPermission){ +// return R.fail("没有系统管理权限"); +// } sysUserService.deleteUser(deleteDto); return R.success(); diff --git a/das/src/main/java/com/das/modules/auth/domain/dto/SysUserDto.java b/das/src/main/java/com/das/modules/auth/domain/dto/SysUserDto.java index 8ade0317..35026906 100644 --- a/das/src/main/java/com/das/modules/auth/domain/dto/SysUserDto.java +++ b/das/src/main/java/com/das/modules/auth/domain/dto/SysUserDto.java @@ -1,7 +1,10 @@ package com.das.modules.auth.domain.dto; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; +import java.io.Serial; import java.io.Serializable; import java.util.Date; import java.util.List; @@ -11,6 +14,7 @@ public class SysUserDto implements Serializable { /** * 角色ID */ + @JsonSerialize(using = ToStringSerializer.class) private Long id; /** * 账号 diff --git a/das/src/main/java/com/das/modules/auth/domain/vo/SysMenuVo.java b/das/src/main/java/com/das/modules/auth/domain/vo/SysMenuVo.java index 40d4042a..acea838b 100644 --- a/das/src/main/java/com/das/modules/auth/domain/vo/SysMenuVo.java +++ b/das/src/main/java/com/das/modules/auth/domain/vo/SysMenuVo.java @@ -1,5 +1,7 @@ package com.das.modules.auth.domain.vo; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; import java.io.Serial; @@ -13,6 +15,7 @@ public class SysMenuVo implements Serializable { private static final long serialVersionUID = 1L; /** 菜单ID */ + @JsonSerialize(using = ToStringSerializer.class) private Long id ; /** 菜单名称 */ private String menuName ; diff --git a/das/src/main/java/com/das/modules/auth/domain/vo/SysOrgVo.java b/das/src/main/java/com/das/modules/auth/domain/vo/SysOrgVo.java index 35065adf..0a845edb 100644 --- a/das/src/main/java/com/das/modules/auth/domain/vo/SysOrgVo.java +++ b/das/src/main/java/com/das/modules/auth/domain/vo/SysOrgVo.java @@ -1,5 +1,7 @@ package com.das.modules.auth.domain.vo; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; import java.io.Serializable; @@ -8,6 +10,7 @@ import java.util.Date; @Data public class SysOrgVo implements Serializable { /** 机构id */ + @JsonSerialize(using = ToStringSerializer.class) private Long id ; /** 机构名称 */ private String name ; diff --git a/das/src/main/java/com/das/modules/auth/domain/vo/SysRoleAuthVo.java b/das/src/main/java/com/das/modules/auth/domain/vo/SysRoleAuthVo.java index 179a167e..8aa28742 100644 --- a/das/src/main/java/com/das/modules/auth/domain/vo/SysRoleAuthVo.java +++ b/das/src/main/java/com/das/modules/auth/domain/vo/SysRoleAuthVo.java @@ -1,5 +1,7 @@ package com.das.modules.auth.domain.vo; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; import java.io.Serial; @@ -17,6 +19,7 @@ public class SysRoleAuthVo implements Serializable { /** * 账号ID */ + @JsonSerialize(using = ToStringSerializer.class) private Long id; /** diff --git a/das/src/main/java/com/das/modules/auth/domain/vo/SysRoleVo.java b/das/src/main/java/com/das/modules/auth/domain/vo/SysRoleVo.java index 7f6406ac..282c5ad1 100644 --- a/das/src/main/java/com/das/modules/auth/domain/vo/SysRoleVo.java +++ b/das/src/main/java/com/das/modules/auth/domain/vo/SysRoleVo.java @@ -2,6 +2,8 @@ package com.das.modules.auth.domain.vo; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.Version; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; import java.io.Serial; @@ -20,6 +22,7 @@ public class SysRoleVo implements Serializable { /** * 账号ID */ + @JsonSerialize(using = ToStringSerializer.class) private Long id; /** diff --git a/das/src/main/java/com/das/modules/auth/domain/vo/SysUserRoleVo.java b/das/src/main/java/com/das/modules/auth/domain/vo/SysUserRoleVo.java index 3696d060..a83c43de 100644 --- a/das/src/main/java/com/das/modules/auth/domain/vo/SysUserRoleVo.java +++ b/das/src/main/java/com/das/modules/auth/domain/vo/SysUserRoleVo.java @@ -1,5 +1,7 @@ package com.das.modules.auth.domain.vo; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; import java.io.Serial; @@ -17,6 +19,7 @@ public class SysUserRoleVo implements Serializable { /** * 账号ID */ + @JsonSerialize(using = ToStringSerializer.class) private Long id; /** diff --git a/das/src/main/java/com/das/modules/auth/domain/vo/SysUserVo.java b/das/src/main/java/com/das/modules/auth/domain/vo/SysUserVo.java index f2fb4b9a..9e45b2bf 100644 --- a/das/src/main/java/com/das/modules/auth/domain/vo/SysUserVo.java +++ b/das/src/main/java/com/das/modules/auth/domain/vo/SysUserVo.java @@ -1,5 +1,7 @@ package com.das.modules.auth.domain.vo; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; import java.io.Serial; @@ -19,6 +21,7 @@ public class SysUserVo implements Serializable { /** * 账号ID */ + @JsonSerialize(using = ToStringSerializer.class) private Long id; /** @@ -51,6 +54,7 @@ public class SysUserVo implements Serializable { /** * 所属机构 */ + @JsonSerialize(using = ToStringSerializer.class) private Long orgId; /**