From daccc6909f14a59f6d0d9597beb0c54e215168d8 Mon Sep 17 00:00:00 2001 From: damonyuan <404054358@qq.com> Date: Mon, 2 Sep 2024 23:59:28 +0800 Subject: [PATCH] =?UTF-8?q?feat=20=E5=90=8C=E6=AD=A5admin=EF=BC=8Cdept=20j?= =?UTF-8?q?obs=20=E7=AD=89=E5=85=B3=E8=81=94DB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mdd/admin/config/stp/StpInterConfig.java | 12 +- .../system/SystemAuthDeptController.java | 72 ------ .../system/SystemAuthMenuController.java | 4 +- .../system/SystemAuthPostController.java | 74 ------ .../service/admin/IAdminDeptService.java | 17 ++ .../service/admin/IAdminJobsService.java | 17 ++ .../mdd/admin/service/admin/IAuthService.java | 17 ++ .../impl/admin/AdminDeptServiceImpl.java | 35 +++ .../impl/admin/AdminJobsServiceImpl.java | 35 +++ .../service/impl/admin/AdminServiceImpl.java | 65 +++-- .../service/impl/admin/AuthServiceImpl.java | 36 +++ .../system/SystemAuthDeptServiceImpl.java | 228 ------------------ .../system/SystemAuthPostServiceImpl.java | 228 ------------------ ...ceImpl.java => SystemMenuServiceImpl.java} | 50 ++-- .../system/ISystemAuthDeptService.java | 66 ----- .../system/ISystemAuthPostService.java | 69 ------ ...nuService.java => ISystemMenuService.java} | 2 +- .../system/SystemMenuCreateValidate.java | 8 +- .../system/SystemMenuUpdateValidate.java | 8 +- .../com/mdd/admin/vo/auth/AdminMySelfVo.java | 4 +- .../com/mdd/admin/vo/auth/AuthMySelfVo.java | 46 ++++ .../vo/system/SystemAuthAdminDetailVo.java | 21 +- .../src/main/resources/application.yml | 3 +- .../mdd/common/entity/admin/AdminDept.java | 22 ++ .../mdd/common/entity/admin/AdminJobs.java | 22 ++ .../common/entity/system/SystemAuthDept.java | 51 ---- .../common/entity/system/SystemAuthPost.java | 48 ---- .../{SystemAuthMenu.java => SystemMenu.java} | 10 +- .../common/mapper/admin/AdminDeptMapper.java | 14 ++ .../common/mapper/admin/AdminJobsMapper.java | 14 ++ .../mapper/system/SystemAuthDeptMapper.java | 12 - .../mapper/system/SystemAuthPostMapper.java | 12 - ...hMenuMapper.java => SystemMenuMapper.java} | 4 +- .../service/impl/GenerateServiceImpl.java | 20 +- 34 files changed, 380 insertions(+), 966 deletions(-) delete mode 100644 server/like-admin/src/main/java/com/mdd/admin/controller/system/SystemAuthDeptController.java delete mode 100644 server/like-admin/src/main/java/com/mdd/admin/controller/system/SystemAuthPostController.java create mode 100644 server/like-admin/src/main/java/com/mdd/admin/service/admin/IAdminDeptService.java create mode 100644 server/like-admin/src/main/java/com/mdd/admin/service/admin/IAdminJobsService.java create mode 100644 server/like-admin/src/main/java/com/mdd/admin/service/admin/IAuthService.java create mode 100644 server/like-admin/src/main/java/com/mdd/admin/service/impl/admin/AdminDeptServiceImpl.java create mode 100644 server/like-admin/src/main/java/com/mdd/admin/service/impl/admin/AdminJobsServiceImpl.java create mode 100644 server/like-admin/src/main/java/com/mdd/admin/service/impl/admin/AuthServiceImpl.java delete mode 100644 server/like-admin/src/main/java/com/mdd/admin/service/impl/system/SystemAuthDeptServiceImpl.java delete mode 100644 server/like-admin/src/main/java/com/mdd/admin/service/impl/system/SystemAuthPostServiceImpl.java rename server/like-admin/src/main/java/com/mdd/admin/service/impl/system/{SystemAuthMenuServiceImpl.java => SystemMenuServiceImpl.java} (77%) delete mode 100644 server/like-admin/src/main/java/com/mdd/admin/service/system/ISystemAuthDeptService.java delete mode 100644 server/like-admin/src/main/java/com/mdd/admin/service/system/ISystemAuthPostService.java rename server/like-admin/src/main/java/com/mdd/admin/service/system/{ISystemAuthMenuService.java => ISystemMenuService.java} (96%) create mode 100644 server/like-admin/src/main/java/com/mdd/admin/vo/auth/AuthMySelfVo.java create mode 100644 server/like-common/src/main/java/com/mdd/common/entity/admin/AdminDept.java create mode 100644 server/like-common/src/main/java/com/mdd/common/entity/admin/AdminJobs.java delete mode 100644 server/like-common/src/main/java/com/mdd/common/entity/system/SystemAuthDept.java delete mode 100644 server/like-common/src/main/java/com/mdd/common/entity/system/SystemAuthPost.java rename server/like-common/src/main/java/com/mdd/common/entity/system/{SystemAuthMenu.java => SystemMenu.java} (89%) create mode 100644 server/like-common/src/main/java/com/mdd/common/mapper/admin/AdminDeptMapper.java create mode 100644 server/like-common/src/main/java/com/mdd/common/mapper/admin/AdminJobsMapper.java delete mode 100644 server/like-common/src/main/java/com/mdd/common/mapper/system/SystemAuthDeptMapper.java delete mode 100644 server/like-common/src/main/java/com/mdd/common/mapper/system/SystemAuthPostMapper.java rename server/like-common/src/main/java/com/mdd/common/mapper/system/{SystemAuthMenuMapper.java => SystemMenuMapper.java} (57%) diff --git a/server/like-admin/src/main/java/com/mdd/admin/config/stp/StpInterConfig.java b/server/like-admin/src/main/java/com/mdd/admin/config/stp/StpInterConfig.java index 8f9f353d..024a55d0 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/config/stp/StpInterConfig.java +++ b/server/like-admin/src/main/java/com/mdd/admin/config/stp/StpInterConfig.java @@ -3,9 +3,9 @@ package com.mdd.admin.config.stp; import cn.dev33.satoken.stp.StpInterface; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.mdd.admin.LikeAdminThreadLocal; -import com.mdd.common.entity.system.SystemAuthMenu; +import com.mdd.common.entity.system.SystemMenu; import com.mdd.common.entity.system.SystemAuthPerm; -import com.mdd.common.mapper.system.SystemAuthMenuMapper; +import com.mdd.common.mapper.system.SystemMenuMapper; import com.mdd.common.mapper.system.SystemAuthPermMapper; import com.mdd.common.util.StringUtils; import org.springframework.stereotype.Component; @@ -23,7 +23,7 @@ public class StpInterConfig implements StpInterface { SystemAuthPermMapper systemAuthPermMapper; @Resource - SystemAuthMenuMapper systemAuthMenuMapper; + SystemMenuMapper systemAuthMenuMapper; /** * 返回一个账号所拥有的权限码集合 @@ -55,15 +55,15 @@ public class StpInterConfig implements StpInterface { menuIds.add(systemAuthPerm.getMenuId()); } - List systemAuthMenus = systemAuthMenuMapper.selectList( - new QueryWrapper() + List systemAuthMenus = systemAuthMenuMapper.selectList( + new QueryWrapper() .select("id,perms") .eq("is_disable", 0) .in("id", menuIds) .in("menu_type", Arrays.asList("C", "A")) .orderByAsc(Arrays.asList("menu_sort", "id"))); - for (SystemAuthMenu item : systemAuthMenus) { + for (SystemMenu item : systemAuthMenus) { if (StringUtils.isNotNull(item.getPerms()) && StringUtils.isNotEmpty(item.getPerms())) { perms.add(item.getPerms().trim()); } diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/system/SystemAuthDeptController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/system/SystemAuthDeptController.java deleted file mode 100644 index cee1afd1..00000000 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/system/SystemAuthDeptController.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.mdd.admin.controller.system; - -import com.alibaba.fastjson2.JSONArray; -import com.mdd.common.aop.NotPower; -import com.mdd.admin.service.system.ISystemAuthDeptService; -import com.mdd.admin.validate.commons.IdValidate; -import com.mdd.admin.validate.system.SystemDeptCreateValidate; -import com.mdd.admin.validate.system.SystemDeptSearchValidate; -import com.mdd.admin.validate.system.SystemDeptUpdateValidate; -import com.mdd.admin.vo.system.SystemAuthDeptVo; -import com.mdd.common.core.AjaxResult; -import com.mdd.common.validator.annotation.IDMust; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -@RestController -@RequestMapping("api/system/dept") -@Api(tags = "系统部门管理") -public class SystemAuthDeptController { - - @Resource - ISystemAuthDeptService iSystemAuthDeptService; - - @NotPower - @GetMapping("/all") - @ApiOperation(value="部门所有") - public AjaxResult> all() { - List list = iSystemAuthDeptService.all(); - return AjaxResult.success(list); - } - - @GetMapping("/list") - @ApiOperation(value="部门列表") - public AjaxResult list(@Validated SystemDeptSearchValidate searchValidate) { - JSONArray list = iSystemAuthDeptService.list(searchValidate); - return AjaxResult.success(list); - } - - @GetMapping("/detail") - @ApiOperation(value="部门详情") - public AjaxResult detail(@Validated @IDMust() @RequestParam("id") Integer id) { - SystemAuthDeptVo vo = iSystemAuthDeptService.detail(id); - return AjaxResult.success(vo); - } - - @PostMapping("/add") - @ApiOperation(value="部门新增") - public AjaxResult add(@Validated @RequestBody SystemDeptCreateValidate createValidate) { - iSystemAuthDeptService.add(createValidate); - return AjaxResult.success(); - } - - @PostMapping("/edit") - @ApiOperation(value="部门编辑") - public AjaxResult edit(@Validated @RequestBody SystemDeptUpdateValidate updateValidate) { - iSystemAuthDeptService.edit(updateValidate); - return AjaxResult.success(); - } - - @PostMapping("/del") - @ApiOperation(value="部门删除") - public AjaxResult del(@Validated @RequestBody IdValidate idValidate) { - iSystemAuthDeptService.del(idValidate.getId()); - return AjaxResult.success(); - } - -} diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/system/SystemAuthMenuController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/system/SystemAuthMenuController.java index 1c0f3cb7..b0388988 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/system/SystemAuthMenuController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/system/SystemAuthMenuController.java @@ -4,7 +4,7 @@ import com.alibaba.fastjson2.JSONArray; import com.mdd.admin.LikeAdminThreadLocal; import com.mdd.admin.aop.Log; import com.mdd.common.aop.NotPower; -import com.mdd.admin.service.system.ISystemAuthMenuService; +import com.mdd.admin.service.system.ISystemMenuService; import com.mdd.admin.validate.commons.IdValidate; import com.mdd.admin.validate.system.SystemMenuCreateValidate; import com.mdd.admin.validate.system.SystemMenuUpdateValidate; @@ -25,7 +25,7 @@ import java.util.List; public class SystemAuthMenuController { @Resource - ISystemAuthMenuService iSystemAuthMenuService; + ISystemMenuService iSystemAuthMenuService; @NotPower @GetMapping("/route") diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/system/SystemAuthPostController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/system/SystemAuthPostController.java deleted file mode 100644 index 52eeee10..00000000 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/system/SystemAuthPostController.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.mdd.admin.controller.system; - -import com.mdd.common.aop.NotPower; -import com.mdd.admin.service.system.ISystemAuthPostService; -import com.mdd.admin.validate.commons.IdValidate; -import com.mdd.admin.validate.commons.PageValidate; -import com.mdd.admin.validate.system.SystemPostCreateValidate; -import com.mdd.admin.validate.system.SystemPostSearchValidate; -import com.mdd.admin.validate.system.SystemPostUpdateValidate; -import com.mdd.admin.vo.system.SystemAuthPostVo; -import com.mdd.common.core.AjaxResult; -import com.mdd.common.core.PageResult; -import com.mdd.common.validator.annotation.IDMust; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -@RestController -@RequestMapping("api/system/post") -@Api(tags = "系统岗位管理") -public class SystemAuthPostController { - - @Resource - ISystemAuthPostService iSystemAuthPostService; - - @NotPower - @GetMapping("/all") - @ApiOperation(value="所有岗位") - public AjaxResult> all() { - List list = iSystemAuthPostService.all(); - return AjaxResult.success(list); - } - - @GetMapping("/list") - @ApiOperation(value="岗位列表") - public AjaxResult> list(@Validated PageValidate pageValidate, - @Validated SystemPostSearchValidate searchValidate) { - PageResult list = iSystemAuthPostService.list(pageValidate, searchValidate); - return AjaxResult.success(list); - } - - @GetMapping("/detail") - @ApiOperation(value="岗位详情") - public AjaxResult detail(@Validated @IDMust() @RequestParam("id") Integer id) { - SystemAuthPostVo vo = iSystemAuthPostService.detail(id); - return AjaxResult.success(vo); - } - - @PostMapping("/add") - @ApiOperation(value="岗位新增") - public AjaxResult add(@Validated @RequestBody SystemPostCreateValidate createValidate) { - iSystemAuthPostService.add(createValidate); - return AjaxResult.success(); - } - - @PostMapping("/edit") - @ApiOperation(value="岗位编辑") - public AjaxResult edit(@Validated @RequestBody SystemPostUpdateValidate updateValidate) { - iSystemAuthPostService.edit(updateValidate); - return AjaxResult.success(); - } - - @PostMapping("/del") - @ApiOperation(value="岗位删除") - public AjaxResult del(@Validated @RequestBody IdValidate idValidate) { - iSystemAuthPostService.del(idValidate.getId()); - return AjaxResult.success(); - } - -} diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/admin/IAdminDeptService.java b/server/like-admin/src/main/java/com/mdd/admin/service/admin/IAdminDeptService.java new file mode 100644 index 00000000..76ef8f1c --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/service/admin/IAdminDeptService.java @@ -0,0 +1,17 @@ +package com.mdd.admin.service.admin; + +import java.util.List; + +/** + * 部门关联接口类 + */ +public interface IAdminDeptService { + + /** + * 关联部门id + * + * @author damonyuan + */ + List getDeptIdAttr(Integer adminId); + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/admin/IAdminJobsService.java b/server/like-admin/src/main/java/com/mdd/admin/service/admin/IAdminJobsService.java new file mode 100644 index 00000000..41710dd1 --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/service/admin/IAdminJobsService.java @@ -0,0 +1,17 @@ +package com.mdd.admin.service.admin; + +import java.util.List; + +/** + * 岗位关联接口类 + */ +public interface IAdminJobsService { + + /** + * 关联岗位id + * + * @author damonyuan + */ + List getJobIdAttr(Integer adminId); + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/admin/IAuthService.java b/server/like-admin/src/main/java/com/mdd/admin/service/admin/IAuthService.java new file mode 100644 index 00000000..c881fbd5 --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/service/admin/IAuthService.java @@ -0,0 +1,17 @@ +package com.mdd.admin.service.admin; + +import java.util.List; + +/** + * 权限功能类 + */ +public interface IAuthService { + + /** + * @notes 获取当前管理员角色按钮权限 + * @return mixed + * @author damonyuan + * @date 2022/7/1 16:10 + */ + List getBtnAuthByRoleId(Integer adminId); +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/impl/admin/AdminDeptServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/admin/AdminDeptServiceImpl.java new file mode 100644 index 00000000..f632d573 --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/admin/AdminDeptServiceImpl.java @@ -0,0 +1,35 @@ +package com.mdd.admin.service.impl.admin; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.mdd.admin.service.admin.IAdminDeptService; +import com.mdd.admin.service.admin.IAdminJobsService; +import com.mdd.common.entity.admin.AdminDept; +import com.mdd.common.entity.admin.AdminJobs; +import com.mdd.common.mapper.admin.AdminDeptMapper; +import com.mdd.common.mapper.admin.AdminJobsMapper; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +/** + * 系统部门关联实现类 + */ +@Service +public class AdminDeptServiceImpl implements IAdminDeptService { + + @Resource + AdminDeptMapper adminDeptMapper; + @Override + public List getDeptIdAttr(Integer adminId) { + List ret = new ArrayList(); + List rolesList = adminDeptMapper.selectList(new QueryWrapper().eq("admin_id", adminId).select("dept_id")); + if (rolesList.size() > 0) { + for (AdminDept adminDept : rolesList) { + ret.add(adminDept.getDeptId()); + } + } + return ret; + } +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/impl/admin/AdminJobsServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/admin/AdminJobsServiceImpl.java new file mode 100644 index 00000000..b78c06da --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/admin/AdminJobsServiceImpl.java @@ -0,0 +1,35 @@ +package com.mdd.admin.service.impl.admin; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.mdd.admin.service.admin.IAdminJobsService; +import com.mdd.admin.service.admin.IAdminRoleService; +import com.mdd.common.entity.admin.AdminJobs; +import com.mdd.common.entity.admin.AdminRole; +import com.mdd.common.mapper.admin.AdminJobsMapper; +import com.mdd.common.mapper.admin.AdminRoleMapper; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +/** + * 系统岗位实现类 + */ +@Service +public class AdminJobsServiceImpl implements IAdminJobsService { + + @Resource + AdminJobsMapper adminJobsMapper; + @Override + public List getJobIdAttr(Integer adminId) { + List ret = new ArrayList(); + List rolesList = adminJobsMapper.selectList(new QueryWrapper().eq("admin_id", adminId).select("jobs_id")); + if (rolesList.size() > 0) { + for (AdminJobs adminJobs : rolesList) { + ret.add(adminJobs.getJobsId()); + } + } + return ret; + } +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/impl/admin/AdminServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/admin/AdminServiceImpl.java index 59c6fc2b..fc20190a 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/impl/admin/AdminServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/admin/AdminServiceImpl.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.yulichang.query.MPJQueryWrapper; -import com.mdd.admin.service.admin.IAdminService; +import com.mdd.admin.service.admin.*; import com.mdd.admin.service.system.ISystemAuthPermService; import com.mdd.admin.validate.commons.PageValidate; import com.mdd.admin.validate.system.SystemAdminCreateValidate; @@ -15,16 +15,15 @@ import com.mdd.admin.validate.system.SystemAdminSearchValidate; import com.mdd.admin.validate.system.SystemAdminUpInfoValidate; import com.mdd.admin.validate.system.SystemAdminUpdateValidate; import com.mdd.admin.vo.auth.AdminMySelfVo; +import com.mdd.admin.vo.auth.AuthMySelfVo; import com.mdd.admin.vo.system.*; import com.mdd.common.core.PageResult; import com.mdd.common.entity.admin.Admin; -import com.mdd.common.entity.system.SystemAuthDept; -import com.mdd.common.entity.system.SystemAuthMenu; +import com.mdd.common.entity.system.SystemMenu; import com.mdd.common.entity.system.SystemRole; import com.mdd.common.exception.OperateException; import com.mdd.common.mapper.admin.AdminMapper; -import com.mdd.common.mapper.system.SystemAuthDeptMapper; -import com.mdd.common.mapper.system.SystemAuthMenuMapper; +import com.mdd.common.mapper.system.SystemMenuMapper; import com.mdd.common.mapper.system.SystemRoleMapper; import com.mdd.common.util.*; import org.springframework.beans.BeanUtils; @@ -43,16 +42,21 @@ public class AdminServiceImpl implements IAdminService { AdminMapper systemAuthAdminMapper; @Resource - SystemAuthMenuMapper systemAuthMenuMapper; - - @Resource - SystemAuthDeptMapper systemAuthDeptMapper; + SystemMenuMapper systemAuthMenuMapper; @Resource SystemRoleMapper systemAuthRoleMapper; @Resource ISystemAuthPermService iSystemAuthPermService; + @Resource + IAdminRoleService iAdminRoleService; + @Resource + IAdminDeptService iAdminDeptService; + @Resource + IAdminJobsService iAdminJobsService; + @Resource + IAuthService iAuthService; /** * 管理员列表 @@ -106,23 +110,6 @@ public class AdminServiceImpl implements IAdminService { vo.setRole(ListUtils.listToStringByStr(role, ",")); } - if (StringUtils.isNull(vo.getDept()) || vo.getDept().equals("")) { - vo.setDept(""); - } else { - List dept = new LinkedList<>(); - List deptIds = ListUtils.stringToListAsInt(vo.getDept(), ","); - if (!deptIds.isEmpty()) { - List deptList = systemAuthDeptMapper.selectList(new QueryWrapper() - .select("id,name") - .in("id", deptIds) - .eq("is_delete", 0)); - for (SystemAuthDept d : deptList) { - dept.add(d.getName()); - } - } - vo.setDept(ListUtils.listToStringByStr(dept, ",")); - } - vo.setAvatar(UrlUtils.toAbsoluteUrl(vo.getAvatar())); vo.setCreateTime(TimeUtils.timestampToDate(vo.getCreateTime())); vo.setUpdateTime(TimeUtils.timestampToDate(vo.getUpdateTime())); @@ -165,14 +152,14 @@ public class AdminServiceImpl implements IAdminService { List roleIds = new ArrayList(); List menuIds = iSystemAuthPermService.selectMenuIdsByRoleId(roleIds); if (menuIds.size() > 0) { - List systemAuthMenus = systemAuthMenuMapper.selectList(new QueryWrapper() + List systemAuthMenus = systemAuthMenuMapper.selectList(new QueryWrapper() .eq("is_disable", 0) .in("id", menuIds) .in("menu_type", Arrays.asList("C", "A")) .orderByAsc(Arrays.asList("menu_sort", "id"))); // 处理权限 - for (SystemAuthMenu item : systemAuthMenus) { + for (SystemMenu item : systemAuthMenus) { if (StringUtils.isNotNull(item.getPerms()) && StringUtils.isNotEmpty(item.getPerms())) { auths.add(item.getPerms().trim()); } @@ -207,10 +194,9 @@ public class AdminServiceImpl implements IAdminService { .select(Admin.class, info-> !info.getColumn().equals("salt") && !info.getColumn().equals("password") && - !info.getColumn().equals("is_delete") && !info.getColumn().equals("delete_time")) .eq("id", id) - .eq("is_delete", 0) + .isNull("delete_time") .last("limit 1")); Assert.notNull(sysAdmin, "账号已不存在！"); @@ -220,7 +206,10 @@ public class AdminServiceImpl implements IAdminService { vo.setAvatar(UrlUtils.toAbsoluteUrl(sysAdmin.getAvatar())); vo.setCreateTime(TimeUtils.timestampToDate(sysAdmin.getCreateTime())); vo.setUpdateTime(TimeUtils.timestampToDate(sysAdmin.getUpdateTime())); - vo.setLastLoginTime(TimeUtils.timestampToDate(sysAdmin.getLoginTime())); + vo.setLoginTime(TimeUtils.timestampToDate(sysAdmin.getLoginTime())); + vo.setRoleIds(iAdminRoleService.getRoleIdAttr(sysAdmin.getId())); + vo.setJobIds(iAdminJobsService.getJobIdAttr(sysAdmin.getId())); + vo.setDeptIds(iAdminDeptService.getDeptIdAttr(sysAdmin.getId())); return vo; } @@ -419,11 +408,17 @@ public class AdminServiceImpl implements IAdminService { @Override public AdminMySelfVo mySelf(Integer id) { AdminMySelfVo ret = new AdminMySelfVo(); + // 当前管理员角色拥有的菜单 ret.setMenu(new JSONArray()); - ret.setPermissions(new ArrayList(){{ - add("*"); - }}); - ret.setUser(); + // 当前管理员橘色拥有的按钮权限 + ret.setPermissions(iAuthService.getBtnAuthByRoleId(id)); + SystemAuthAdminDetailVo admin = detail(id); + AuthMySelfVo user = new AuthMySelfVo(); + BeanUtils.copyProperties(admin, user); + user.setDeptId(admin.getDeptIds()); + user.setJobsId(admin.getJobIds()); + user.setRoleId(admin.getRoleIds()); + ret.setUser(user); return ret; } diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/impl/admin/AuthServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/admin/AuthServiceImpl.java new file mode 100644 index 00000000..3a2baeed --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/admin/AuthServiceImpl.java @@ -0,0 +1,36 @@ +package com.mdd.admin.service.impl.admin; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.mdd.admin.service.admin.IAdminDeptService; +import com.mdd.admin.service.admin.IAdminService; +import com.mdd.admin.service.admin.IAuthService; +import com.mdd.admin.vo.system.SystemAuthAdminDetailVo; +import com.mdd.common.entity.admin.AdminDept; +import com.mdd.common.mapper.admin.AdminDeptMapper; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +/** + * 权限功能类 + */ +@Service +public class AuthServiceImpl implements IAuthService { + + @Resource + IAdminService iAdminService; + @Override + public List getBtnAuthByRoleId(Integer adminId) { + List ret = new ArrayList(); + SystemAuthAdminDetailVo admin = iAdminService.detail(adminId); + if (admin.getRoot().equals(1)) { + ret.add("*"); + return ret; + } else { + + } + return ret; + } +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/impl/system/SystemAuthDeptServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/system/SystemAuthDeptServiceImpl.java deleted file mode 100644 index ab7a64eb..00000000 --- a/server/like-admin/src/main/java/com/mdd/admin/service/impl/system/SystemAuthDeptServiceImpl.java +++ /dev/null @@ -1,228 +0,0 @@ -package com.mdd.admin.service.impl.system; - -import com.alibaba.fastjson2.JSONArray; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Assert; -import com.mdd.admin.service.system.ISystemAuthDeptService; -import com.mdd.admin.validate.system.SystemDeptCreateValidate; -import com.mdd.admin.validate.system.SystemDeptSearchValidate; -import com.mdd.admin.validate.system.SystemDeptUpdateValidate; -import com.mdd.admin.vo.system.SystemAuthDeptVo; -import com.mdd.common.entity.admin.Admin; -import com.mdd.common.entity.system.SystemAuthDept; -import com.mdd.common.mapper.admin.AdminMapper; -import com.mdd.common.mapper.system.SystemAuthDeptMapper; -import com.mdd.common.util.ListUtils; -import com.mdd.common.util.TimeUtils; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.util.*; - -/** - * 系统部门服务实现类 - */ -@Service -class SystemAuthDeptServiceImpl implements ISystemAuthDeptService { - - @Resource - SystemAuthDeptMapper systemAuthDeptMapper; - - @Resource - AdminMapper systemAuthAdminMapper; - - /** - * 岗位所有 - * - * @author fzr - * @return List - */ - @Override - public List all() { - List systemAuthDeptList = systemAuthDeptMapper.selectList(new QueryWrapper() - .gt("pid", 0) - .eq("is_delete", 0) - .orderByDesc((Arrays.asList("sort", "id")))); - - List list = new ArrayList<>(); - for (SystemAuthDept systemAuthDept : systemAuthDeptList) { - SystemAuthDeptVo vo = new SystemAuthDeptVo(); - BeanUtils.copyProperties(systemAuthDept, vo); - - vo.setUpdateTime(TimeUtils.timestampToDate(systemAuthDept.getUpdateTime())); - vo.setCreateTime(TimeUtils.timestampToDate(systemAuthDept.getCreateTime())); - list.add(vo); - } - - return list; - } - - /** - * 部门列表 - * - * @author fzr - * @param searchValidate 搜索参数 - * @return JSONArray - */ - @Override - public JSONArray list(SystemDeptSearchValidate searchValidate) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("is_delete", 0); - queryWrapper.orderByDesc(Arrays.asList("sort", "id")); - queryWrapper.select(SystemAuthDept.class, info -> - !info.getColumn().equals("is_delete") && - !info.getColumn().equals("delete_time")); - - systemAuthDeptMapper.setSearch(queryWrapper, searchValidate, new String[]{ - "like:name:str", - "=:isStop@is_stop:int" - }); - - List systemAuthDeptList = systemAuthDeptMapper.selectList(queryWrapper); - - List list = new LinkedList<>(); - for (SystemAuthDept systemAuthDept : systemAuthDeptList) { - SystemAuthDeptVo vo = new SystemAuthDeptVo(); - BeanUtils.copyProperties(systemAuthDept, vo); - - vo.setCreateTime(TimeUtils.timestampToDate(systemAuthDept.getCreateTime())); - vo.setUpdateTime(TimeUtils.timestampToDate(systemAuthDept.getUpdateTime())); - list.add(vo); - } - - JSONArray jsonArray = JSONArray.parseArray(JSONArray.toJSONString(list)); - return ListUtils.listToTree(jsonArray, "id", "pid", "children"); - } - - /** - * 部门详情 - * - * @author fzr - * @param id 主键 - * @return SystemDeptVo - */ - @Override - public SystemAuthDeptVo detail(Integer id) { - SystemAuthDept systemAuthDept = systemAuthDeptMapper.selectOne( - new QueryWrapper() - .select(SystemAuthDept.class, info -> - !info.getColumn().equals("is_delete") && - !info.getColumn().equals("delete_time")) - .eq("id", id) - .eq("is_delete", 0) - .last("limit 1")); - - Assert.notNull(systemAuthDept, "部门已不存在!"); - - SystemAuthDeptVo vo = new SystemAuthDeptVo(); - BeanUtils.copyProperties(systemAuthDept, vo); - vo.setCreateTime(TimeUtils.timestampToDate(systemAuthDept.getCreateTime())); - vo.setUpdateTime(TimeUtils.timestampToDate(systemAuthDept.getUpdateTime())); - - return vo; - } - - /** - * 部门新增 - * - * @author fzr - * @param createValidate 参数 - */ - @Override - public void add(SystemDeptCreateValidate createValidate) { - if (createValidate.getPid().equals(0)) { - SystemAuthDept systemAuthDept = systemAuthDeptMapper.selectOne( - new QueryWrapper() - .select("id,pid,name") - .eq("pid", 0) - .eq("is_delete", 0) - .last("limit 1")); - - Assert.isNull(systemAuthDept, "顶级部门只允许有一个"); - } - - SystemAuthDept model = new SystemAuthDept(); - model.setPid(createValidate.getPid()); - model.setName(createValidate.getName()); - model.setDuty(createValidate.getDuty()); - model.setMobile(createValidate.getMobile()); - model.setSort(createValidate.getSort()); - model.setIsStop(createValidate.getIsStop()); - model.setCreateTime(System.currentTimeMillis() / 1000); - model.setUpdateTime(System.currentTimeMillis() / 1000); - systemAuthDeptMapper.insert(model); - } - - /** - * 部门编辑 - * - * @author fzr - * @param updateValidate 参数 - */ - @Override - public void edit(SystemDeptUpdateValidate updateValidate) { - SystemAuthDept model = systemAuthDeptMapper.selectOne( - new QueryWrapper() - .select(SystemAuthDept.class, info -> - !info.getColumn().equals("is_delete") && - !info.getColumn().equals("delete_time")) - .eq("id", updateValidate.getId()) - .eq("is_delete", 0) - .last("limit 1")); - - Assert.notNull(model, "部门不存在"); - Assert.isFalse((model.getPid().equals(0) && updateValidate.getPid()>0), "顶级部门不能修改上级"); - Assert.isFalse(updateValidate.getId().equals(updateValidate.getPid()), "上级部门不能是自己"); - - model.setPid(updateValidate.getPid()); - model.setName(updateValidate.getName()); - model.setDuty(updateValidate.getDuty()); - model.setMobile(updateValidate.getMobile()); - model.setSort(updateValidate.getSort()); - model.setIsStop(updateValidate.getIsStop()); - model.setUpdateTime(System.currentTimeMillis() / 1000); - systemAuthDeptMapper.updateById(model); - } - - /** - * 部门删除 - * - * @author fzr - * @param id 主键 - */ - @Override - public void del(Integer id) { - SystemAuthDept model = systemAuthDeptMapper.selectOne( - new QueryWrapper() - .select("id,pid,name") - .eq("id", id) - .eq("is_delete", 0) - .last("limit 1")); - - Assert.notNull(model, "部门不存在"); - Assert.isFalse((model.getPid() == 0), "顶级部门不能删除"); - - SystemAuthDept pModel = systemAuthDeptMapper.selectOne( - new QueryWrapper() - .select("id,pid,name") - .eq("pid", id) - .eq("is_delete", 0) - .last("limit 1")); - - Assert.isNull(pModel, "请先删除子级部门"); - - Admin systemAuthAdmin = systemAuthAdminMapper.selectOne(new QueryWrapper() - .select("id,nickname") - .apply("find_in_set({0}, dept_ids)", id) - .eq("is_delete", 0) - .last("limit 1")); - - Assert.isNull(systemAuthAdmin, "该部门已被管理员使用,请先移除"); - - model.setIsDelete(1); - model.setDeleteTime(System.currentTimeMillis() / 1000); - systemAuthDeptMapper.updateById(model); - } - -} \ No newline at end of file diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/impl/system/SystemAuthPostServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/system/SystemAuthPostServiceImpl.java deleted file mode 100644 index 915e8e6e..00000000 --- a/server/like-admin/src/main/java/com/mdd/admin/service/impl/system/SystemAuthPostServiceImpl.java +++ /dev/null @@ -1,228 +0,0 @@ -package com.mdd.admin.service.impl.system; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Assert; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.mdd.admin.service.system.ISystemAuthPostService; -import com.mdd.admin.validate.commons.PageValidate; -import com.mdd.admin.validate.system.SystemPostCreateValidate; -import com.mdd.admin.validate.system.SystemPostSearchValidate; -import com.mdd.admin.validate.system.SystemPostUpdateValidate; -import com.mdd.admin.vo.system.SystemAuthPostVo; -import com.mdd.common.core.PageResult; -import com.mdd.common.entity.admin.Admin; -import com.mdd.common.entity.system.SystemAuthPost; -import com.mdd.common.mapper.admin.AdminMapper; -import com.mdd.common.mapper.system.SystemAuthPostMapper; -import com.mdd.common.util.TimeUtils; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -/** - * 系统岗位服务实现类 - */ -@Service -public class SystemAuthPostServiceImpl implements ISystemAuthPostService { - - @Resource - SystemAuthPostMapper systemAuthPostMapper; - - @Resource - AdminMapper systemAuthAdminMapper; - - /** - * 岗位所有 - * - * @author fzr - * @return List - */ - @Override - public List all() { - List systemAuthPostList = systemAuthPostMapper.selectList(new QueryWrapper() - .eq("is_delete", 0) - .orderByDesc((Arrays.asList("sort", "id")))); - - List adminVoArrayList = new ArrayList<>(); - for (SystemAuthPost systemAuthPost : systemAuthPostList) { - SystemAuthPostVo vo = new SystemAuthPostVo(); - BeanUtils.copyProperties(systemAuthPost, vo); - - vo.setCreateTime(TimeUtils.timestampToDate(systemAuthPost.getCreateTime())); - vo.setUpdateTime(TimeUtils.timestampToDate(systemAuthPost.getUpdateTime())); - adminVoArrayList.add(vo); - } - - return adminVoArrayList; - } - - /** - * 岗位列表 - * - * @author fzr - * @param pageValidate 分页参数 - * @param searchValidate 搜索参数 - * @return PageResult - */ - @Override - public PageResult list(PageValidate pageValidate, SystemPostSearchValidate searchValidate) { - Integer page = pageValidate.getPageNo(); - Integer limit = pageValidate.getPageSize(); - - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.select(SystemAuthPost.class, info-> - !info.getColumn().equals("is_delete") && - !info.getColumn().equals("delete_time")) - .eq("is_delete", 0) - .orderByDesc(Arrays.asList("sort", "id")); - - systemAuthPostMapper.setSearch(queryWrapper, searchValidate, new String[]{ - "like:code:str", - "like:name:str", - "=:isStop@is_stop:int" - }); - - IPage iPage = systemAuthPostMapper.selectPage(new Page<>(page, limit), queryWrapper); - - List list = new ArrayList<>(); - for (SystemAuthPost systemAuthPost : iPage.getRecords()) { - SystemAuthPostVo vo = new SystemAuthPostVo(); - BeanUtils.copyProperties(systemAuthPost, vo); - - vo.setCreateTime(TimeUtils.timestampToDate(systemAuthPost.getCreateTime())); - vo.setUpdateTime(TimeUtils.timestampToDate(systemAuthPost.getUpdateTime())); - list.add(vo); - } - - return PageResult.iPageHandle(iPage.getTotal(), iPage.getCurrent(), iPage.getSize(), list); - } - - /** - * 岗位详情 - * - * @author fzr - * @param id 主键 - * @return SystemPostVo - */ - @Override - public SystemAuthPostVo detail(Integer id) { - SystemAuthPost systemAuthPost = systemAuthPostMapper.selectOne(new QueryWrapper() - .select(SystemAuthPost.class, info -> - !info.getColumn().equals("is_delete") && - !info.getColumn().equals("delete_time")) - .eq("id", id) - .eq("is_delete", 0) - .last("limit 1")); - - Assert.notNull(systemAuthPost, "岗位不存在"); - - SystemAuthPostVo vo = new SystemAuthPostVo(); - BeanUtils.copyProperties(systemAuthPost, vo); - vo.setCreateTime(TimeUtils.timestampToDate(systemAuthPost.getCreateTime())); - vo.setUpdateTime(TimeUtils.timestampToDate(systemAuthPost.getUpdateTime())); - - return vo; - } - - /** - * 岗位新增 - * - * @author fzr - * @param createValidate 参数 - */ - @Override - public void add(SystemPostCreateValidate createValidate) { - Assert.isNull(systemAuthPostMapper.selectOne(new QueryWrapper() - .select("id,code,name") - .nested( - wq->wq.eq("code", createValidate.getCode()) - .or() - .eq("name", createValidate.getName()) - ) - .eq("is_delete", 0) - .last("limit 1")), "该岗位已存在"); - - SystemAuthPost model = new SystemAuthPost(); - model.setCode(createValidate.getCode()); - model.setName(createValidate.getName()); - model.setSort(createValidate.getSort()); - model.setRemarks(createValidate.getRemarks()); - model.setIsStop(createValidate.getIsStop()); - model.setCreateTime(System.currentTimeMillis() / 1000); - model.setUpdateTime(System.currentTimeMillis() / 1000); - systemAuthPostMapper.insert(model); - } - - /** - * 岗位编辑 - * - * @author fzr - * @param updateValidate 参数 - */ - @Override - public void edit(SystemPostUpdateValidate updateValidate) { - SystemAuthPost model = systemAuthPostMapper.selectOne(new QueryWrapper() - .select(SystemAuthPost.class, info -> - !info.getColumn().equals("is_delete") && - !info.getColumn().equals("delete_time")) - .eq("id", updateValidate.getId()) - .eq("is_delete", 0) - .last("limit 1")); - - Assert.notNull(model, "岗位不存在"); - - Assert.isNull(systemAuthPostMapper.selectOne(new QueryWrapper() - .select("id,code,name") - .ne("id", updateValidate.getId()) - .nested( - wq->wq.eq("code", updateValidate.getCode()) - .or() - .eq("name", updateValidate.getName()) - ) - .eq("is_delete", 0) - .last("limit 1")), "该岗位已存在"); - - model.setCode(updateValidate.getCode()); - model.setName(updateValidate.getName()); - model.setSort(updateValidate.getSort()); - model.setRemarks(updateValidate.getRemarks()); - model.setIsStop(updateValidate.getIsStop()); - model.setUpdateTime(System.currentTimeMillis() / 1000); - systemAuthPostMapper.updateById(model); - } - - /** - * 岗位删除 - * - * @author fzr - * @param id 主键 - */ - @Override - public void del(Integer id) { - SystemAuthPost model = systemAuthPostMapper.selectOne(new QueryWrapper() - .select("id,code,name") - .eq("id", id) - .eq("is_delete", 0) - .last("limit 1")); - - Assert.notNull(model, "岗位不存在"); - - Admin systemAuthAdmin = systemAuthAdminMapper.selectOne(new QueryWrapper() - .select("id,nickname") - .apply("find_in_set({0}, post_ids)", id) - .eq("is_delete", 0) - .last("limit 1")); - - Assert.isNull(systemAuthAdmin, "该岗位已被管理员使用,请先移除"); - - model.setIsDelete(1); - model.setDeleteTime(System.currentTimeMillis() / 1000); - systemAuthPostMapper.updateById(model); - } - -} diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/impl/system/SystemAuthMenuServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/system/SystemMenuServiceImpl.java similarity index 77% rename from server/like-admin/src/main/java/com/mdd/admin/service/impl/system/SystemAuthMenuServiceImpl.java rename to server/like-admin/src/main/java/com/mdd/admin/service/impl/system/SystemMenuServiceImpl.java index 314fc098..1554ea49 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/impl/system/SystemAuthMenuServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/system/SystemMenuServiceImpl.java @@ -4,13 +4,13 @@ import com.alibaba.fastjson2.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Assert; import com.mdd.admin.LikeAdminThreadLocal; -import com.mdd.admin.service.system.ISystemAuthMenuService; +import com.mdd.admin.service.system.ISystemMenuService; import com.mdd.admin.service.system.ISystemAuthPermService; import com.mdd.admin.validate.system.SystemMenuCreateValidate; import com.mdd.admin.validate.system.SystemMenuUpdateValidate; import com.mdd.admin.vo.system.SystemAuthMenuVo; -import com.mdd.common.entity.system.SystemAuthMenu; -import com.mdd.common.mapper.system.SystemAuthMenuMapper; +import com.mdd.common.entity.system.SystemMenu; +import com.mdd.common.mapper.system.SystemMenuMapper; import com.mdd.common.util.ListUtils; import com.mdd.common.util.TimeUtils; import org.springframework.beans.BeanUtils; @@ -25,10 +25,10 @@ import java.util.List; * 系统菜单服务实现类 */ @Service -public class SystemAuthMenuServiceImpl implements ISystemAuthMenuService { +public class SystemMenuServiceImpl implements ISystemMenuService { @Resource - SystemAuthMenuMapper systemAuthMenuMapper; + SystemMenuMapper systemAuthMenuMapper; @Resource ISystemAuthPermService iSystemAuthPermService; @@ -45,7 +45,7 @@ public class SystemAuthMenuServiceImpl implements ISystemAuthMenuService { Integer adminId = LikeAdminThreadLocal.getAdminId(); List menuIds = iSystemAuthPermService.selectMenuIdsByRoleId(roleIds); - QueryWrapper queryWrapper = new QueryWrapper<>(); + QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.in("menu_type", Arrays.asList("M", "C")); queryWrapper.eq("is_disable", 0); queryWrapper.orderByDesc("menu_sort"); @@ -57,10 +57,10 @@ public class SystemAuthMenuServiceImpl implements ISystemAuthMenuService { queryWrapper.in("id", menuIds); } - List systemAuthMenus = systemAuthMenuMapper.selectList(queryWrapper); + List systemAuthMenus = systemAuthMenuMapper.selectList(queryWrapper); List lists = new ArrayList<>(); - for (SystemAuthMenu systemAuthMenu : systemAuthMenus) { + for (SystemMenu systemAuthMenu : systemAuthMenus) { SystemAuthMenuVo vo = new SystemAuthMenuVo(); BeanUtils.copyProperties(systemAuthMenu, vo); @@ -81,14 +81,14 @@ public class SystemAuthMenuServiceImpl implements ISystemAuthMenuService { */ @Override public JSONArray list() { - QueryWrapper queryWrapper = new QueryWrapper<>(); + QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.orderByDesc("menu_sort"); queryWrapper.orderByAsc("id"); - List systemAuthMenus = systemAuthMenuMapper.selectList(queryWrapper); + List systemAuthMenus = systemAuthMenuMapper.selectList(queryWrapper); List lists = new ArrayList<>(); - for (SystemAuthMenu systemAuthMenu : systemAuthMenus) { + for (SystemMenu systemAuthMenu : systemAuthMenus) { SystemAuthMenuVo vo = new SystemAuthMenuVo(); BeanUtils.copyProperties(systemAuthMenu, vo); @@ -110,7 +110,7 @@ public class SystemAuthMenuServiceImpl implements ISystemAuthMenuService { */ @Override public SystemAuthMenuVo detail(Integer id) { - SystemAuthMenu systemAuthMenu = systemAuthMenuMapper.selectOne(new QueryWrapper().eq("id", id)); + SystemMenu systemAuthMenu = systemAuthMenuMapper.selectOne(new QueryWrapper().eq("id", id)); Assert.notNull(systemAuthMenu, "菜单已不存在!"); SystemAuthMenuVo vo = new SystemAuthMenuVo(); @@ -129,12 +129,12 @@ public class SystemAuthMenuServiceImpl implements ISystemAuthMenuService { */ @Override public void add(SystemMenuCreateValidate createValidate) { - SystemAuthMenu model = new SystemAuthMenu(); + SystemMenu model = new SystemMenu(); model.setPid(createValidate.getPid()); - model.setMenuType(createValidate.getMenuType()); - model.setMenuName(createValidate.getMenuName()); - model.setMenuIcon(createValidate.getMenuIcon()); - model.setMenuSort(createValidate.getMenuSort()); + model.setType(createValidate.getType()); + model.setName(createValidate.getName()); + model.setIcon(createValidate.getIcon()); + model.setSort(createValidate.getSort()); model.setPerms(createValidate.getPerms()); model.setPaths(createValidate.getPaths()); model.setComponent(createValidate.getComponent()); @@ -156,13 +156,13 @@ public class SystemAuthMenuServiceImpl implements ISystemAuthMenuService { */ @Override public void edit(SystemMenuUpdateValidate updateValidate) { - SystemAuthMenu model = systemAuthMenuMapper.selectOne(new QueryWrapper().eq("id", updateValidate.getId())); + SystemMenu model = systemAuthMenuMapper.selectOne(new QueryWrapper().eq("id", updateValidate.getId())); Assert.notNull(model, "菜单已不存在!"); - model.setMenuType(updateValidate.getMenuType()); - model.setMenuName(updateValidate.getMenuName()); - model.setMenuIcon(updateValidate.getMenuIcon()); - model.setMenuSort(updateValidate.getMenuSort()); + model.setType(updateValidate.getType()); + model.setName(updateValidate.getName()); + model.setIcon(updateValidate.getIcon()); + model.setSort(updateValidate.getSort()); model.setPaths(updateValidate.getPaths()); model.setPerms(updateValidate.getPerms()); model.setComponent(updateValidate.getComponent()); @@ -184,15 +184,15 @@ public class SystemAuthMenuServiceImpl implements ISystemAuthMenuService { */ @Override public void del(Integer id) { - SystemAuthMenu model = systemAuthMenuMapper.selectOne( - new QueryWrapper() + SystemMenu model = systemAuthMenuMapper.selectOne( + new QueryWrapper() .select("id,pid,menu_name") .eq("id", id) .last("limit 1")); Assert.notNull(model, "菜单已不存在!"); Assert.isNull(systemAuthMenuMapper.selectOne( - new QueryWrapper() + new QueryWrapper() .eq("pid", id) .last("limit 1")), "请先删除子菜单再操作!"); diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/system/ISystemAuthDeptService.java b/server/like-admin/src/main/java/com/mdd/admin/service/system/ISystemAuthDeptService.java deleted file mode 100644 index f10b2e51..00000000 --- a/server/like-admin/src/main/java/com/mdd/admin/service/system/ISystemAuthDeptService.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.mdd.admin.service.system; - -import com.alibaba.fastjson2.JSONArray; -import com.mdd.admin.validate.system.SystemDeptCreateValidate; -import com.mdd.admin.validate.system.SystemDeptSearchValidate; -import com.mdd.admin.validate.system.SystemDeptUpdateValidate; -import com.mdd.admin.vo.system.SystemAuthDeptVo; - -import java.util.List; - -/** - * 系统部门服务接口类 - */ -public interface ISystemAuthDeptService { - - /** - * 部门所有 - * - * @author fzr - * @return List - */ - List all(); - - /** - * 部门列表 - * - * @author fzr - * @param searchValidate 搜索参数 - * @return JSONArray - */ - JSONArray list(SystemDeptSearchValidate searchValidate); - - /** - * 部门详情 - * - * @author fzr - * @param id 主键 - * @return SysMenu - */ - SystemAuthDeptVo detail(Integer id); - - /** - * 部门新增 - * - * @author fzr - * @param createValidate 参数 - */ - void add(SystemDeptCreateValidate createValidate); - - /** - * 部门编辑 - * - * @author fzr - * @param updateValidate 参数 - */ - void edit(SystemDeptUpdateValidate updateValidate); - - /** - * 部门删除 - * - * @author fzr - * @param id 主键 - */ - void del(Integer id); - -} diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/system/ISystemAuthPostService.java b/server/like-admin/src/main/java/com/mdd/admin/service/system/ISystemAuthPostService.java deleted file mode 100644 index c7f1cab1..00000000 --- a/server/like-admin/src/main/java/com/mdd/admin/service/system/ISystemAuthPostService.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.mdd.admin.service.system; - -import com.mdd.admin.validate.commons.PageValidate; -import com.mdd.admin.validate.system.SystemPostCreateValidate; -import com.mdd.admin.validate.system.SystemPostSearchValidate; -import com.mdd.admin.validate.system.SystemPostUpdateValidate; -import com.mdd.admin.vo.system.SystemAuthPostVo; -import com.mdd.common.core.PageResult; - -import java.util.List; -import java.util.Map; - -/** - * 系统岗位服务接口类 - */ -public interface ISystemAuthPostService { - - /** - * 岗位所有 - * - * @author fzr - * @return List - */ - List all(); - - /** - * 岗位列表 - * - * @author fzr - * @param pageValidate 分页参数 - * @param searchValidate 搜索参数 - * @return PageResult - */ - PageResult list(PageValidate pageValidate, SystemPostSearchValidate searchValidate); - - /** - * 岗位详情 - * - * @author fzr - * @param id 主键 - * @return SystemPostVo - */ - SystemAuthPostVo detail(Integer id); - - /** - * 岗位新增 - * - * @author fzr - * @param createValidate 参数 - */ - void add(SystemPostCreateValidate createValidate); - - /** - * 岗位编辑 - * - * @author fzr - * @param updateValidate 参数 - */ - void edit(SystemPostUpdateValidate updateValidate); - - /** - * 岗位删除 - * - * @author fzr - * @param id 主键 - */ - void del(Integer id); - -} diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/system/ISystemAuthMenuService.java b/server/like-admin/src/main/java/com/mdd/admin/service/system/ISystemMenuService.java similarity index 96% rename from server/like-admin/src/main/java/com/mdd/admin/service/system/ISystemAuthMenuService.java rename to server/like-admin/src/main/java/com/mdd/admin/service/system/ISystemMenuService.java index c76ed5bf..e00c2d44 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/system/ISystemAuthMenuService.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/system/ISystemMenuService.java @@ -10,7 +10,7 @@ import java.util.List; /** * 系统菜单服务接口类 */ -public interface ISystemAuthMenuService { +public interface ISystemMenuService { /** * 根据角色获取菜单 diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemMenuCreateValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemMenuCreateValidate.java index 765008ba..bb93ff34 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemMenuCreateValidate.java +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemMenuCreateValidate.java @@ -25,21 +25,21 @@ public class SystemMenuCreateValidate implements Serializable { @NotNull(message = "menuType参数缺失") @StringContains(values = {"M", "C", "A"}, message = "菜单类型不是合法值(M,C,A)") @ApiModelProperty(value = "菜单类型", required = true) - private String menuType; + private String type; @NotNull(message = "缺少参数menuName") @Length(min = 1, max = 30, message = "菜单名称必须在1~30个字符内") @ApiModelProperty(value = "菜单名称", required = true) - private String menuName; + private String name; @Length(max = 100, message = "图标名称不能超过100个字符") @ApiModelProperty(value = "菜单图标") - private String menuIcon; + private String icon; @NotNull(message = "排序号不能为空") @DecimalMin(value = "0", message = "排序号值不能少于0") @ApiModelProperty(value = "菜单排序") - private Integer menuSort; + private Integer sort; @Length(max = 100, message = "权限字符不能超过100个字符") @ApiModelProperty(value = "权限字符") diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemMenuUpdateValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemMenuUpdateValidate.java index 4417afb7..fb98a253 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemMenuUpdateValidate.java +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemMenuUpdateValidate.java @@ -30,21 +30,21 @@ public class SystemMenuUpdateValidate implements Serializable { @NotNull(message = "menuType参数缺失") @StringContains(values = {"M", "C", "A"}, message = "菜单类型不是合法值(M,C,A)") @ApiModelProperty(value = "菜单类型", required = true) - private String menuType; + private String type; @NotNull(message = "缺少参数menuName") @Length(min = 1, max = 30, message = "菜单名称必须在1~30个字符内") @ApiModelProperty(value = "菜单名称", required = true) - private String menuName; + private String name; @Length(max = 100, message = "图标名称不能超过100个字符") @ApiModelProperty(value = "菜单图标") - private String menuIcon; + private String icon; @NotNull(message = "排序号不能为空") @DecimalMin(value = "0", message = "排序号值不能少于0") @ApiModelProperty(value = "菜单排序") - private Integer menuSort; + private Integer sort; @Length(max = 100, message = "权限字符不能超过100个字符") @ApiModelProperty(value = "权限字符") diff --git a/server/like-admin/src/main/java/com/mdd/admin/vo/auth/AdminMySelfVo.java b/server/like-admin/src/main/java/com/mdd/admin/vo/auth/AdminMySelfVo.java index 798b8b5a..9e08c01f 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/vo/auth/AdminMySelfVo.java +++ b/server/like-admin/src/main/java/com/mdd/admin/vo/auth/AdminMySelfVo.java @@ -10,7 +10,7 @@ import java.io.Serializable; import java.util.List; @Data -@ApiModel("相册分类Vo") +@ApiModel("adminVo") public class AdminMySelfVo implements Serializable { private static final long serialVersionUID = 1L; @@ -22,5 +22,5 @@ public class AdminMySelfVo implements Serializable { private List permissions; @ApiModelProperty(value = "user") - private JSONObject user; + private AuthMySelfVo user; } diff --git a/server/like-admin/src/main/java/com/mdd/admin/vo/auth/AuthMySelfVo.java b/server/like-admin/src/main/java/com/mdd/admin/vo/auth/AuthMySelfVo.java new file mode 100644 index 00000000..5ade977f --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/vo/auth/AuthMySelfVo.java @@ -0,0 +1,46 @@ +package com.mdd.admin.vo.auth; + +import com.alibaba.fastjson2.JSONArray; +import com.alibaba.fastjson2.JSONObject; +import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ApiModel("管理员") +public class AuthMySelfVo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Integer id; + @ApiModelProperty(value = "账号") + private String account; + + @ApiModelProperty(value = "用户头像") + private String avatar; + @ApiModelProperty(value = "部门关联ID") + @JsonProperty(value = "dept_id") + private List deptId; + @ApiModelProperty(value = "当前管理员角色拥有的菜单") + private Integer disable; + @ApiModelProperty(value = "当前管理员角色拥有的菜单") + @JsonProperty(value = "jobs_id") + private List jobsId; + + @ApiModelProperty(value = "当前管理员角色拥有的菜单") + @JsonProperty(value = "multipoint_login") + private Integer multipointLogin; + @ApiModelProperty(value = "当前管理员角色拥有的菜单") + private String name; + + @ApiModelProperty(value = "当前管理员角色拥有的菜单") + @JsonProperty(value = "role_id") + private List roleId; + + @ApiModelProperty(value = "当前管理员角色拥有的菜单") + private Integer root; +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/vo/system/SystemAuthAdminDetailVo.java b/server/like-admin/src/main/java/com/mdd/admin/vo/system/SystemAuthAdminDetailVo.java index 58890510..31c379fd 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/vo/system/SystemAuthAdminDetailVo.java +++ b/server/like-admin/src/main/java/com/mdd/admin/vo/system/SystemAuthAdminDetailVo.java @@ -16,6 +16,9 @@ public class SystemAuthAdminDetailVo implements Serializable { @ApiModelProperty(value = "主键") private Integer id; + @ApiModelProperty(value = "是否超级管理员 0-否 1-是") + private Integer root; + @ApiModelProperty(value = "角色ID") private List roleIds; @@ -23,28 +26,25 @@ public class SystemAuthAdminDetailVo implements Serializable { private List deptIds; @ApiModelProperty(value = "岗位ID") - private List postIds; + private List jobIds; @ApiModelProperty(value = "账号") - private String username; + private String account; @ApiModelProperty(value = "昵称") - private String nickname; + private String name; @ApiModelProperty(value = "头像") private String avatar; - @ApiModelProperty(value = "多端登录: [0=否, 1=是]") - private Integer isMultipoint; - @ApiModelProperty(value = "是否禁用: [0=否, 1=是]") - private Integer isDisable; + private Integer disable; @ApiModelProperty(value = "最后登录IP") - private String lastLoginIp; + private String loginIp; @ApiModelProperty(value = "最后登录时间") - private String lastLoginTime; + private String loginTime; @ApiModelProperty(value = "创建时间") private String createTime; @@ -52,4 +52,7 @@ public class SystemAuthAdminDetailVo implements Serializable { @ApiModelProperty(value = "更新时间") private String updateTime; + @ApiModelProperty(value = "是否支持多处登录：1-是；0-否；") + private Integer multipointLogin; + } diff --git a/server/like-admin/src/main/resources/application.yml b/server/like-admin/src/main/resources/application.yml index 0e3bc084..2471ff7a 100644 --- a/server/like-admin/src/main/resources/application.yml +++ b/server/like-admin/src/main/resources/application.yml @@ -66,7 +66,8 @@ spring: max-active: 100 # 连接池最大连接数(使用负数表示没有限制,默认8) max-idle: 20 # 连接池中的最大空闲连接(默认8) min-idle: 0 # 连接池中的最小空闲连接(默认0) - + main: + allow-circular-references: true # Mybatis-plus配置 mybatis-plus: mapper-locations: classpath*:/mapper/**Mapper.xml diff --git a/server/like-common/src/main/java/com/mdd/common/entity/admin/AdminDept.java b/server/like-common/src/main/java/com/mdd/common/entity/admin/AdminDept.java new file mode 100644 index 00000000..11bef926 --- /dev/null +++ b/server/like-common/src/main/java/com/mdd/common/entity/admin/AdminDept.java @@ -0,0 +1,22 @@ +package com.mdd.common.entity.admin; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel("部门关联表实体") +public class AdminDept implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("管理员id") + private Integer adminId; + + @ApiModelProperty("部门id") + private Integer deptId; + + +} diff --git a/server/like-common/src/main/java/com/mdd/common/entity/admin/AdminJobs.java b/server/like-common/src/main/java/com/mdd/common/entity/admin/AdminJobs.java new file mode 100644 index 00000000..644c1014 --- /dev/null +++ b/server/like-common/src/main/java/com/mdd/common/entity/admin/AdminJobs.java @@ -0,0 +1,22 @@ +package com.mdd.common.entity.admin; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel("岗位关联表实体") +public class AdminJobs implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("管理员id") + private Integer adminId; + + @ApiModelProperty("岗位id") + private Integer jobsId; + + +} diff --git a/server/like-common/src/main/java/com/mdd/common/entity/system/SystemAuthDept.java b/server/like-common/src/main/java/com/mdd/common/entity/system/SystemAuthDept.java deleted file mode 100644 index 4ff0d060..00000000 --- a/server/like-common/src/main/java/com/mdd/common/entity/system/SystemAuthDept.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.mdd.common.entity.system; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel("系统岗位实体") -public class SystemAuthDept implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId(value="id", type= IdType.AUTO) - @ApiModelProperty("ID") - private Integer id; - - @ApiModelProperty("上级部门") - private Integer pid; - - @ApiModelProperty("部门名称") - private String name; - - @ApiModelProperty("负责人名") - private String duty; - - @ApiModelProperty("联系电话") - private String mobile; - - @ApiModelProperty("排序编号") - private Integer sort; - - @ApiModelProperty("是否禁用: [0=否, 1=是]") - private Integer isStop; - - @ApiModelProperty("是否删除: [0=否, 1=是]") - private Integer isDelete; - - @ApiModelProperty("创建时间") - private Long createTime; - - @ApiModelProperty("更新时间") - private Long updateTime; - - @ApiModelProperty("删除时间") - private Long deleteTime; - -} diff --git a/server/like-common/src/main/java/com/mdd/common/entity/system/SystemAuthPost.java b/server/like-common/src/main/java/com/mdd/common/entity/system/SystemAuthPost.java deleted file mode 100644 index 5142fc1f..00000000 --- a/server/like-common/src/main/java/com/mdd/common/entity/system/SystemAuthPost.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.mdd.common.entity.system; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel("系统岗位管理") -public class SystemAuthPost implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId(value="id", type= IdType.AUTO) - @ApiModelProperty("ID") - private Integer id; - - @ApiModelProperty("岗位编码") - private String code; - - @ApiModelProperty("岗位名称") - private String name; - - @ApiModelProperty("岗位备注") - private String remarks; - - @ApiModelProperty("岗位排序") - private Integer sort; - - @ApiModelProperty("是否停用: [0=否, 1=是]") - private Integer isStop; - - @ApiModelProperty("是否删除: [0=否, 1=是]") - private Integer isDelete; - - @ApiModelProperty("创建时间") - private Long createTime; - - @ApiModelProperty("更新时间") - private Long updateTime; - - @ApiModelProperty("删除时间") - private Long deleteTime; - -} diff --git a/server/like-common/src/main/java/com/mdd/common/entity/system/SystemAuthMenu.java b/server/like-common/src/main/java/com/mdd/common/entity/system/SystemMenu.java similarity index 89% rename from server/like-common/src/main/java/com/mdd/common/entity/system/SystemAuthMenu.java rename to server/like-common/src/main/java/com/mdd/common/entity/system/SystemMenu.java index cb93647a..6f4eff7a 100644 --- a/server/like-common/src/main/java/com/mdd/common/entity/system/SystemAuthMenu.java +++ b/server/like-common/src/main/java/com/mdd/common/entity/system/SystemMenu.java @@ -10,7 +10,7 @@ import java.io.Serializable; @Data @ApiModel("系统菜单实体") -public class SystemAuthMenu implements Serializable { +public class SystemMenu implements Serializable { private static final long serialVersionUID = 1L; @@ -22,16 +22,16 @@ public class SystemAuthMenu implements Serializable { private Integer pid; @ApiModelProperty("权限类型: [M=目录, C=菜单, A=按钮]") - private String menuType; + private String type; @ApiModelProperty("菜单名称") - private String menuName; + private String name; @ApiModelProperty("菜单图标") - private String menuIcon; + private String icon; @ApiModelProperty("菜单排序") - private Integer menuSort; + private Integer sort; @ApiModelProperty("权限标识") private String perms; diff --git a/server/like-common/src/main/java/com/mdd/common/mapper/admin/AdminDeptMapper.java b/server/like-common/src/main/java/com/mdd/common/mapper/admin/AdminDeptMapper.java new file mode 100644 index 00000000..4bcfb194 --- /dev/null +++ b/server/like-common/src/main/java/com/mdd/common/mapper/admin/AdminDeptMapper.java @@ -0,0 +1,14 @@ +package com.mdd.common.mapper.admin; + +import com.mdd.common.core.basics.IBaseMapper; +import com.mdd.common.entity.admin.AdminDept; +import com.mdd.common.entity.admin.AdminRole; +import org.apache.ibatis.annotations.Mapper; + +/** + * 角色关联表Mapper + */ +@Mapper +public interface AdminDeptMapper extends IBaseMapper { + +} diff --git a/server/like-common/src/main/java/com/mdd/common/mapper/admin/AdminJobsMapper.java b/server/like-common/src/main/java/com/mdd/common/mapper/admin/AdminJobsMapper.java new file mode 100644 index 00000000..ee00e0af --- /dev/null +++ b/server/like-common/src/main/java/com/mdd/common/mapper/admin/AdminJobsMapper.java @@ -0,0 +1,14 @@ +package com.mdd.common.mapper.admin; + +import com.mdd.common.core.basics.IBaseMapper; +import com.mdd.common.entity.admin.AdminJobs; +import com.mdd.common.entity.admin.AdminRole; +import org.apache.ibatis.annotations.Mapper; + +/** + * 角色关联表Mapper + */ +@Mapper +public interface AdminJobsMapper extends IBaseMapper { + +} diff --git a/server/like-common/src/main/java/com/mdd/common/mapper/system/SystemAuthDeptMapper.java b/server/like-common/src/main/java/com/mdd/common/mapper/system/SystemAuthDeptMapper.java deleted file mode 100644 index 68e8dcc4..00000000 --- a/server/like-common/src/main/java/com/mdd/common/mapper/system/SystemAuthDeptMapper.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.mdd.common.mapper.system; - -import com.mdd.common.core.basics.IBaseMapper; -import com.mdd.common.entity.system.SystemAuthDept; -import org.apache.ibatis.annotations.Mapper; - -/** - * 系统岗位Mapper - */ -@Mapper -public interface SystemAuthDeptMapper extends IBaseMapper { -} diff --git a/server/like-common/src/main/java/com/mdd/common/mapper/system/SystemAuthPostMapper.java b/server/like-common/src/main/java/com/mdd/common/mapper/system/SystemAuthPostMapper.java deleted file mode 100644 index c52afd7a..00000000 --- a/server/like-common/src/main/java/com/mdd/common/mapper/system/SystemAuthPostMapper.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.mdd.common.mapper.system; - -import com.mdd.common.core.basics.IBaseMapper; -import com.mdd.common.entity.system.SystemAuthPost; -import org.apache.ibatis.annotations.Mapper; - -/** - * 系统岗位Mapper - */ -@Mapper -public interface SystemAuthPostMapper extends IBaseMapper { -} diff --git a/server/like-common/src/main/java/com/mdd/common/mapper/system/SystemAuthMenuMapper.java b/server/like-common/src/main/java/com/mdd/common/mapper/system/SystemMenuMapper.java similarity index 57% rename from server/like-common/src/main/java/com/mdd/common/mapper/system/SystemAuthMenuMapper.java rename to server/like-common/src/main/java/com/mdd/common/mapper/system/SystemMenuMapper.java index 61b7bd7b..77588c39 100644 --- a/server/like-common/src/main/java/com/mdd/common/mapper/system/SystemAuthMenuMapper.java +++ b/server/like-common/src/main/java/com/mdd/common/mapper/system/SystemMenuMapper.java @@ -1,12 +1,12 @@ package com.mdd.common.mapper.system; import com.mdd.common.core.basics.IBaseMapper; -import com.mdd.common.entity.system.SystemAuthMenu; +import com.mdd.common.entity.system.SystemMenu; import org.apache.ibatis.annotations.Mapper; /** * 系统菜单Mapper */ @Mapper -public interface SystemAuthMenuMapper extends IBaseMapper { +public interface SystemMenuMapper extends IBaseMapper { } diff --git a/server/like-generator/src/main/java/com/mdd/generator/service/impl/GenerateServiceImpl.java b/server/like-generator/src/main/java/com/mdd/generator/service/impl/GenerateServiceImpl.java index 4b8b5528..d286d299 100644 --- a/server/like-generator/src/main/java/com/mdd/generator/service/impl/GenerateServiceImpl.java +++ b/server/like-generator/src/main/java/com/mdd/generator/service/impl/GenerateServiceImpl.java @@ -7,9 +7,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.pagehelper.PageHelper; import com.mdd.common.core.PageResult; -import com.mdd.common.entity.system.SystemAuthMenu; +import com.mdd.common.entity.system.SystemMenu; import com.mdd.common.exception.OperateException; -import com.mdd.common.mapper.system.SystemAuthMenuMapper; +import com.mdd.common.mapper.system.SystemMenuMapper; import com.mdd.common.util.StringUtils; import com.mdd.common.util.TimeUtils; import com.mdd.generator.constant.GenConstants; @@ -63,7 +63,7 @@ public class GenerateServiceImpl implements IGenerateService { GenTableColumnMapper genTableColumnMapper; @Resource - SystemAuthMenuMapper systemAuthMenuMapper; + SystemMenuMapper systemAuthMenuMapper; /** * 库列表 @@ -548,14 +548,14 @@ public class GenerateServiceImpl implements IGenerateService { */ private void genAutoMenu(GenTable table) { if (table.getMenuStatus().equals(1)) { - SystemAuthMenu authMenu = new SystemAuthMenu(); + SystemMenu authMenu = new SystemMenu(); authMenu.setPid(table.getMenuPid()); - authMenu.setMenuType("C"); - authMenu.setMenuName(table.getMenuName()); + authMenu.setType("C"); + authMenu.setName(table.getMenuName()); authMenu.setPaths(table.getModuleName()); authMenu.setPerms(table.getModuleName() + ":list"); authMenu.setComponent(table.getModuleName() + "/index"); - authMenu.setMenuName(table.getMenuName()); + authMenu.setName(table.getMenuName()); authMenu.setCreateTime(System.currentTimeMillis() / 1000); authMenu.setUpdateTime(System.currentTimeMillis() / 1000); systemAuthMenuMapper.insert(authMenu); @@ -576,11 +576,11 @@ public class GenerateServiceImpl implements IGenerateService { menuName = "删除"; } String perms = table.getModuleName() + ":" + op; - SystemAuthMenu systemAuthMenu = new SystemAuthMenu(); + SystemMenu systemAuthMenu = new SystemMenu(); systemAuthMenu.setPid(authMenu.getId()); - systemAuthMenu.setMenuType("A"); + systemAuthMenu.setType("A"); systemAuthMenu.setPerms(perms); - systemAuthMenu.setMenuName(table.getMenuName() + menuName); + systemAuthMenu.setName(table.getMenuName() + menuName); systemAuthMenu.setCreateTime(System.currentTimeMillis() / 1000); systemAuthMenu.setUpdateTime(System.currentTimeMillis() / 1000); systemAuthMenuMapper.insert(systemAuthMenu);