lywsvip/likeadmin_java
1
0
Fork 0
mirror of https://gitee.com/likeadmin/likeadmin_java.git synced 2026-05-08 08:07:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化代码

Browse Source
This commit is contained in:
TinyAnts
2022-08-09 10:46:31 +08:00
parent cc4ba32145
commit 091bf299e5
55 changed files with 1048 additions and 1061 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/like-admin/src/main/java/com/hxkj/admin/LikeAdminInterceptor.java
View File

@@ -3,8 +3,8 @@ package com.hxkj.admin;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.hxkj.admin.config.AdminConfig;
import com.hxkj.admin.service.system.ISystemAdminService;
import com.hxkj.admin.service.system.ISystemRoleMenuService;
import com.hxkj.admin.service.system.ISystemAuthAdminService;
import com.hxkj.admin.service.system.ISystemAuthPermService;
import com.hxkj.common.core.AjaxResult;
import com.hxkj.common.enums.HttpEnum;
import com.hxkj.common.utils.RedisUtil;
@@ -27,10 +27,10 @@ import java.util.Map;
public class LikeAdminInterceptor implements HandlerInterceptor {
@Resource
ISystemAdminService iSystemAdminService;
ISystemAuthAdminService iSystemAuthAdminService;
@Resource
ISystemRoleMenuService iSystemRoleMenuService;
ISystemAuthPermService iSystemAuthPermService;
@Override
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
@@ -77,7 +77,7 @@ public class LikeAdminInterceptor implements HandlerInterceptor {
// 用户信息缓存
String uid = RedisUtil.get(token).toString();
if (!RedisUtil.hExists(AdminConfig.backstageManageKey, uid)) {
iSystemAdminService.cacheAdminUserByUid(Integer.parseInt(uid));
iSystemAuthAdminService.cacheAdminUserByUid(Integer.parseInt(uid));
}
// 校验用户被删除
@@ -117,7 +117,7 @@ public class LikeAdminInterceptor implements HandlerInterceptor {
// 校验角色权限是否存在
String roleId = map.get("role");
if (!RedisUtil.hExists(AdminConfig.backstageRolesKey, roleId)) {
iSystemRoleMenuService.cacheRoleMenusByRoleId(Integer.parseInt(roleId));
iSystemAuthPermService.cacheRoleMenusByRoleId(Integer.parseInt(roleId));
}
// 验证是否有权限操作

26
server/like-admin/src/main/java/com/hxkj/admin/controller/article/ArticleController.java
View File

@@ -2,7 +2,7 @@ package com.hxkj.admin.controller.article;
import com.hxkj.admin.config.aop.Log;
import com.hxkj.admin.service.article.IArticleArchivesService;
import com.hxkj.admin.validate.article.ArticleTextParam;
import com.hxkj.admin.validate.article.ArticleArchivesParam;
import com.hxkj.admin.validate.common.PageParam;
import com.hxkj.admin.vo.common.article.ArticleDetailVo;
import com.hxkj.admin.vo.common.article.ArticleListVo;
@@ -57,15 +57,15 @@ public class ArticleController {
* 文章新增
*
* @author fzr
* @param articleTextParam 文章参数
* @param articleArchivesParam 文章参数
* @return Object
*/
@Log(title = "文章新增")
@PostMapping("/add")
public Object add(
@Validated(value = ArticleTextParam.create.class)
@RequestBody ArticleTextParam articleTextParam) {
iArticleArchivesService.add(articleTextParam);
@Validated(value = ArticleArchivesParam.create.class)
@RequestBody ArticleArchivesParam articleArchivesParam) {
iArticleArchivesService.add(articleArchivesParam);
return AjaxResult.success();
}
@@ -73,14 +73,14 @@ public class ArticleController {
* 文章编辑
*
* @author fzr
* @param articleTextParam 文章参数
* @param articleArchivesParam 文章参数
* @return Object
*/
@Log(title = "文章编辑")
@PostMapping("/edit")
public Object edit(@Validated(value = ArticleTextParam.update.class)
@RequestBody ArticleTextParam articleTextParam) {
iArticleArchivesService.edit(articleTextParam);
public Object edit(@Validated(value = ArticleArchivesParam.update.class)
@RequestBody ArticleArchivesParam articleArchivesParam) {
iArticleArchivesService.edit(articleArchivesParam);
return AjaxResult.success();
}
@@ -88,14 +88,14 @@ public class ArticleController {
* 文章删除
*
* @author fzr
* @param articleTextParam 文章参数
* @param articleArchivesParam 文章参数
* @return Object
*/
@Log(title = "文章删除")
@PostMapping("/del")
public Object del(@Validated(value = ArticleTextParam.delete.class)
@RequestBody ArticleTextParam articleTextParam) {
iArticleArchivesService.del(articleTextParam.getId());
public Object del(@Validated(value = ArticleArchivesParam.delete.class)
@RequestBody ArticleArchivesParam articleArchivesParam) {
iArticleArchivesService.del(articleArchivesParam.getId());
return AjaxResult.success();
}

26
server/like-admin/src/main/java/com/hxkj/admin/controller/article/CategoryController.java
View File

@@ -2,7 +2,7 @@ package com.hxkj.admin.controller.article;
import com.hxkj.admin.config.aop.Log;
import com.hxkj.admin.service.article.IArticleCategoryService;
import com.hxkj.admin.validate.article.ArticleCateParam;
import com.hxkj.admin.validate.article.ArticleCategoryParam;
import com.hxkj.admin.validate.common.PageParam;
import com.hxkj.admin.vo.common.article.ArticleCateVo;
import com.hxkj.common.core.AjaxResult;
@@ -69,14 +69,14 @@ public class CategoryController {
* 分类新增
*
* @author fzr
* @param articleCateParam 分类参数
* @param articleCategoryParam 分类参数
* @return Object
*/
@Log(title = "文章分类新增")
@PostMapping("/add")
public Object add(@Validated(value = ArticleCateParam.create.class)
@RequestBody ArticleCateParam articleCateParam) {
iArticleCategoryService.add(articleCateParam);
public Object add(@Validated(value = ArticleCategoryParam.create.class)
@RequestBody ArticleCategoryParam articleCategoryParam) {
iArticleCategoryService.add(articleCategoryParam);
return AjaxResult.success();
}
@@ -84,14 +84,14 @@ public class CategoryController {
* 分类编辑
*
* @author fzr
* @param articleCateParam 分类编辑
* @param articleCategoryParam 分类编辑
* @return Object
*/
@Log(title = "文章分类编辑")
@PostMapping("/edit")
public Object edit(@Validated(value = ArticleCateParam.update.class)
@RequestBody ArticleCateParam articleCateParam) {
iArticleCategoryService.edit(articleCateParam);
public Object edit(@Validated(value = ArticleCategoryParam.update.class)
@RequestBody ArticleCategoryParam articleCategoryParam) {
iArticleCategoryService.edit(articleCategoryParam);
return AjaxResult.success();
}
@@ -99,14 +99,14 @@ public class CategoryController {
* 分类删除
*
* @author fzr
* @param articleCateParam 分类删除
* @param articleCategoryParam 分类删除
* @return Object
*/
@Log(title = "文章分类删除")
@PostMapping("/cateDel")
public Object del(@Validated(value = ArticleCateParam.delete.class)
@RequestBody ArticleCateParam articleCateParam) {
iArticleCategoryService.del(articleCateParam.getId());
public Object del(@Validated(value = ArticleCategoryParam.delete.class)
@RequestBody ArticleCategoryParam articleCategoryParam) {
iArticleCategoryService.del(articleCategoryParam.getId());
return AjaxResult.success();
}

2
server/like-admin/src/main/java/com/hxkj/admin/controller/monitor/CacheController.java
View File

@@ -17,7 +17,7 @@ import java.util.*;
/**
* 缓存监控管理
*/
@RestController
@RestController(value = "monitorCacheController")
@RequestMapping("api/monitor")
public class CacheController {

2
server/like-admin/src/main/java/com/hxkj/admin/controller/monitor/ServerController.java
View File

@@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.RestController;
/**
* 服务监控管理
*/
@RestController
@RestController(value = "monitorServerController")
@RequestMapping("api/monitor")
public class ServerController {
/**

38
server/like-admin/src/main/java/com/hxkj/admin/controller/system/AdminController.java → server/like-admin/src/main/java/com/hxkj/admin/controller/system/AuthAdminController.java
View File

@@ -2,9 +2,9 @@ package com.hxkj.admin.controller.system;
import com.hxkj.admin.LikeAdminThreadLocal;
import com.hxkj.admin.config.aop.Log;
import com.hxkj.admin.service.system.ISystemAdminService;
import com.hxkj.admin.service.system.ISystemAuthAdminService;
import com.hxkj.admin.validate.common.PageParam;
import com.hxkj.admin.validate.system.SystemAdminParam;
import com.hxkj.admin.validate.system.SystemAuthAdminParam;
import com.hxkj.admin.vo.system.SystemAdminVo;
import com.hxkj.admin.vo.system.SystemSelfVo;
import com.hxkj.common.core.AjaxResult;
@@ -21,10 +21,10 @@ import java.util.Map;
*/
@RestController
@RequestMapping("api/system/admin")
public class AdminController {
public class AuthAdminController {
@Resource
ISystemAdminService iSystemAdminService;
ISystemAuthAdminService iSystemAuthAdminService;
/**
* 管理员列表
@@ -35,7 +35,7 @@ public class AdminController {
@GetMapping("/list")
public Object list(@Validated PageParam pageParam,
@RequestParam Map<String, String> params) {
PageResult<SystemAdminVo> list = iSystemAdminService.list(pageParam, params);
PageResult<SystemAdminVo> list = iSystemAuthAdminService.list(pageParam, params);
return AjaxResult.success(list);
}
@@ -48,7 +48,7 @@ public class AdminController {
@GetMapping("/self")
public Object self() {
Integer adminId = LikeAdminThreadLocal.getAdminId();
SystemSelfVo vo = iSystemAdminService.self(adminId);
SystemSelfVo vo = iSystemAuthAdminService.self(adminId);
return AjaxResult.success(vo);
}
@@ -61,7 +61,7 @@ public class AdminController {
*/
@GetMapping("/detail")
public Object detail(@Validated @IDMust() @RequestParam("id") Integer id) {
SystemAdminVo vo = iSystemAdminService.detail(id);
SystemAdminVo vo = iSystemAuthAdminService.detail(id);
return AjaxResult.success(vo);
}
@@ -69,13 +69,13 @@ public class AdminController {
* 管理员新增
*
* @author fzr
* @param systemAdminParam 参数
* @param systemAuthAdminParam 参数
* @return Object
*/
@Log(title = "管理员新增")
@PostMapping("/add")
public Object add(@Validated(value = SystemAdminParam.create.class) @RequestBody SystemAdminParam systemAdminParam) {
iSystemAdminService.add(systemAdminParam);
public Object add(@Validated(value = SystemAuthAdminParam.create.class) @RequestBody SystemAuthAdminParam systemAuthAdminParam) {
iSystemAuthAdminService.add(systemAuthAdminParam);
return AjaxResult.success();
}
@@ -83,13 +83,13 @@ public class AdminController {
* 管理员编辑
*
* @author fzr
* @param systemAdminParam 参数
* @param systemAuthAdminParam 参数
* @return Object
*/
@Log(title = "管理员编辑")
@PostMapping("/edit")
public Object edit(@Validated(value = SystemAdminParam.update.class) @RequestBody SystemAdminParam systemAdminParam) {
iSystemAdminService.edit(systemAdminParam);
public Object edit(@Validated(value = SystemAuthAdminParam.update.class) @RequestBody SystemAuthAdminParam systemAuthAdminParam) {
iSystemAuthAdminService.edit(systemAuthAdminParam);
return AjaxResult.success();
}
@@ -101,9 +101,9 @@ public class AdminController {
*/
@Log(title = "管理员更新")
@PostMapping("/upInfo")
public Object upInfo(@Validated(value = SystemAdminParam.upInfo.class) @RequestBody SystemAdminParam systemAdminParam) {
public Object upInfo(@Validated(value = SystemAuthAdminParam.upInfo.class) @RequestBody SystemAuthAdminParam systemAuthAdminParam) {
Integer adminId = LikeAdminThreadLocal.getAdminId();
iSystemAdminService.upInfo(systemAdminParam, adminId);
iSystemAuthAdminService.upInfo(systemAuthAdminParam, adminId);
return AjaxResult.success();
}
@@ -115,8 +115,8 @@ public class AdminController {
*/
@Log(title = "管理员删除")
@PostMapping("/del")
public Object del(@Validated(value = SystemAdminParam.delete.class) @RequestBody SystemAdminParam systemAdminParam) {
iSystemAdminService.del(systemAdminParam.getId());
public Object del(@Validated(value = SystemAuthAdminParam.delete.class) @RequestBody SystemAuthAdminParam systemAuthAdminParam) {
iSystemAuthAdminService.del(systemAuthAdminParam.getId());
return AjaxResult.success();
}
@@ -128,8 +128,8 @@ public class AdminController {
*/
@Log(title = "管理员状态切换")
@PostMapping("/disable")
public Object disable(@Validated(value = SystemAdminParam.delete.class) @RequestBody SystemAdminParam systemAdminParam) {
iSystemAdminService.disable(systemAdminParam.getId());
public Object disable(@Validated(value = SystemAuthAdminParam.delete.class) @RequestBody SystemAuthAdminParam systemAuthAdminParam) {
iSystemAuthAdminService.disable(systemAuthAdminParam.getId());
return AjaxResult.success();
}

32
server/like-admin/src/main/java/com/hxkj/admin/controller/system/DeptController.java → server/like-admin/src/main/java/com/hxkj/admin/controller/system/AuthDeptController.java
View File

@@ -1,8 +1,8 @@
package com.hxkj.admin.controller.system;
import com.alibaba.fastjson.JSONArray;
import com.hxkj.admin.service.system.ISystemDeptService;
import com.hxkj.admin.validate.system.SystemDeptParam;
import com.hxkj.admin.service.system.ISystemAuthDeptService;
import com.hxkj.admin.validate.system.SystemAuthDeptParam;
import com.hxkj.admin.vo.system.SystemDeptVo;
import com.hxkj.common.core.AjaxResult;
import com.hxkj.common.validator.annotation.IDMust;
@@ -18,10 +18,10 @@ import java.util.Map;
*/
@RestController
@RequestMapping("api/system/dept")
public class DeptController {
public class AuthDeptController {
@Resource
ISystemDeptService iSystemDeptService;
ISystemAuthDeptService iSystemAuthDeptService;
/**
* 部门所有
@@ -31,7 +31,7 @@ public class DeptController {
*/
@GetMapping("/all")
public Object all() {
List<SystemDeptVo> vos = iSystemDeptService.all();
List<SystemDeptVo> vos = iSystemAuthDeptService.all();
return AjaxResult.success(vos);
}
@@ -43,7 +43,7 @@ public class DeptController {
*/
@GetMapping("/list")
public Object list(@RequestParam Map<String, String> params) {
JSONArray list = iSystemDeptService.list(params);
JSONArray list = iSystemAuthDeptService.list(params);
return AjaxResult.success(list);
}
@@ -56,7 +56,7 @@ public class DeptController {
*/
@GetMapping("/detail")
public Object detail(@Validated @IDMust() @RequestParam("id") Integer id) {
SystemDeptVo vo = iSystemDeptService.detail(id);
SystemDeptVo vo = iSystemAuthDeptService.detail(id);
return AjaxResult.success(vo);
}
@@ -64,12 +64,12 @@ public class DeptController {
* 部门新增
*
* @author fzr
* @param systemDeptParam 参数
* @param systemAuthDeptParam 参数
* @return Object
*/
@PostMapping("/add")
public Object add(@Validated(value = SystemDeptParam.create.class) @RequestBody SystemDeptParam systemDeptParam) {
iSystemDeptService.add(systemDeptParam);
public Object add(@Validated(value = SystemAuthDeptParam.create.class) @RequestBody SystemAuthDeptParam systemAuthDeptParam) {
iSystemAuthDeptService.add(systemAuthDeptParam);
return AjaxResult.success();
}
@@ -77,12 +77,12 @@ public class DeptController {
* 部门编辑
*
* @author fzr
* @param systemDeptParam 参数
* @param systemAuthDeptParam 参数
* @return Object
*/
@PostMapping("/edit")
public Object edit(@Validated(value = SystemDeptParam.update.class) @RequestBody SystemDeptParam systemDeptParam) {
iSystemDeptService.edit(systemDeptParam);
public Object edit(@Validated(value = SystemAuthDeptParam.update.class) @RequestBody SystemAuthDeptParam systemAuthDeptParam) {
iSystemAuthDeptService.edit(systemAuthDeptParam);
return AjaxResult.success();
}
@@ -90,12 +90,12 @@ public class DeptController {
* 部门删除
*
* @author fzr
* @param systemDeptParam 参数
* @param systemAuthDeptParam 参数
* @return Object
*/
@PostMapping("/del")
public Object del(@Validated(value = SystemDeptParam.delete.class) @RequestBody SystemDeptParam systemDeptParam) {
iSystemDeptService.del(systemDeptParam.getId());
public Object del(@Validated(value = SystemAuthDeptParam.delete.class) @RequestBody SystemAuthDeptParam systemAuthDeptParam) {
iSystemAuthDeptService.del(systemAuthDeptParam.getId());
return AjaxResult.success();
}

26
server/like-admin/src/main/java/com/hxkj/admin/controller/system/MenuController.java → server/like-admin/src/main/java/com/hxkj/admin/controller/system/AuthMenuController.java
View File

@@ -3,8 +3,8 @@ package com.hxkj.admin.controller.system;
import com.alibaba.fastjson.JSONArray;
import com.hxkj.admin.LikeAdminThreadLocal;
import com.hxkj.admin.config.aop.Log;
import com.hxkj.admin.service.system.ISystemMenuService;
import com.hxkj.admin.validate.system.SystemMenuParam;
import com.hxkj.admin.service.system.ISystemAuthMenuService;
import com.hxkj.admin.validate.system.SystemAuthMenuParam;
import com.hxkj.admin.vo.system.SystemMenuVo;
import com.hxkj.common.core.AjaxResult;
import com.hxkj.common.validator.annotation.IDMust;
@@ -18,10 +18,10 @@ import javax.annotation.Resource;
*/
@RestController
@RequestMapping("api/system/menu")
public class MenuController {
public class AuthMenuController {
@Resource
ISystemMenuService iSystemMenuService;
ISystemAuthMenuService iSystemAuthMenuService;
/**
* 获取菜单路由
@@ -32,7 +32,7 @@ public class MenuController {
@GetMapping("/route")
public Object route() {
Integer roleId = LikeAdminThreadLocal.getRoleId();
JSONArray lists = iSystemMenuService.selectMenuByRoleId(roleId);
JSONArray lists = iSystemAuthMenuService.selectMenuByRoleId(roleId);
return AjaxResult.success(lists);
}
@@ -44,7 +44,7 @@ public class MenuController {
*/
@GetMapping("/list")
public Object list() {
JSONArray lists = iSystemMenuService.list();
JSONArray lists = iSystemAuthMenuService.list();
return AjaxResult.success(lists);
}
@@ -56,7 +56,7 @@ public class MenuController {
*/
@GetMapping("/detail")
public Object detail(@Validated @IDMust() @RequestParam("id") Integer id) {
SystemMenuVo vo = iSystemMenuService.detail(id);
SystemMenuVo vo = iSystemAuthMenuService.detail(id);
return AjaxResult.success(vo);
}
@@ -68,8 +68,8 @@ public class MenuController {
*/
@Log(title = "菜单新增")
@PostMapping("/add")
public Object add(@Validated(value = SystemMenuParam.create.class) @RequestBody SystemMenuParam systemMenuParam) {
iSystemMenuService.add(systemMenuParam);
public Object add(@Validated(value = SystemAuthMenuParam.create.class) @RequestBody SystemAuthMenuParam systemAuthMenuParam) {
iSystemAuthMenuService.add(systemAuthMenuParam);
return AjaxResult.success();
}
@@ -81,8 +81,8 @@ public class MenuController {
*/
@Log(title = "菜单编辑")
@PostMapping("/edit")
public Object edit(@Validated(value = SystemMenuParam.update.class) @RequestBody SystemMenuParam systemMenuParam) {
iSystemMenuService.edit(systemMenuParam);
public Object edit(@Validated(value = SystemAuthMenuParam.update.class) @RequestBody SystemAuthMenuParam systemAuthMenuParam) {
iSystemAuthMenuService.edit(systemAuthMenuParam);
return AjaxResult.success();
}
@@ -94,8 +94,8 @@ public class MenuController {
*/
@Log(title = "菜单删除")
@PostMapping("/del")
public Object del(@Validated(value = SystemMenuParam.delete.class) @RequestBody SystemMenuParam systemMenuParam) {
iSystemMenuService.del(systemMenuParam.getId());
public Object del(@Validated(value = SystemAuthMenuParam.delete.class) @RequestBody SystemAuthMenuParam systemAuthMenuParam) {
iSystemAuthMenuService.del(systemAuthMenuParam.getId());
return AjaxResult.success();
}

32
server/like-admin/src/main/java/com/hxkj/admin/controller/system/PostController.java → server/like-admin/src/main/java/com/hxkj/admin/controller/system/AuthPostController.java
View File

@@ -1,8 +1,8 @@
package com.hxkj.admin.controller.system;
import com.hxkj.admin.service.system.ISystemPostService;
import com.hxkj.admin.service.system.ISystemAuthPostService;
import com.hxkj.admin.validate.common.PageParam;
import com.hxkj.admin.validate.system.SystemPostParam;
import com.hxkj.admin.validate.system.SystemAuthPostParam;
import com.hxkj.admin.vo.system.SystemPostVo;
import com.hxkj.common.core.AjaxResult;
import com.hxkj.common.core.PageResult;
@@ -16,10 +16,10 @@ import java.util.Map;
@RestController
@RequestMapping("api/system/post")
public class PostController {
public class AuthPostController {
@Resource
ISystemPostService iSystemPostService;
ISystemAuthPostService iSystemAuthPostService;
/**
* 岗位所有
@@ -29,7 +29,7 @@ public class PostController {
*/
@GetMapping("/all")
public Object all() {
List<SystemPostVo> vos = iSystemPostService.all();
List<SystemPostVo> vos = iSystemAuthPostService.all();
return AjaxResult.success(vos);
}
@@ -42,13 +42,13 @@ public class PostController {
@GetMapping("/list")
public Object list(@Validated PageParam pageParam,
@RequestParam Map<String, String> params) {
PageResult<SystemPostVo> list = iSystemPostService.list(pageParam, params);
PageResult<SystemPostVo> list = iSystemAuthPostService.list(pageParam, params);
return AjaxResult.success(list);
}
@GetMapping("/detail")
public Object detail(@Validated @IDMust() @RequestParam("id") Integer id) {
SystemPostVo vo = iSystemPostService.detail(id);
SystemPostVo vo = iSystemAuthPostService.detail(id);
return AjaxResult.success(vo);
}
@@ -56,12 +56,12 @@ public class PostController {
* 岗位新增
*
* @author fzr
* @param systemPostParam 参数
* @param systemAuthPostParam 参数
* @return Object
*/
@PostMapping("/add")
public Object add(@Validated(value = SystemPostParam.create.class) @RequestBody SystemPostParam systemPostParam) {
iSystemPostService.add(systemPostParam);
public Object add(@Validated(value = SystemAuthPostParam.create.class) @RequestBody SystemAuthPostParam systemAuthPostParam) {
iSystemAuthPostService.add(systemAuthPostParam);
return AjaxResult.success();
}
@@ -69,12 +69,12 @@ public class PostController {
* 岗位编辑
*
* @author fzr
* @param systemPostParam 参数
* @param systemAuthPostParam 参数
* @return Object
*/
@PostMapping("/edit")
public Object edit(@Validated(value = SystemPostParam.update.class) @RequestBody SystemPostParam systemPostParam) {
iSystemPostService.edit(systemPostParam);
public Object edit(@Validated(value = SystemAuthPostParam.update.class) @RequestBody SystemAuthPostParam systemAuthPostParam) {
iSystemAuthPostService.edit(systemAuthPostParam);
return AjaxResult.success();
}
@@ -82,12 +82,12 @@ public class PostController {
* 岗位删除
*
* @author fzr
* @param systemPostParam 参数
* @param systemAuthPostParam 参数
* @return Object
*/
@PostMapping("/del")
public Object del(@Validated(value = SystemPostParam.delete.class) @RequestBody SystemPostParam systemPostParam) {
iSystemPostService.del(systemPostParam.getId());
public Object del(@Validated(value = SystemAuthPostParam.delete.class) @RequestBody SystemAuthPostParam systemAuthPostParam) {
iSystemAuthPostService.del(systemAuthPostParam.getId());
return AjaxResult.success();
}

30
server/like-admin/src/main/java/com/hxkj/admin/controller/system/RoleController.java → server/like-admin/src/main/java/com/hxkj/admin/controller/system/AuthRoleController.java
View File

@@ -1,9 +1,9 @@
package com.hxkj.admin.controller.system;
import com.hxkj.admin.config.aop.Log;
import com.hxkj.admin.service.system.ISystemRoleService;
import com.hxkj.admin.service.system.ISystemAuthRoleService;
import com.hxkj.admin.validate.common.PageParam;
import com.hxkj.admin.validate.system.SystemRoleParam;
import com.hxkj.admin.validate.system.SystemAuthRoleParam;
import com.hxkj.admin.vo.system.SystemRoleVo;
import com.hxkj.common.core.AjaxResult;
import com.hxkj.common.core.PageResult;
@@ -18,10 +18,10 @@ import javax.annotation.Resource;
*/
@RestController
@RequestMapping("api/system/role")
public class RoleController {
public class AuthRoleController {
@Resource
ISystemRoleService iSystemRoleService;
ISystemAuthRoleService iSystemAuthRoleService;
/**
* 角色列表
@@ -33,7 +33,7 @@ public class RoleController {
@Log(title = "角色列表")
@GetMapping("/list")
public Object list(@Validated PageParam pageParam) {
PageResult<SystemRoleVo> lists = iSystemRoleService.list(pageParam);
PageResult<SystemRoleVo> lists = iSystemAuthRoleService.list(pageParam);
return AjaxResult.success(lists);
}
@@ -46,7 +46,7 @@ public class RoleController {
@Log(title = "角色详情")
@GetMapping("/detail")
public Object detail(@Validated @IDMust() @RequestParam("id") Integer id) {
SystemRoleVo vo = iSystemRoleService.detail(id);
SystemRoleVo vo = iSystemAuthRoleService.detail(id);
return AjaxResult.success(vo);
}
@@ -54,13 +54,13 @@ public class RoleController {
* 新增角色
*
* @author fzr
* @param systemRoleParam 角色参数
* @param systemAuthRoleParam 角色参数
* @return Object
*/
@Log(title = "角色新增")
@PostMapping("/add")
public Object add(@Validated(value = SystemRoleParam.create.class) @RequestBody SystemRoleParam systemRoleParam) {
iSystemRoleService.add(systemRoleParam);
public Object add(@Validated(value = SystemAuthRoleParam.create.class) @RequestBody SystemAuthRoleParam systemAuthRoleParam) {
iSystemAuthRoleService.add(systemAuthRoleParam);
return AjaxResult.success();
}
@@ -68,13 +68,13 @@ public class RoleController {
* 编辑角色
*
* @author fzr
* @param systemRoleParam 角色参数
* @param systemAuthRoleParam 角色参数
* @return Object
*/
@Log(title = "角色编辑")
@PostMapping("/edit")
public Object edit(@Validated(value = SystemRoleParam.create.class) @RequestBody SystemRoleParam systemRoleParam) {
iSystemRoleService.edit(systemRoleParam);
public Object edit(@Validated(value = SystemAuthRoleParam.create.class) @RequestBody SystemAuthRoleParam systemAuthRoleParam) {
iSystemAuthRoleService.edit(systemAuthRoleParam);
return AjaxResult.success();
}
@@ -82,13 +82,13 @@ public class RoleController {
* 删除角色
*
* @author fzr
* @param systemRoleParam 角色参数
* @param systemAuthRoleParam 角色参数
* @return Object
*/
@Log(title = "角色删除")
@PostMapping("/del")
public Object del(@Validated(value = SystemRoleParam.delete.class) @RequestBody SystemRoleParam systemRoleParam) {
iSystemRoleService.del(systemRoleParam.getId());
public Object del(@Validated(value = SystemAuthRoleParam.delete.class) @RequestBody SystemAuthRoleParam systemAuthRoleParam) {
iSystemAuthRoleService.del(systemAuthRoleParam.getId());
return AjaxResult.success();
}

10
server/like-admin/src/main/java/com/hxkj/admin/controller/system/LogController.java
View File

@@ -1,6 +1,6 @@
package com.hxkj.admin.controller.system;
import com.hxkj.admin.service.system.ISystemLogServer;
import com.hxkj.admin.service.system.ISystemLogsServer;
import com.hxkj.admin.validate.common.PageParam;
import com.hxkj.admin.vo.system.LogLoginVo;
import com.hxkj.admin.vo.system.LogOperateVo;
@@ -18,12 +18,12 @@ import java.util.Map;
/**
* 系统日志管理
*/
@RestController
@RestController("systemLogController")
@RequestMapping("api/system/log")
public class LogController {
@Resource
ISystemLogServer iSystemLogServer;
ISystemLogsServer iSystemLogsServer;
/**
* 系统操作日志
@@ -34,7 +34,7 @@ public class LogController {
*/
@GetMapping("/operate")
public Object operate(@Validated PageParam pageParam, @RequestParam Map<String, String> params) {
PageResult<LogOperateVo> list = iSystemLogServer.operate(pageParam, params);
PageResult<LogOperateVo> list = iSystemLogsServer.operate(pageParam, params);
return AjaxResult.success(list);
}
@@ -47,7 +47,7 @@ public class LogController {
*/
@GetMapping("/login")
public Object login(@Validated PageParam pageParam, @RequestParam Map<String, String> params) {
PageResult<LogLoginVo> list = iSystemLogServer.login(pageParam, params);
PageResult<LogLoginVo> list = iSystemLogsServer.login(pageParam, params);
return AjaxResult.success(list);
}

2
server/like-admin/src/main/java/com/hxkj/admin/controller/system/LoginController.java
View File

@@ -18,7 +18,7 @@ import java.util.Map;
/**
* 系统登录管理
*/
@RestController
@RestController("systemLoginController")
@RequestMapping("api/system")
public class LoginController {

10
server/like-admin/src/main/java/com/hxkj/admin/service/article/IArticleArchivesService.java
View File

@@ -1,6 +1,6 @@
package com.hxkj.admin.service.article;
import com.hxkj.admin.validate.article.ArticleTextParam;
import com.hxkj.admin.validate.article.ArticleArchivesParam;
import com.hxkj.admin.validate.common.PageParam;
import com.hxkj.admin.vo.common.article.ArticleDetailVo;
import com.hxkj.admin.vo.common.article.ArticleListVo;
@@ -35,17 +35,17 @@ public interface IArticleArchivesService {
* 文章新增
*
* @author fzr
* @param articleTextParam 文章参数
* @param articleArchivesParam 文章参数
*/
void add(ArticleTextParam articleTextParam);
void add(ArticleArchivesParam articleArchivesParam);
/**
* 文章编辑
*
* @author fzr
* @param articleTextParam 文章参数
* @param articleArchivesParam 文章参数
*/
void edit(ArticleTextParam articleTextParam);
void edit(ArticleArchivesParam articleArchivesParam);
/**
* 文章删除

10
server/like-admin/src/main/java/com/hxkj/admin/service/article/IArticleCategoryService.java
View File

@@ -1,6 +1,6 @@
package com.hxkj.admin.service.article;
import com.hxkj.admin.validate.article.ArticleCateParam;
import com.hxkj.admin.validate.article.ArticleCategoryParam;
import com.hxkj.admin.validate.common.PageParam;
import com.hxkj.admin.vo.common.article.ArticleCateVo;
import com.hxkj.common.core.PageResult;
@@ -43,17 +43,17 @@ public interface IArticleCategoryService {
* 分类新增
*
* @author fzr
* @param articleCateParam 分类参数
* @param articleCategoryParam 分类参数
*/
void add(ArticleCateParam articleCateParam);
void add(ArticleCategoryParam articleCategoryParam);
/**
* 分类编辑
*
* @author fzr
* @param articleCateParam 分类参数
* @param articleCategoryParam 分类参数
*/
void edit(ArticleCateParam articleCateParam);
void edit(ArticleCategoryParam articleCategoryParam);
/**
* 分类删除

42
server/like-admin/src/main/java/com/hxkj/admin/service/article/impl/ArticleArchivesServiceImpl.java
View File

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.query.MPJQueryWrapper;
import com.hxkj.admin.service.article.IArticleArchivesService;
import com.hxkj.admin.validate.article.ArticleTextParam;
import com.hxkj.admin.validate.article.ArticleArchivesParam;
import com.hxkj.admin.validate.common.PageParam;
import com.hxkj.admin.vo.common.article.ArticleDetailVo;
import com.hxkj.admin.vo.common.article.ArticleListVo;
@@ -111,18 +111,18 @@ public class ArticleArchivesServiceImpl implements IArticleArchivesService {
* 文章新增
*
* @author fzr
* @param articleTextParam 文章参数
* @param articleArchivesParam 文章参数
*/
@Override
public void add(ArticleTextParam articleTextParam) {
public void add(ArticleArchivesParam articleArchivesParam) {
Article model = new Article();
model.setCid(articleTextParam.getCid());
model.setTitle(articleTextParam.getTitle());
model.setImage(UrlUtil.toRelativeUrl(articleTextParam.getImage()));
model.setIntro(articleTextParam.getIntro());
model.setContent(articleTextParam.getContent());
model.setSort(articleTextParam.getSort());
model.setIsShow(articleTextParam.getIsShow());
model.setCid(articleArchivesParam.getCid());
model.setTitle(articleArchivesParam.getTitle());
model.setImage(UrlUtil.toRelativeUrl(articleArchivesParam.getImage()));
model.setIntro(articleArchivesParam.getIntro());
model.setContent(articleArchivesParam.getContent());
model.setSort(articleArchivesParam.getSort());
model.setIsShow(articleArchivesParam.getIsShow());
model.setVisit(0);
model.setCreateTime(TimeUtil.timestamp());
model.setUpdateTime(TimeUtil.timestamp());
@@ -133,29 +133,29 @@ public class ArticleArchivesServiceImpl implements IArticleArchivesService {
* 文章编辑
*
* @author fzr
* @param articleTextParam 文章参数
* @param articleArchivesParam 文章参数
*/
@Override
public void edit(ArticleTextParam articleTextParam) {
public void edit(ArticleArchivesParam articleArchivesParam) {
Article model = articleMapper.selectOne(
new QueryWrapper<Article>()
.eq("id", articleTextParam.getId())
.eq("id", articleArchivesParam.getId())
.eq("is_delete", 0));
Assert.notNull(model, "文章不存在!");
Assert.notNull(articleCategoryMapper.selectOne(
new QueryWrapper<ArticleCategory>()
.eq("id", articleTextParam.getCid())
.eq("id", articleArchivesParam.getCid())
.eq("is_delete", 0)), "分类不存在");
model.setCid(articleTextParam.getCid());
model.setTitle(articleTextParam.getTitle());
model.setImage(UrlUtil.toRelativeUrl(articleTextParam.getImage()));
model.setIntro(articleTextParam.getIntro());
model.setContent(articleTextParam.getContent());
model.setIsShow(articleTextParam.getIsShow());
model.setSort(articleTextParam.getSort());
model.setCid(articleArchivesParam.getCid());
model.setTitle(articleArchivesParam.getTitle());
model.setImage(UrlUtil.toRelativeUrl(articleArchivesParam.getImage()));
model.setIntro(articleArchivesParam.getIntro());
model.setContent(articleArchivesParam.getContent());
model.setIsShow(articleArchivesParam.getIsShow());
model.setSort(articleArchivesParam.getSort());
model.setUpdateTime(TimeUtil.timestamp());
articleMapper.updateById(model);
}

22
server/like-admin/src/main/java/com/hxkj/admin/service/article/impl/ArticleCategoryServiceImpl.java
View File

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.hxkj.admin.service.article.IArticleCategoryService;
import com.hxkj.admin.validate.article.ArticleCateParam;
import com.hxkj.admin.validate.article.ArticleCategoryParam;
import com.hxkj.admin.validate.common.PageParam;
import com.hxkj.admin.vo.common.article.ArticleCateVo;
import com.hxkj.common.core.PageResult;
@@ -123,14 +123,14 @@ public class ArticleCategoryServiceImpl implements IArticleCategoryService {
* 分类新增
*
* @author fzr
* @param articleCateParam 分类参数
* @param articleCategoryParam 分类参数
*/
@Override
public void add(ArticleCateParam articleCateParam) {
public void add(ArticleCategoryParam articleCategoryParam) {
ArticleCategory model = new ArticleCategory();
model.setId(articleCateParam.getId());
model.setName(articleCateParam.getName());
model.setSort(articleCateParam.getSort());
model.setId(articleCategoryParam.getId());
model.setName(articleCategoryParam.getName());
model.setSort(articleCategoryParam.getSort());
model.setCreateTime(TimeUtil.timestamp());
model.setUpdateTime(TimeUtil.timestamp());
articleCategoryMapper.insert(model);
@@ -140,22 +140,22 @@ public class ArticleCategoryServiceImpl implements IArticleCategoryService {
* 文章编辑
*
* @author fzr
* @param articleCateParam 分类参数
* @param articleCategoryParam 分类参数
*/
@Override
public void edit(ArticleCateParam articleCateParam) {
public void edit(ArticleCategoryParam articleCategoryParam) {
ArticleCategory model = articleCategoryMapper.selectOne(
new QueryWrapper<ArticleCategory>()
.select(ArticleCategory.class, info->
!info.getColumn().equals("is_delete") &&
!info.getColumn().equals("delete_time"))
.eq("id", articleCateParam.getId())
.eq("id", articleCategoryParam.getId())
.eq("is_delete", 0));
Assert.notNull(model, "分类不存在");
model.setName(articleCateParam.getName());
model.setSort(articleCateParam.getSort());
model.setName(articleCategoryParam.getName());
model.setSort(articleCategoryParam.getSort());
model.setUpdateTime(TimeUtil.timestamp());
articleCategoryMapper.updateById(model);
}

36
server/like-admin/src/main/java/com/hxkj/admin/service/system/ISystemAdminService.java → server/like-admin/src/main/java/com/hxkj/admin/service/system/ISystemAuthAdminService.java
View File

@@ -1,34 +1,18 @@
package com.hxkj.admin.service.system;
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Assert;
import com.hxkj.admin.validate.common.PageParam;
import com.hxkj.admin.validate.system.SystemAdminParam;
import com.hxkj.admin.validate.system.SystemDeptParam;
import com.hxkj.admin.validate.system.SystemAuthAdminParam;
import com.hxkj.admin.vo.system.SystemAdminVo;
import com.hxkj.admin.vo.system.SystemDeptVo;
import com.hxkj.admin.vo.system.SystemSelfVo;
import com.hxkj.common.core.PageResult;
import com.hxkj.common.entity.system.SystemAdmin;
import com.hxkj.common.entity.system.SystemDept;
import com.hxkj.common.mapper.system.SystemAdminMapper;
import com.hxkj.common.mapper.system.SystemDeptMapper;
import com.hxkj.common.utils.ArrayUtil;
import com.hxkj.common.utils.TimeUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import com.hxkj.common.entity.system.SystemAuthAdmin;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
/**
* 系统管理员服务接口类
*/
public interface ISystemAdminService {
public interface ISystemAuthAdminService {
/**
* 根据账号查找管理员
@@ -37,7 +21,7 @@ public interface ISystemAdminService {
* @param username 主键ID
* @return SysAdmin
*/
SystemAdmin findByUsername(String username);
SystemAuthAdmin findByUsername(String username);
/**
* 管理员列表
@@ -69,25 +53,25 @@ public interface ISystemAdminService {
* 管理员新增
*
* @author fzr
* @param systemAdminParam 参数
* @param systemAuthAdminParam 参数
*/
void add(SystemAdminParam systemAdminParam);
void add(SystemAuthAdminParam systemAuthAdminParam);
/**
* 管理员编辑
*
* @author fzr
* @param systemAdminParam 参数
* @param systemAuthAdminParam 参数
*/
void edit(SystemAdminParam systemAdminParam);
void edit(SystemAuthAdminParam systemAuthAdminParam);
/**
* 当前管理员更新
*
* @author fzr
* @param systemAdminParam 参数
* @param systemAuthAdminParam 参数
*/
void upInfo(SystemAdminParam systemAdminParam, Integer adminId);
void upInfo(SystemAuthAdminParam systemAuthAdminParam, Integer adminId);
/**
* 管理员删除

12
server/like-admin/src/main/java/com/hxkj/admin/service/system/ISystemDeptService.java → server/like-admin/src/main/java/com/hxkj/admin/service/system/ISystemAuthDeptService.java
View File

@@ -1,7 +1,7 @@
package com.hxkj.admin.service.system;
import com.alibaba.fastjson.JSONArray;
import com.hxkj.admin.validate.system.SystemDeptParam;
import com.hxkj.admin.validate.system.SystemAuthDeptParam;
import com.hxkj.admin.vo.system.SystemDeptVo;
import java.util.List;
@@ -10,7 +10,7 @@ import java.util.Map;
/**
* 系统部门服务接口类
*/
public interface ISystemDeptService {
public interface ISystemAuthDeptService {
/**
* 部门所有
@@ -42,17 +42,17 @@ public interface ISystemDeptService {
* 部门新增
*
* @author fzr
* @param systemDeptParam 参数
* @param systemAuthDeptParam 参数
*/
void add(SystemDeptParam systemDeptParam);
void add(SystemAuthDeptParam systemAuthDeptParam);
/**
* 部门编辑
*
* @author fzr
* @param systemDeptParam 参数
* @param systemAuthDeptParam 参数
*/
void edit(SystemDeptParam systemDeptParam);
void edit(SystemAuthDeptParam systemAuthDeptParam);
/**
* 部门删除

12
server/like-admin/src/main/java/com/hxkj/admin/service/system/ISystemMenuService.java → server/like-admin/src/main/java/com/hxkj/admin/service/system/ISystemAuthMenuService.java
View File

@@ -1,13 +1,13 @@
package com.hxkj.admin.service.system;
import com.alibaba.fastjson.JSONArray;
import com.hxkj.admin.validate.system.SystemMenuParam;
import com.hxkj.admin.validate.system.SystemAuthMenuParam;
import com.hxkj.admin.vo.system.SystemMenuVo;
/**
* 系统菜单服务接口类
*/
public interface ISystemMenuService {
public interface ISystemAuthMenuService {
/**
* 根据角色获取菜单
@@ -38,17 +38,17 @@ public interface ISystemMenuService {
* 菜单新增
*
* @author fzr
* @param systemMenuParam 参数
* @param systemAuthMenuParam 参数
*/
void add(SystemMenuParam systemMenuParam);
void add(SystemAuthMenuParam systemAuthMenuParam);
/**
* 菜单编辑
*
* @author fzr
* @param systemMenuParam 参数
* @param systemAuthMenuParam 参数
*/
void edit(SystemMenuParam systemMenuParam);
void edit(SystemAuthMenuParam systemAuthMenuParam);
/**
* 菜单删除

2
server/like-admin/src/main/java/com/hxkj/admin/service/system/ISystemRoleMenuService.java → server/like-admin/src/main/java/com/hxkj/admin/service/system/ISystemAuthPermService.java
View File

@@ -5,7 +5,7 @@ import java.util.List;
/**
* 系统角色菜单服务接口类
*/
public interface ISystemRoleMenuService {
public interface ISystemAuthPermService {
/**
* 根据角色ID获取菜单ID

12
server/like-admin/src/main/java/com/hxkj/admin/service/system/ISystemPostService.java → server/like-admin/src/main/java/com/hxkj/admin/service/system/ISystemAuthPostService.java
View File

@@ -1,7 +1,7 @@
package com.hxkj.admin.service.system;
import com.hxkj.admin.validate.common.PageParam;
import com.hxkj.admin.validate.system.SystemPostParam;
import com.hxkj.admin.validate.system.SystemAuthPostParam;
import com.hxkj.admin.vo.system.SystemPostVo;
import com.hxkj.common.core.PageResult;
@@ -11,7 +11,7 @@ import java.util.Map;
/**
* 系统岗位服务接口类
*/
public interface ISystemPostService {
public interface ISystemAuthPostService {
/**
* 岗位所有
@@ -44,17 +44,17 @@ public interface ISystemPostService {
* 岗位新增
*
* @author fzr
* @param systemPostParam 参数
* @param systemAuthPostParam 参数
*/
void add(SystemPostParam systemPostParam);
void add(SystemAuthPostParam systemAuthPostParam);
/**
* 岗位编辑
*
* @author fzr
* @param systemPostParam 参数
* @param systemAuthPostParam 参数
*/
void edit(SystemPostParam systemPostParam);
void edit(SystemAuthPostParam systemAuthPostParam);
/**
* 岗位删除

12
server/like-admin/src/main/java/com/hxkj/admin/service/system/ISystemRoleService.java → server/like-admin/src/main/java/com/hxkj/admin/service/system/ISystemAuthRoleService.java
View File

@@ -1,7 +1,7 @@
package com.hxkj.admin.service.system;
import com.hxkj.admin.validate.common.PageParam;
import com.hxkj.admin.validate.system.SystemRoleParam;
import com.hxkj.admin.validate.system.SystemAuthRoleParam;
import com.hxkj.admin.vo.system.SystemRoleVo;
import com.hxkj.common.core.PageResult;
import org.springframework.validation.annotation.Validated;
@@ -9,7 +9,7 @@ import org.springframework.validation.annotation.Validated;
/**
* 系统角色服务接口类
*/
public interface ISystemRoleService {
public interface ISystemAuthRoleService {
/**
* 角色列表
@@ -33,17 +33,17 @@ public interface ISystemRoleService {
* 角色新增
*
* @author fzr
* @param systemRoleParam 参数
* @param systemAuthRoleParam 参数
*/
void add(SystemRoleParam systemRoleParam);
void add(SystemAuthRoleParam systemAuthRoleParam);
/**
* 角色更新
*
* @author fzr
* @param systemRoleParam 参数
* @param systemAuthRoleParam 参数
*/
void edit(SystemRoleParam systemRoleParam);
void edit(SystemAuthRoleParam systemAuthRoleParam);
/**
* 角色删除

2
server/like-admin/src/main/java/com/hxkj/admin/service/system/ISystemLogServer.java → server/like-admin/src/main/java/com/hxkj/admin/service/system/ISystemLogsServer.java
View File

@@ -10,7 +10,7 @@ import java.util.Map;
/**
* 系统日志服务类接口类
*/
public interface ISystemLogServer {
public interface ISystemLogsServer {
/**
* 系统操作日志

190
server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemAdminServiceImpl.java → server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemAuthAdminServiceImpl.java
View File

@@ -8,20 +8,20 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.query.MPJQueryWrapper;
import com.hxkj.admin.LikeAdminThreadLocal;
import com.hxkj.admin.config.AdminConfig;
import com.hxkj.admin.service.system.ISystemAdminService;
import com.hxkj.admin.service.system.ISystemRoleMenuService;
import com.hxkj.admin.service.system.ISystemRoleService;
import com.hxkj.admin.service.system.ISystemAuthAdminService;
import com.hxkj.admin.service.system.ISystemAuthPermService;
import com.hxkj.admin.service.system.ISystemAuthRoleService;
import com.hxkj.admin.validate.common.PageParam;
import com.hxkj.admin.validate.system.SystemAdminParam;
import com.hxkj.admin.validate.system.SystemAuthAdminParam;
import com.hxkj.admin.vo.system.SystemAdminVo;
import com.hxkj.admin.vo.system.SystemRoleVo;
import com.hxkj.admin.vo.system.SystemSelfVo;
import com.hxkj.common.config.GlobalConfig;
import com.hxkj.common.core.PageResult;
import com.hxkj.common.entity.system.SystemAdmin;
import com.hxkj.common.entity.system.SystemMenu;
import com.hxkj.common.mapper.system.SystemAdminMapper;
import com.hxkj.common.mapper.system.SystemMenuMapper;
import com.hxkj.common.entity.system.SystemAuthAdmin;
import com.hxkj.common.entity.system.SystemAuthMenu;
import com.hxkj.common.mapper.system.SystemAuthAdminMapper;
import com.hxkj.common.mapper.system.SystemAuthMenuMapper;
import com.hxkj.common.utils.*;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -33,19 +33,19 @@ import java.util.*;
* 系统管理员实现类
*/
@Service
public class SystemAdminServiceImpl implements ISystemAdminService {
public class SystemAuthAdminServiceImpl implements ISystemAuthAdminService {
@Resource
SystemAdminMapper systemAdminMapper;
SystemAuthAdminMapper systemAuthAdminMapper;
@Resource
SystemMenuMapper systemMenuMapper;
SystemAuthMenuMapper systemAuthMenuMapper;
@Resource
ISystemRoleService iSystemRoleService;
ISystemAuthRoleService iSystemAuthRoleService;
@Resource
ISystemRoleMenuService iSystemRoleMenuService;
ISystemAuthPermService iSystemAuthPermService;
/**
* 根据账号查找管理员
@@ -55,8 +55,8 @@ public class SystemAdminServiceImpl implements ISystemAdminService {
* @return SysAdmin
*/
@Override
public SystemAdmin findByUsername(String username) {
return systemAdminMapper.selectOne(new QueryWrapper<SystemAdmin>()
public SystemAuthAdmin findByUsername(String username) {
return systemAuthAdminMapper.selectOne(new QueryWrapper<SystemAuthAdmin>()
.eq("username", username)
.last("limit 1"));
}
@@ -73,22 +73,22 @@ public class SystemAdminServiceImpl implements ISystemAdminService {
Integer page = pageParam.getPageNo();
Integer limit = pageParam.getPageSize();
MPJQueryWrapper<SystemAdmin> mpjQueryWrapper = new MPJQueryWrapper<>();
MPJQueryWrapper<SystemAuthAdmin> mpjQueryWrapper = new MPJQueryWrapper<>();
mpjQueryWrapper.select("t.id,t.dept_id,t.post_id,t.username,t.nickname,t.avatar," +
"sd.name as dept,sr.name as role,t.is_multipoint,t.is_disable," +
"t.last_login_ip,t.last_login_time,t.create_time,t.update_time")
.eq("t.is_delete", 0)
.leftJoin("?_system_role sr ON sr.id=t.role".replace("?_", GlobalConfig.tablePrefix))
.leftJoin("?_system_dept sd ON sd.id=t.dept_id".replace("?_", GlobalConfig.tablePrefix))
.leftJoin("?_system_auth_role sr ON sr.id=t.role".replace("?_", GlobalConfig.tablePrefix))
.leftJoin("?_system_auth_dept sd ON sd.id=t.dept_id".replace("?_", GlobalConfig.tablePrefix))
.orderByDesc(Arrays.asList("t.id", "t.sort"));
systemAdminMapper.setSearch(mpjQueryWrapper, params, new String[]{
systemAuthAdminMapper.setSearch(mpjQueryWrapper, params, new String[]{
"like:username:str",
"like:nickname:str",
"=:role:int"
});
IPage<SystemAdminVo> iPage = systemAdminMapper.selectJoinPage(
IPage<SystemAdminVo> iPage = systemAuthAdminMapper.selectJoinPage(
new Page<>(page, limit),
SystemAdminVo.class,
mpjQueryWrapper);
@@ -120,8 +120,8 @@ public class SystemAdminServiceImpl implements ISystemAdminService {
@Override
public SystemSelfVo self(Integer adminId) {
// 管理员信息
SystemAdmin sysAdmin = systemAdminMapper.selectOne(new QueryWrapper<SystemAdmin>()
.select(SystemAdmin.class, info->
SystemAuthAdmin sysAdmin = systemAuthAdminMapper.selectOne(new QueryWrapper<SystemAuthAdmin>()
.select(SystemAuthAdmin.class, info->
!info.getColumn().equals("salt") &&
!info.getColumn().equals("password") &&
!info.getColumn().equals("is_delete") &&
@@ -142,16 +142,16 @@ public class SystemAdminServiceImpl implements ISystemAdminService {
// 角色权限
List<String> auths = new LinkedList<>();
if (adminId > 1) {
List<Integer> menuIds = iSystemRoleMenuService.selectMenuIdsByRoleId(sysAdmin.getRole());
List<Integer> menuIds = iSystemAuthPermService.selectMenuIdsByRoleId(sysAdmin.getRole());
if (menuIds.size() > 0) {
List<SystemMenu> systemMenus = systemMenuMapper.selectList(new QueryWrapper<SystemMenu>()
List<SystemAuthMenu> systemAuthMenus = systemAuthMenuMapper.selectList(new QueryWrapper<SystemAuthMenu>()
.eq("is_disable", 0)
.in("id", menuIds)
.in("menu_type", Arrays.asList("C", "A"))
.orderByAsc(Arrays.asList("menu_sort", "id")));
// 处理权限
for (SystemMenu item : systemMenus) {
for (SystemAuthMenu item : systemAuthMenus) {
if (StringUtil.isNotNull(item.getPerms()) && StringUtil.isNotEmpty(item.getPerms())) {
auths.add(item.getPerms().trim());
}
@@ -182,12 +182,12 @@ public class SystemAdminServiceImpl implements ISystemAdminService {
*/
@Override
public SystemAdminVo detail(Integer id) {
SystemAdmin sysAdmin = systemAdminMapper.selectOne(new QueryWrapper<SystemAdmin>()
.select(SystemAdmin.class, info->
!info.getColumn().equals("salt") &&
!info.getColumn().equals("password") &&
!info.getColumn().equals("is_delete") &&
!info.getColumn().equals("delete_time"))
SystemAuthAdmin sysAdmin = systemAuthAdminMapper.selectOne(new QueryWrapper<SystemAuthAdmin>()
.select(SystemAuthAdmin.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)
.last("limit 1"));
@@ -211,113 +211,113 @@ public class SystemAdminServiceImpl implements ISystemAdminService {
* 管理员新增
*
* @author fzr
* @param systemAdminParam 参数
* @param systemAuthAdminParam 参数
*/
@Override
public void add(SystemAdminParam systemAdminParam) {
public void add(SystemAuthAdminParam systemAuthAdminParam) {
String[] field = {"id", "username", "nickname"};
Assert.isNull(systemAdminMapper.selectOne(new QueryWrapper<SystemAdmin>()
Assert.isNull(systemAuthAdminMapper.selectOne(new QueryWrapper<SystemAuthAdmin>()
.select(field)
.eq("is_delete", 0)
.eq("username", systemAdminParam.getUsername())
.eq("username", systemAuthAdminParam.getUsername())
.last("limit 1")), "账号已存在换一个吧！");
Assert.isNull(systemAdminMapper.selectOne(new QueryWrapper<SystemAdmin>()
Assert.isNull(systemAuthAdminMapper.selectOne(new QueryWrapper<SystemAuthAdmin>()
.select(field)
.eq("is_delete", 0)
.eq("nickname", systemAdminParam.getNickname())
.eq("nickname", systemAuthAdminParam.getNickname())
.last("limit 1")), "昵称已存在换一个吧！");
SystemRoleVo roleVo = iSystemRoleService.detail(systemAdminParam.getRole());
SystemRoleVo roleVo = iSystemAuthRoleService.detail(systemAuthAdminParam.getRole());
Assert.notNull(roleVo, "角色不存在!");
Assert.isTrue(roleVo.getIsDisable() <= 0, "当前角色已被禁用!");
String salt = ToolsUtil.randomString(5);
String pwd = ToolsUtil.makeMd5(systemAdminParam.getPassword().trim() + salt);
String avatar = UrlUtil.toRelativeUrl(systemAdminParam.getAvatar());
String pwd = ToolsUtil.makeMd5(systemAuthAdminParam.getPassword().trim() + salt);
String avatar = UrlUtil.toRelativeUrl(systemAuthAdminParam.getAvatar());
SystemAdmin model = new SystemAdmin();
model.setDeptId(systemAdminParam.getDeptId());
model.setPostId(systemAdminParam.getPostId());
model.setUsername(systemAdminParam.getUsername());
model.setNickname(systemAdminParam.getNickname());
model.setRole(systemAdminParam.getRole());
SystemAuthAdmin model = new SystemAuthAdmin();
model.setDeptId(systemAuthAdminParam.getDeptId());
model.setPostId(systemAuthAdminParam.getPostId());
model.setUsername(systemAuthAdminParam.getUsername());
model.setNickname(systemAuthAdminParam.getNickname());
model.setRole(systemAuthAdminParam.getRole());
model.setAvatar(avatar);
model.setPassword(pwd);
model.setSalt(salt);
model.setSort(systemAdminParam.getSort());
model.setIsMultipoint(systemAdminParam.getIsMultipoint());
model.setIsDisable(systemAdminParam.getIsDisable());
model.setSort(systemAuthAdminParam.getSort());
model.setIsMultipoint(systemAuthAdminParam.getIsMultipoint());
model.setIsDisable(systemAuthAdminParam.getIsDisable());
model.setCreateTime(System.currentTimeMillis() / 1000);
model.setUpdateTime(System.currentTimeMillis() / 1000);
systemAdminMapper.insert(model);
systemAuthAdminMapper.insert(model);
}
/**
* 管理员更新
*
* @author fzr
* @param systemAdminParam 参数
* @param systemAuthAdminParam 参数
*/
@Override
public void edit(SystemAdminParam systemAdminParam) {
public void edit(SystemAuthAdminParam systemAuthAdminParam) {
String[] field = {"id", "username", "nickname"};
Assert.notNull(systemAdminMapper.selectOne(new QueryWrapper<SystemAdmin>()
Assert.notNull(systemAuthAdminMapper.selectOne(new QueryWrapper<SystemAuthAdmin>()
.select(field)
.eq("id", systemAdminParam.getId())
.eq("id", systemAuthAdminParam.getId())
.eq("is_delete", 0)
.last("limit 1")), "账号不存在了!");
Assert.isNull(systemAdminMapper.selectOne(new QueryWrapper<SystemAdmin>()
Assert.isNull(systemAuthAdminMapper.selectOne(new QueryWrapper<SystemAuthAdmin>()
.select(field)
.eq("is_delete", 0)
.eq("username", systemAdminParam.getUsername())
.ne("id", systemAdminParam.getId())
.eq("username", systemAuthAdminParam.getUsername())
.ne("id", systemAuthAdminParam.getId())
.last("limit 1")), "账号已存在换一个吧！");
Assert.isNull(systemAdminMapper.selectOne(new QueryWrapper<SystemAdmin>()
Assert.isNull(systemAuthAdminMapper.selectOne(new QueryWrapper<SystemAuthAdmin>()
.select(field)
.eq("is_delete", 0)
.eq("nickname", systemAdminParam.getNickname())
.ne("id", systemAdminParam.getId())
.eq("nickname", systemAuthAdminParam.getNickname())
.ne("id", systemAuthAdminParam.getId())
.last("limit 1")), "昵称已存在换一个吧！");
Assert.notNull(iSystemRoleService.detail(systemAdminParam.getRole()), "角色不存在!");
Assert.notNull(iSystemAuthRoleService.detail(systemAuthAdminParam.getRole()), "角色不存在!");
SystemAdmin model = new SystemAdmin();
model.setId(systemAdminParam.getId());
model.setDeptId(systemAdminParam.getDeptId());
model.setPostId(systemAdminParam.getPostId());
model.setNickname(systemAdminParam.getNickname());
model.setUsername(systemAdminParam.getUsername());
model.setAvatar( UrlUtil.toRelativeUrl(systemAdminParam.getAvatar()));
model.setRole(systemAdminParam.getId() == 1 ? 0 : systemAdminParam.getRole());
model.setSort(systemAdminParam.getSort());
model.setIsMultipoint(systemAdminParam.getIsMultipoint());
model.setIsDisable(systemAdminParam.getIsDisable());
SystemAuthAdmin model = new SystemAuthAdmin();
model.setId(systemAuthAdminParam.getId());
model.setDeptId(systemAuthAdminParam.getDeptId());
model.setPostId(systemAuthAdminParam.getPostId());
model.setNickname(systemAuthAdminParam.getNickname());
model.setUsername(systemAuthAdminParam.getUsername());
model.setAvatar( UrlUtil.toRelativeUrl(systemAuthAdminParam.getAvatar()));
model.setRole(systemAuthAdminParam.getId() == 1 ? 0 : systemAuthAdminParam.getRole());
model.setSort(systemAuthAdminParam.getSort());
model.setIsMultipoint(systemAuthAdminParam.getIsMultipoint());
model.setIsDisable(systemAuthAdminParam.getIsDisable());
model.setUpdateTime(System.currentTimeMillis() / 1000);
if (systemAdminParam.getPassword() != null) {
if (systemAuthAdminParam.getPassword() != null) {
String salt = ToolsUtil.randomString(5);
String pwd = ToolsUtil.makeMd5( systemAdminParam.getPassword().trim() + salt);
String pwd = ToolsUtil.makeMd5( systemAuthAdminParam.getPassword().trim() + salt);
model.setPassword(pwd);
model.setSalt(salt);
}
systemAdminMapper.updateById(model);
this.cacheAdminUserByUid(systemAdminParam.getId());
systemAuthAdminMapper.updateById(model);
this.cacheAdminUserByUid(systemAuthAdminParam.getId());
}
/**
* 当前管理员更新
*
* @author fzr
* @param systemAdminParam 参数
* @param systemAuthAdminParam 参数
*/
@Override
public void upInfo(SystemAdminParam systemAdminParam, Integer adminId) {
public void upInfo(SystemAuthAdminParam systemAuthAdminParam, Integer adminId) {
String[] field = {"id", "username", "nickname"};
SystemAdmin model = systemAdminMapper.selectOne(new QueryWrapper<SystemAdmin>()
SystemAuthAdmin model = systemAuthAdminMapper.selectOne(new QueryWrapper<SystemAuthAdmin>()
.select(field)
.eq("id", adminId)
.eq("is_delete", 0)
@@ -325,21 +325,21 @@ public class SystemAdminServiceImpl implements ISystemAdminService {
Assert.notNull(model, "账号不存在了!");
model.setNickname(systemAdminParam.getNickname());
model.setAvatar( UrlUtil.toRelativeUrl(systemAdminParam.getAvatar()));
model.setNickname(systemAuthAdminParam.getNickname());
model.setAvatar( UrlUtil.toRelativeUrl(systemAuthAdminParam.getAvatar()));
model.setUpdateTime(System.currentTimeMillis() / 1000);
if (systemAdminParam.getPassword() != null && !systemAdminParam.getPassword().equals("")) {
if (systemAuthAdminParam.getPassword() != null && !systemAuthAdminParam.getPassword().equals("")) {
String salt = ToolsUtil.randomString(5);
String pwd = ToolsUtil.makeMd5( systemAdminParam.getPassword().trim() + salt);
String pwd = ToolsUtil.makeMd5( systemAuthAdminParam.getPassword().trim() + salt);
model.setPassword(pwd);
model.setSalt(salt);
}
systemAdminMapper.updateById(model);
systemAuthAdminMapper.updateById(model);
this.cacheAdminUserByUid(adminId);
if (systemAdminParam.getPassword() != null) {
if (systemAuthAdminParam.getPassword() != null) {
String token = Objects.requireNonNull(RequestUtil.handler()).getHeader("token");
RedisUtil.del(AdminConfig.backstageTokenKey + token);
}
@@ -354,7 +354,7 @@ public class SystemAdminServiceImpl implements ISystemAdminService {
@Override
public void del(Integer id) {
String[] field = {"id", "username", "nickname"};
Assert.notNull(systemAdminMapper.selectOne(new QueryWrapper<SystemAdmin>()
Assert.notNull(systemAuthAdminMapper.selectOne(new QueryWrapper<SystemAuthAdmin>()
.select(field)
.eq("id", id)
.eq("is_delete", 0)
@@ -365,11 +365,11 @@ public class SystemAdminServiceImpl implements ISystemAdminService {
int adminId = Integer.parseInt(LikeAdminThreadLocal.getAdminId().toString());
Assert.isFalse(id == adminId, "不能删除自己");
SystemAdmin model = new SystemAdmin();
SystemAuthAdmin model = new SystemAuthAdmin();
model.setId(id);
model.setIsDelete(1);
model.setDeleteTime(System.currentTimeMillis() / 1000);
systemAdminMapper.updateById(model);
systemAuthAdminMapper.updateById(model);
this.cacheAdminUserByUid(id);
}
@@ -382,18 +382,18 @@ public class SystemAdminServiceImpl implements ISystemAdminService {
@Override
public void disable(Integer id) {
String[] field = {"id", "username", "nickname", "is_disable"};
SystemAdmin systemAdmin = systemAdminMapper.selectOne(new QueryWrapper<SystemAdmin>()
SystemAuthAdmin systemAuthAdmin = systemAuthAdminMapper.selectOne(new QueryWrapper<SystemAuthAdmin>()
.select(field)
.eq("id", id)
.eq("is_delete", 0)
.last("limit 1"));
Assert.notNull(systemAdmin, "账号已不存在！");
Assert.notNull(systemAuthAdmin, "账号已不存在！");
Integer disable = systemAdmin.getIsDisable() == 1 ? 0 : 1;
systemAdmin.setIsDisable(disable);
systemAdmin.setUpdateTime(TimeUtil.timestamp());
systemAdminMapper.updateById(systemAdmin);
Integer disable = systemAuthAdmin.getIsDisable() == 1 ? 0 : 1;
systemAuthAdmin.setIsDisable(disable);
systemAuthAdmin.setUpdateTime(TimeUtil.timestamp());
systemAuthAdminMapper.updateById(systemAuthAdmin);
}
/**
@@ -401,7 +401,7 @@ public class SystemAdminServiceImpl implements ISystemAdminService {
*/
@Override
public void cacheAdminUserByUid(Integer id) {
SystemAdmin sysAdmin = systemAdminMapper.selectById(id);
SystemAuthAdmin sysAdmin = systemAuthAdminMapper.selectById(id);
Map<String, Object> user = new LinkedHashMap<>();
Map<String, Object> map = new LinkedHashMap<>();

218
server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemAuthDeptServiceImpl.java Normal file
View File

@@ -0,0 +1,218 @@
package com.hxkj.admin.service.system.impl;
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Assert;
import com.hxkj.admin.service.system.ISystemAuthDeptService;
import com.hxkj.admin.validate.system.SystemAuthDeptParam;
import com.hxkj.admin.vo.system.SystemDeptVo;
import com.hxkj.common.entity.system.SystemAuthAdmin;
import com.hxkj.common.entity.system.SystemAuthDept;
import com.hxkj.common.mapper.system.SystemAuthAdminMapper;
import com.hxkj.common.mapper.system.SystemAuthDeptMapper;
import com.hxkj.common.utils.ArrayUtil;
import com.hxkj.common.utils.TimeUtil;
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;
import java.util.Map;
@Service
class SystemAuthDeptServiceImpl implements ISystemAuthDeptService {
@Resource
SystemAuthDeptMapper systemAuthDeptMapper;
@Resource
SystemAuthAdminMapper systemAuthAdminMapper;
/**
* 岗位所有
*
* @author fzr
* @return List<SystemPostVo>
*/
@Override
public List<SystemDeptVo> all() {
List<SystemAuthDept> systemAuthDeptList = systemAuthDeptMapper.selectList(new QueryWrapper<SystemAuthDept>()
.gt("pid", 0)
.eq("is_delete", 0)
.orderByDesc((Arrays.asList("id", "sort"))));
List<SystemDeptVo> adminVoArrayList = new ArrayList<>();
for (SystemAuthDept systemAuthDept : systemAuthDeptList) {
SystemDeptVo vo = new SystemDeptVo();
BeanUtils.copyProperties(systemAuthDept, vo);
vo.setUpdateTime(TimeUtil.timestampToDate(systemAuthDept.getUpdateTime()));
vo.setCreateTime(TimeUtil.timestampToDate(systemAuthDept.getCreateTime()));
adminVoArrayList.add(vo);
}
return adminVoArrayList;
}
/**
* 部门列表
*
* @author fzr
* @param params 搜索参数
* @return JSONArray
*/
@Override
public JSONArray list(Map<String, String> params) {
QueryWrapper<SystemAuthDept> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("is_delete", 0);
queryWrapper.orderByAsc(Arrays.asList("sort", "id"));
queryWrapper.select(SystemAuthDept.class, info ->
!info.getColumn().equals("is_delete") &&
!info.getColumn().equals("delete_time"));
systemAuthDeptMapper.setSearch(queryWrapper, params, new String[]{
"like:name:str",
"=:isStop@is_stop:int"
});
List<SystemAuthDept> systemAuthDeptList = systemAuthDeptMapper.selectList(queryWrapper);
List<SystemDeptVo> lists = new ArrayList<>();
for (SystemAuthDept systemAuthDept : systemAuthDeptList) {
SystemDeptVo vo = new SystemDeptVo();
BeanUtils.copyProperties(systemAuthDept, vo);
vo.setCreateTime(TimeUtil.timestampToDate(systemAuthDept.getCreateTime()));
vo.setUpdateTime(TimeUtil.timestampToDate(systemAuthDept.getUpdateTime()));
lists.add(vo);
}
JSONArray jsonArray = JSONArray.parseArray(JSONArray.toJSONString(lists));
return ArrayUtil.listToTree(jsonArray, "id", "pid", "children");
}
/**
* 部门详情
*
* @author fzr
* @param id 主键
* @return SystemDeptVo
*/
@Override
public SystemDeptVo detail(Integer id) {
SystemAuthDept systemAuthDept = systemAuthDeptMapper.selectOne(
new QueryWrapper<SystemAuthDept>()
.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, "部门已不存在!");
SystemDeptVo vo = new SystemDeptVo();
BeanUtils.copyProperties(systemAuthDept, vo);
vo.setCreateTime(TimeUtil.timestampToDate(systemAuthDept.getCreateTime()));
vo.setUpdateTime(TimeUtil.timestampToDate(systemAuthDept.getUpdateTime()));
return vo;
}
/**
* 部门新增
*
* @author fzr
* @param systemAuthDeptParam 参数
*/
@Override
public void add(SystemAuthDeptParam systemAuthDeptParam) {
if (systemAuthDeptParam.getPid() == 0) {
SystemAuthDept systemAuthDept = systemAuthDeptMapper.selectOne(
new QueryWrapper<SystemAuthDept>()
.select("id,pid,name")
.eq("pid", 0)
.eq("is_delete", 0)
.last("limit 1"));
Assert.isNull(systemAuthDept, "顶级部门只允许有一个");
}
SystemAuthDept model = new SystemAuthDept();
model.setPid(systemAuthDeptParam.getPid());
model.setName(systemAuthDeptParam.getName());
model.setDuty(systemAuthDeptParam.getDuty());
model.setMobile(systemAuthDeptParam.getMobile());
model.setSort(systemAuthDeptParam.getSort());
model.setIsStop(systemAuthDeptParam.getIsStop());
model.setIsDelete(0);
model.setCreateTime(System.currentTimeMillis() / 1000);
model.setUpdateTime(System.currentTimeMillis() / 1000);
systemAuthDeptMapper.insert(model);
}
/**
* 部门编辑
*
* @author fzr
* @param systemAuthDeptParam 参数
*/
@Override
public void edit(SystemAuthDeptParam systemAuthDeptParam) {
SystemAuthDept model = systemAuthDeptMapper.selectOne(
new QueryWrapper<SystemAuthDept>()
.select(SystemAuthDept.class, info ->
!info.getColumn().equals("is_delete") &&
!info.getColumn().equals("delete_time"))
.eq("id", systemAuthDeptParam.getId())
.eq("is_delete", 0)
.last("limit 1"));
Assert.notNull(model, "部门不存在");
Assert.isFalse((model.getPid() == 0 && systemAuthDeptParam.getPid() > 0), "顶级部门不能修改上级");
Assert.isFalse(systemAuthDeptParam.getId().equals(systemAuthDeptParam.getPid()), "上级部门不能是自己");
model.setPid(systemAuthDeptParam.getPid());
model.setName(systemAuthDeptParam.getName());
model.setDuty(systemAuthDeptParam.getDuty());
model.setMobile(systemAuthDeptParam.getMobile());
model.setSort(systemAuthDeptParam.getSort());
model.setIsStop(systemAuthDeptParam.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<SystemAuthDept>()
.select("id,pid,name")
.eq("id", id)
.eq("is_delete", 0)
.last("limit 1"));
Assert.notNull(model, "部门不存在");
Assert.isFalse((model.getPid() == 0), "顶级部门不能删除");
SystemAuthAdmin systemAuthAdmin = systemAuthAdminMapper.selectOne(new QueryWrapper<SystemAuthAdmin>()
.select("id,nickname")
.eq("dept_id", id)
.eq("is_delete", 0)
.last("limit 1"));
Assert.isNull(systemAuthAdmin, "该部门已被管理员使用,请先移除");
model.setIsDelete(1);
model.setDeleteTime(System.currentTimeMillis() / 1000);
systemAuthDeptMapper.updateById(model);
}
}

194
server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemAuthMenuServiceImpl.java Normal file
View File

@@ -0,0 +1,194 @@
package com.hxkj.admin.service.system.impl;
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Assert;
import com.hxkj.admin.LikeAdminThreadLocal;
import com.hxkj.admin.config.AdminConfig;
import com.hxkj.admin.service.system.ISystemAuthMenuService;
import com.hxkj.admin.service.system.ISystemAuthPermService;
import com.hxkj.admin.validate.system.SystemAuthMenuParam;
import com.hxkj.admin.vo.system.SystemMenuVo;
import com.hxkj.common.entity.system.SystemAuthMenu;
import com.hxkj.common.mapper.system.SystemAuthMenuMapper;
import com.hxkj.common.utils.*;
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 SystemAuthMenuServiceImpl implements ISystemAuthMenuService {
@Resource
SystemAuthMenuMapper systemAuthMenuMapper;
@Resource
ISystemAuthPermService iSystemAuthPermService;
/**
* 根据角色ID获取菜单
*
* @author fzr
* @param roleId 角色ID
* @return JSONArray
*/
@Override
public JSONArray selectMenuByRoleId(Integer roleId) {
Integer adminId = LikeAdminThreadLocal.getAdminId();
List<Integer> menuIds = iSystemAuthPermService.selectMenuIdsByRoleId(roleId);
QueryWrapper<SystemAuthMenu> queryWrapper = new QueryWrapper<>();
queryWrapper.in("menu_type", Arrays.asList("M", "C"));
queryWrapper.eq("is_disable", 0);
queryWrapper.orderByAsc(Arrays.asList("menu_sort", "id"));
if (adminId != 1 && menuIds.size() > 0) {
queryWrapper.in("id", menuIds);
}
List<SystemAuthMenu> systemAuthMenus = systemAuthMenuMapper.selectList(queryWrapper);
List<SystemMenuVo> lists = new ArrayList<>();
for (SystemAuthMenu systemAuthMenu : systemAuthMenus) {
SystemMenuVo vo = new SystemMenuVo();
BeanUtils.copyProperties(systemAuthMenu, vo);
vo.setUpdateTime(TimeUtil.timestampToDate(systemAuthMenu.getUpdateTime()));
vo.setCreateTime(TimeUtil.timestampToDate(systemAuthMenu.getCreateTime()));
lists.add(vo);
}
JSONArray jsonArray = JSONArray.parseArray(JSONArray.toJSONString(lists));
return ArrayUtil.listToTree(jsonArray, "id", "pid", "children");
}
/**
* 菜单列表
*
* @author fzr
* @return JSONArray
*/
@Override
public JSONArray list() {
QueryWrapper<SystemAuthMenu> queryWrapper = new QueryWrapper<>();
queryWrapper.orderByAsc(Arrays.asList("menu_sort", "id"));
List<SystemAuthMenu> systemAuthMenus = systemAuthMenuMapper.selectList(queryWrapper);
List<SystemMenuVo> lists = new ArrayList<>();
for (SystemAuthMenu systemAuthMenu : systemAuthMenus) {
SystemMenuVo vo = new SystemMenuVo();
BeanUtils.copyProperties(systemAuthMenu, vo);
vo.setCreateTime(TimeUtil.timestampToDate(systemAuthMenu.getCreateTime()));
vo.setUpdateTime(TimeUtil.timestampToDate(systemAuthMenu.getUpdateTime()));
lists.add(vo);
}
JSONArray jsonArray = JSONArray.parseArray(JSONArray.toJSONString(lists));
return ArrayUtil.listToTree(jsonArray, "id", "pid", "children");
}
/**
* 菜单详情
*
* @author fzr
* @param id 主键参数
* @return SysMenu
*/
@Override
public SystemMenuVo detail(Integer id) {
SystemAuthMenu systemAuthMenu = systemAuthMenuMapper.selectOne(new QueryWrapper<SystemAuthMenu>().eq("id", id));
Assert.notNull(systemAuthMenu, "菜单已不存在!");
SystemMenuVo vo = new SystemMenuVo();
BeanUtils.copyProperties(systemAuthMenu, vo);
vo.setCreateTime(TimeUtil.timestampToDate(systemAuthMenu.getCreateTime()));
vo.setUpdateTime(TimeUtil.timestampToDate(systemAuthMenu.getUpdateTime()));
return vo;
}
/**
* 新增菜单
*
* @author fzr
* @param systemAuthMenuParam 参数
*/
@Override
public void add(SystemAuthMenuParam systemAuthMenuParam) {
SystemAuthMenu model = new SystemAuthMenu();
model.setPid(systemAuthMenuParam.getPid());
model.setMenuType(systemAuthMenuParam.getMenuType());
model.setMenuName(systemAuthMenuParam.getMenuName());
model.setMenuIcon(systemAuthMenuParam.getMenuIcon());
model.setMenuSort(systemAuthMenuParam.getMenuSort());
model.setPerms(systemAuthMenuParam.getPerms());
model.setPaths(systemAuthMenuParam.getPaths());
model.setComponent(systemAuthMenuParam.getComponent());
model.setSelected(systemAuthMenuParam.getSelected());
model.setParams(systemAuthMenuParam.getParams());
model.setIsCache(systemAuthMenuParam.getIsCache());
model.setIsShow(systemAuthMenuParam.getIsShow());
model.setIsDisable(systemAuthMenuParam.getIsDisable());
model.setCreateTime(System.currentTimeMillis() / 1000);
model.setUpdateTime(System.currentTimeMillis() / 1000);
systemAuthMenuMapper.insert(model);
RedisUtil.del(AdminConfig.backstageRolesKey);
}
/**
* 编辑菜单
*
* @author fzr
* @param systemAuthMenuParam 菜单
*/
@Override
public void edit(SystemAuthMenuParam systemAuthMenuParam) {
SystemAuthMenu model = systemAuthMenuMapper.selectOne(new QueryWrapper<SystemAuthMenu>().eq("id", systemAuthMenuParam.getId()));
Assert.notNull(model, "菜单已不存在!");
model.setMenuType(systemAuthMenuParam.getMenuType());
model.setMenuName(systemAuthMenuParam.getMenuName());
model.setMenuIcon(systemAuthMenuParam.getMenuIcon());
model.setMenuSort(systemAuthMenuParam.getMenuSort());
model.setPaths(systemAuthMenuParam.getPaths());
model.setPerms(systemAuthMenuParam.getPerms());
model.setComponent(systemAuthMenuParam.getComponent());
model.setPid(systemAuthMenuParam.getPid());
model.setSelected(systemAuthMenuParam.getSelected());
model.setParams(systemAuthMenuParam.getParams());
model.setIsCache(systemAuthMenuParam.getIsCache());
model.setIsShow(systemAuthMenuParam.getIsShow());
model.setIsDisable(systemAuthMenuParam.getIsDisable());
model.setUpdateTime(System.currentTimeMillis() / 1000);
systemAuthMenuMapper.updateById(model);
RedisUtil.del(AdminConfig.backstageRolesKey);
}
/**
* 删除菜单
*
* @author fzr
* @param id 主键参数
*/
@Override
public void del(Integer id) {
SystemAuthMenu model = systemAuthMenuMapper.selectOne(new QueryWrapper<SystemAuthMenu>().eq("id", id));
Assert.notNull(model, "菜单已不存在!");
Assert.isNull(systemAuthMenuMapper.selectOne(
new QueryWrapper<SystemAuthMenu>().eq("pid", id)),
"请先删除子菜单再操作！");
systemAuthMenuMapper.deleteById(id);
iSystemAuthPermService.batchDeleteByMenuId(id);
RedisUtil.del(AdminConfig.backstageRolesKey);
}
}

44
server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemRoleMenuServiceImpl.java → server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemAuthPermServiceImpl.java
View File

@@ -2,11 +2,11 @@ package com.hxkj.admin.service.system.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.hxkj.admin.config.AdminConfig;
import com.hxkj.admin.service.system.ISystemRoleMenuService;
import com.hxkj.common.entity.system.SystemMenu;
import com.hxkj.common.entity.system.SystemRoleMenu;
import com.hxkj.common.mapper.system.SystemMenuMapper;
import com.hxkj.common.mapper.system.SystemRoleMenuMapper;
import com.hxkj.admin.service.system.ISystemAuthPermService;
import com.hxkj.common.entity.system.SystemAuthMenu;
import com.hxkj.common.entity.system.SystemAuthPerm;
import com.hxkj.common.mapper.system.SystemAuthMenuMapper;
import com.hxkj.common.mapper.system.SystemAuthPermMapper;
import com.hxkj.common.utils.ArrayUtil;
import com.hxkj.common.utils.RedisUtil;
import com.hxkj.common.utils.StringUtil;
@@ -22,13 +22,13 @@ import java.util.List;
* 系统菜单服务实现类
*/
@Service
public class SystemRoleMenuServiceImpl implements ISystemRoleMenuService {
public class SystemAuthPermServiceImpl implements ISystemAuthPermService {
@Resource
SystemRoleMenuMapper systemRoleMenuMapper;
SystemAuthPermMapper systemAuthPermMapper;
@Resource
SystemMenuMapper systemMenuMapper;
SystemAuthMenuMapper systemAuthMenuMapper;
/**
* 根据角色ID获取菜单ID
@@ -39,10 +39,10 @@ public class SystemRoleMenuServiceImpl implements ISystemRoleMenuService {
@Override
public List<Integer> selectMenuIdsByRoleId(Integer roleId) {
List<Integer> menus = new LinkedList<>();
List<SystemRoleMenu> systemRoleMenus = systemRoleMenuMapper.selectList(
new QueryWrapper<SystemRoleMenu>().eq("role_id", roleId));
for (SystemRoleMenu systemRoleMenu : systemRoleMenus) {
menus.add(systemRoleMenu.getMenuId());
List<SystemAuthPerm> systemAuthPerms = systemAuthPermMapper.selectList(
new QueryWrapper<SystemAuthPerm>().eq("role_id", roleId));
for (SystemAuthPerm systemAuthPerm : systemAuthPerms) {
menus.add(systemAuthPerm.getMenuId());
}
return menus;
}
@@ -59,10 +59,10 @@ public class SystemRoleMenuServiceImpl implements ISystemRoleMenuService {
public void batchSaveByMenuIds(Integer roleId, String menuIds) {
if (menuIds != null && !menuIds.equals("")) {
for (String menuId : menuIds.split(",")) {
SystemRoleMenu model = new SystemRoleMenu();
SystemAuthPerm model = new SystemAuthPerm();
model.setRoleId(roleId);
model.setMenuId(Integer.parseInt(menuId));
systemRoleMenuMapper.insert(model);
systemAuthPermMapper.insert(model);
}
}
}
@@ -75,7 +75,7 @@ public class SystemRoleMenuServiceImpl implements ISystemRoleMenuService {
*/
@Override
public void batchDeleteByRoleId(Integer roleId) {
systemRoleMenuMapper.delete(new QueryWrapper<SystemRoleMenu>().eq("role_id", roleId));
systemAuthPermMapper.delete(new QueryWrapper<SystemAuthPerm>().eq("role_id", roleId));
}
/**
@@ -86,7 +86,7 @@ public class SystemRoleMenuServiceImpl implements ISystemRoleMenuService {
*/
@Override
public void batchDeleteByMenuId(Integer menuId) {
systemRoleMenuMapper.delete(new QueryWrapper<SystemRoleMenu>().eq("menu_id", menuId));
systemAuthPermMapper.delete(new QueryWrapper<SystemAuthPerm>().eq("menu_id", menuId));
}
/**
@@ -100,21 +100,21 @@ public class SystemRoleMenuServiceImpl implements ISystemRoleMenuService {
List<Integer> menuIds = new LinkedList<>();
List<String> menuArray = new LinkedList<>();
List<SystemRoleMenu> systemRoleMenus = systemRoleMenuMapper.selectList(
new QueryWrapper<SystemRoleMenu>().eq("role_id", roleId));
for (SystemRoleMenu systemRoleMenu : systemRoleMenus) {
menuIds.add(systemRoleMenu.getMenuId());
List<SystemAuthPerm> systemAuthPerms = systemAuthPermMapper.selectList(
new QueryWrapper<SystemAuthPerm>().eq("role_id", roleId));
for (SystemAuthPerm systemAuthPerm : systemAuthPerms) {
menuIds.add(systemAuthPerm.getMenuId());
}
if (menuIds.size() > 0) {
List<SystemMenu> systemMenus = systemMenuMapper.selectList(new QueryWrapper<SystemMenu>()
List<SystemAuthMenu> systemAuthMenus = systemAuthMenuMapper.selectList(new QueryWrapper<SystemAuthMenu>()
.select("id,perms")
.eq("is_disable", 0)
.in("id", menuIds)
.in("menu_type", Arrays.asList("C", "A"))
.orderByAsc(Arrays.asList("menu_sort", "id")));
for (SystemMenu item : systemMenus) {
for (SystemAuthMenu item : systemAuthMenus) {
if (StringUtil.isNotNull(item.getPerms()) && StringUtil.isNotEmpty(item.getPerms())) {
menuArray.add(item.getPerms().trim());
}

118
server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemPostServiceImpl.java → server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemAuthPostServiceImpl.java
View File

@@ -4,15 +4,15 @@ 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.hxkj.admin.service.system.ISystemPostService;
import com.hxkj.admin.service.system.ISystemAuthPostService;
import com.hxkj.admin.validate.common.PageParam;
import com.hxkj.admin.validate.system.SystemPostParam;
import com.hxkj.admin.validate.system.SystemAuthPostParam;
import com.hxkj.admin.vo.system.SystemPostVo;
import com.hxkj.common.core.PageResult;
import com.hxkj.common.entity.system.SystemAdmin;
import com.hxkj.common.entity.system.SystemPost;
import com.hxkj.common.mapper.system.SystemAdminMapper;
import com.hxkj.common.mapper.system.SystemPostMapper;
import com.hxkj.common.entity.system.SystemAuthAdmin;
import com.hxkj.common.entity.system.SystemAuthPost;
import com.hxkj.common.mapper.system.SystemAuthAdminMapper;
import com.hxkj.common.mapper.system.SystemAuthPostMapper;
import com.hxkj.common.utils.TimeUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -24,13 +24,13 @@ import java.util.List;
import java.util.Map;
@Service
public class SystemPostServiceImpl implements ISystemPostService {
public class SystemAuthPostServiceImpl implements ISystemAuthPostService {
@Resource
SystemPostMapper systemPostMapper;
SystemAuthPostMapper systemAuthPostMapper;
@Resource
SystemAdminMapper systemAdminMapper;
SystemAuthAdminMapper systemAuthAdminMapper;
/**
* 岗位所有
@@ -40,17 +40,17 @@ public class SystemPostServiceImpl implements ISystemPostService {
*/
@Override
public List<SystemPostVo> all() {
List<SystemPost> systemPostList = systemPostMapper.selectList(new QueryWrapper<SystemPost>()
List<SystemAuthPost> systemAuthPostList = systemAuthPostMapper.selectList(new QueryWrapper<SystemAuthPost>()
.eq("is_delete", 0)
.orderByDesc((Arrays.asList("id", "sort"))));
List<SystemPostVo> adminVoArrayList = new ArrayList<>();
for (SystemPost systemPost : systemPostList) {
for (SystemAuthPost systemAuthPost : systemAuthPostList) {
SystemPostVo vo = new SystemPostVo();
BeanUtils.copyProperties(systemPost, vo);
BeanUtils.copyProperties(systemAuthPost, vo);
vo.setCreateTime(TimeUtil.timestampToDate(systemPost.getCreateTime()));
vo.setUpdateTime(TimeUtil.timestampToDate(systemPost.getUpdateTime()));
vo.setCreateTime(TimeUtil.timestampToDate(systemAuthPost.getCreateTime()));
vo.setUpdateTime(TimeUtil.timestampToDate(systemAuthPost.getUpdateTime()));
adminVoArrayList.add(vo);
}
@@ -70,28 +70,28 @@ public class SystemPostServiceImpl implements ISystemPostService {
Integer page = pageParam.getPageNo();
Integer limit = pageParam.getPageSize();
QueryWrapper<SystemPost> queryWrapper = new QueryWrapper<>();
queryWrapper.select(SystemPost.class, info->
QueryWrapper<SystemAuthPost> 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("id", "sort"));
systemPostMapper.setSearch(queryWrapper, params, new String[]{
systemAuthPostMapper.setSearch(queryWrapper, params, new String[]{
"like:code:str",
"like:name:str",
"=:isStop@is_stop:int"
});
IPage<SystemPost> iPage = systemPostMapper.selectPage(new Page<>(page, limit), queryWrapper);
IPage<SystemAuthPost> iPage = systemAuthPostMapper.selectPage(new Page<>(page, limit), queryWrapper);
List<SystemPostVo> list = new ArrayList<>();
for (SystemPost systemPost : iPage.getRecords()) {
for (SystemAuthPost systemAuthPost : iPage.getRecords()) {
SystemPostVo vo = new SystemPostVo();
BeanUtils.copyProperties(systemPost, vo);
BeanUtils.copyProperties(systemAuthPost, vo);
vo.setCreateTime(TimeUtil.timestampToDate(systemPost.getCreateTime()));
vo.setUpdateTime(TimeUtil.timestampToDate(systemPost.getUpdateTime()));
vo.setCreateTime(TimeUtil.timestampToDate(systemAuthPost.getCreateTime()));
vo.setUpdateTime(TimeUtil.timestampToDate(systemAuthPost.getUpdateTime()));
list.add(vo);
}
@@ -107,20 +107,20 @@ public class SystemPostServiceImpl implements ISystemPostService {
*/
@Override
public SystemPostVo detail(Integer id) {
SystemPost systemPost = systemPostMapper.selectOne(new QueryWrapper<SystemPost>()
.select(SystemPost.class, info ->
SystemAuthPost systemAuthPost = systemAuthPostMapper.selectOne(new QueryWrapper<SystemAuthPost>()
.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(systemPost, "岗位不存在");
Assert.notNull(systemAuthPost, "岗位不存在");
SystemPostVo vo = new SystemPostVo();
BeanUtils.copyProperties(systemPost, vo);
vo.setCreateTime(TimeUtil.timestampToDate(systemPost.getCreateTime()));
vo.setUpdateTime(TimeUtil.timestampToDate(systemPost.getUpdateTime()));
BeanUtils.copyProperties(systemAuthPost, vo);
vo.setCreateTime(TimeUtil.timestampToDate(systemAuthPost.getCreateTime()));
vo.setUpdateTime(TimeUtil.timestampToDate(systemAuthPost.getUpdateTime()));
return vo;
}
@@ -129,68 +129,68 @@ public class SystemPostServiceImpl implements ISystemPostService {
* 岗位新增
*
* @author fzr
* @param systemPostParam 参数
* @param systemAuthPostParam 参数
*/
@Override
public void add(SystemPostParam systemPostParam) {
Assert.isNull(systemPostMapper.selectOne(new QueryWrapper<SystemPost>()
public void add(SystemAuthPostParam systemAuthPostParam) {
Assert.isNull(systemAuthPostMapper.selectOne(new QueryWrapper<SystemAuthPost>()
.select("id,code,name")
.nested(
wq->wq.eq("code", systemPostParam.getCode())
wq->wq.eq("code", systemAuthPostParam.getCode())
.or()
.eq("name", systemPostParam.getName())
.eq("name", systemAuthPostParam.getName())
)
.eq("is_delete", 0)
.last("limit 1")), "该岗位已存在");
SystemPost model = new SystemPost();
model.setCode(systemPostParam.getCode());
model.setName(systemPostParam.getName());
model.setSort(systemPostParam.getSort());
model.setRemarks(systemPostParam.getRemarks());
model.setIsStop(systemPostParam.getIsStop());
SystemAuthPost model = new SystemAuthPost();
model.setCode(systemAuthPostParam.getCode());
model.setName(systemAuthPostParam.getName());
model.setSort(systemAuthPostParam.getSort());
model.setRemarks(systemAuthPostParam.getRemarks());
model.setIsStop(systemAuthPostParam.getIsStop());
model.setIsDelete(0);
model.setCreateTime(System.currentTimeMillis() / 1000);
model.setUpdateTime(System.currentTimeMillis() / 1000);
systemPostMapper.insert(model);
systemAuthPostMapper.insert(model);
}
/**
* 岗位编辑
*
* @author fzr
* @param systemPostParam 参数
* @param systemAuthPostParam 参数
*/
@Override
public void edit(SystemPostParam systemPostParam) {
SystemPost model = systemPostMapper.selectOne(new QueryWrapper<SystemPost>()
.select(SystemPost.class, info ->
public void edit(SystemAuthPostParam systemAuthPostParam) {
SystemAuthPost model = systemAuthPostMapper.selectOne(new QueryWrapper<SystemAuthPost>()
.select(SystemAuthPost.class, info ->
!info.getColumn().equals("is_delete") &&
!info.getColumn().equals("delete_time"))
.eq("id", systemPostParam.getId())
.eq("id", systemAuthPostParam.getId())
.eq("is_delete", 0)
.last("limit 1"));
Assert.notNull(model, "岗位不存在");
Assert.isNull(systemPostMapper.selectOne(new QueryWrapper<SystemPost>()
Assert.isNull(systemAuthPostMapper.selectOne(new QueryWrapper<SystemAuthPost>()
.select("id,code,name")
.ne("id", systemPostParam.getId())
.ne("id", systemAuthPostParam.getId())
.nested(
wq->wq.eq("code", systemPostParam.getCode())
wq->wq.eq("code", systemAuthPostParam.getCode())
.or()
.eq("name", systemPostParam.getName())
.eq("name", systemAuthPostParam.getName())
)
.eq("is_delete", 0)
.last("limit 1")), "该岗位已存在");
model.setCode(systemPostParam.getCode());
model.setName(systemPostParam.getName());
model.setSort(systemPostParam.getSort());
model.setRemarks(systemPostParam.getRemarks());
model.setIsStop(systemPostParam.getIsStop());
model.setCode(systemAuthPostParam.getCode());
model.setName(systemAuthPostParam.getName());
model.setSort(systemAuthPostParam.getSort());
model.setRemarks(systemAuthPostParam.getRemarks());
model.setIsStop(systemAuthPostParam.getIsStop());
model.setUpdateTime(System.currentTimeMillis() / 1000);
systemPostMapper.updateById(model);
systemAuthPostMapper.updateById(model);
}
/**
@@ -201,7 +201,7 @@ public class SystemPostServiceImpl implements ISystemPostService {
*/
@Override
public void del(Integer id) {
SystemPost model = systemPostMapper.selectOne(new QueryWrapper<SystemPost>()
SystemAuthPost model = systemAuthPostMapper.selectOne(new QueryWrapper<SystemAuthPost>()
.select("id,code,name")
.eq("id", id)
.eq("is_delete", 0)
@@ -209,17 +209,17 @@ public class SystemPostServiceImpl implements ISystemPostService {
Assert.notNull(model, "岗位不存在");
SystemAdmin systemAdmin = systemAdminMapper.selectOne(new QueryWrapper<SystemAdmin>()
SystemAuthAdmin systemAuthAdmin = systemAuthAdminMapper.selectOne(new QueryWrapper<SystemAuthAdmin>()
.select("id,nickname")
.eq("post_id", id)
.eq("is_delete", 0)
.last("limit 1"));
Assert.isNull(systemAdmin, "该岗位已被管理员使用,请先移除");
Assert.isNull(systemAuthAdmin, "该岗位已被管理员使用,请先移除");
model.setIsDelete(1);
model.setDeleteTime(System.currentTimeMillis() / 1000);
systemPostMapper.updateById(model);
systemAuthPostMapper.updateById(model);
}
}

197
server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemAuthRoleServiceImpl.java Normal file
View File

@@ -0,0 +1,197 @@
package com.hxkj.admin.service.system.impl;
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.hxkj.admin.config.AdminConfig;
import com.hxkj.admin.service.system.ISystemAuthPermService;
import com.hxkj.admin.service.system.ISystemAuthRoleService;
import com.hxkj.admin.validate.common.PageParam;
import com.hxkj.admin.validate.system.SystemAuthRoleParam;
import com.hxkj.admin.vo.system.SystemRoleVo;
import com.hxkj.common.core.PageResult;
import com.hxkj.common.entity.system.SystemAuthAdmin;
import com.hxkj.common.entity.system.SystemAuthRole;
import com.hxkj.common.mapper.system.SystemAuthAdminMapper;
import com.hxkj.common.mapper.system.SystemAuthRoleMapper;
import com.hxkj.common.utils.RedisUtil;
import com.hxkj.common.utils.TimeUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
/**
* 系统角色服务实现类
*/
@Service
public class SystemAuthRoleServiceImpl implements ISystemAuthRoleService {
@Resource
SystemAuthAdminMapper systemAuthAdminMapper;
@Resource
SystemAuthRoleMapper systemAuthRoleMapper;
@Resource
ISystemAuthPermService iSystemAuthPermService;
/**
* 角色列表
*
* @author fzr
* @param pageParam 参数
* @return PageResult<SysRoleListVo>
*/
@Override
public PageResult<SystemRoleVo> list(@Validated PageParam pageParam) {
Integer page = pageParam.getPageNo();
Integer limit = pageParam.getPageSize();
QueryWrapper<SystemAuthRole> queryWrapper = new QueryWrapper<>();
queryWrapper.orderByDesc(Arrays.asList("sort", "id"));
IPage<SystemAuthRole> iPage = systemAuthRoleMapper.selectPage(new Page<>(page, limit), queryWrapper);
List<SystemRoleVo> list = new ArrayList<>();
for (SystemAuthRole systemAuthRole : iPage.getRecords()) {
SystemRoleVo vo = new SystemRoleVo();
BeanUtils.copyProperties(systemAuthRole, vo);
Integer member = systemAuthAdminMapper.selectCount(new QueryWrapper<SystemAuthAdmin>()
.eq("is_delete", 0)
.eq("role", systemAuthRole.getId()));
vo.setMenus(new ArrayList<>());
vo.setMember(member);
vo.setCreateTime(TimeUtil.timestampToDate(systemAuthRole.getCreateTime()));
vo.setUpdateTime(TimeUtil.timestampToDate(systemAuthRole.getUpdateTime()));
list.add(vo);
}
return PageResult.iPageHandle(iPage.getTotal(), iPage.getCurrent(), iPage.getSize(), list);
}
/**
* 角色详情
*
* @author fzr
* @param id 主键参数
* @return SysRole
*/
@Override
public SystemRoleVo detail(Integer id) {
SystemAuthRole systemAuthRole = systemAuthRoleMapper.selectOne(new QueryWrapper<SystemAuthRole>()
.eq("id", id)
.last("limit 1"));
Assert.notNull(systemAuthRole, "角色已不存在!");
Integer member = systemAuthAdminMapper.selectCount(new QueryWrapper<SystemAuthAdmin>()
.eq("is_delete", 0)
.eq("role", systemAuthRole.getId()));
SystemRoleVo vo = new SystemRoleVo();
BeanUtils.copyProperties(systemAuthRole, vo);
vo.setMember(member);
vo.setMenus(iSystemAuthPermService.selectMenuIdsByRoleId(systemAuthRole.getId()));
vo.setCreateTime(TimeUtil.timestampToDate(systemAuthRole.getCreateTime()));
vo.setUpdateTime(TimeUtil.timestampToDate(systemAuthRole.getUpdateTime()));
return vo;
}
/**
* 新增角色
*
* @author fzr
* @param systemAuthRoleParam 参数
*/
@Override
@Transactional
public void add(SystemAuthRoleParam systemAuthRoleParam) {
Assert.isNull(systemAuthRoleMapper.selectOne(new QueryWrapper<SystemAuthRole>()
.select("id,name")
.eq("name", systemAuthRoleParam.getName().trim())
.last("limit 1")), "角色名称已存在!");
SystemAuthRole model = new SystemAuthRole();
model.setName(systemAuthRoleParam.getName().trim());
model.setRemark(systemAuthRoleParam.getRemark());
model.setIsDisable(systemAuthRoleParam.getIsDisable());
model.setCreateTime(System.currentTimeMillis() / 1000);
model.setUpdateTime(System.currentTimeMillis() / 1000);
systemAuthRoleMapper.insert(model);
System.out.println(model.getId());
System.out.println(systemAuthRoleParam.getMenuIds());
iSystemAuthPermService.batchSaveByMenuIds(model.getId(), systemAuthRoleParam.getMenuIds());
}
/**
* 编辑角色
*
* @author fzr
* @param systemAuthRoleParam 参数
*/
@Override
@Transactional
public void edit(SystemAuthRoleParam systemAuthRoleParam) {
Assert.notNull(systemAuthRoleMapper.selectOne(new QueryWrapper<SystemAuthRole>()
.select("id,name")
.eq("id", systemAuthRoleParam.getId())
.last("limit 1")), "角色已不存在!");
Assert.isNull(systemAuthRoleMapper.selectOne(new QueryWrapper<SystemAuthRole>()
.select("id,name")
.ne("id", systemAuthRoleParam.getId())
.eq("name", systemAuthRoleParam.getName().trim())
.last("limit 1")), "角色名称已存在!");
SystemAuthRole model = new SystemAuthRole();
model.setId(systemAuthRoleParam.getId());
model.setName(systemAuthRoleParam.getName().trim());
model.setRemark(systemAuthRoleParam.getRemark());
model.setSort(systemAuthRoleParam.getSort());
model.setIsDisable(systemAuthRoleParam.getIsDisable());
model.setUpdateTime(System.currentTimeMillis() / 1000);
systemAuthRoleMapper.updateById(model);
iSystemAuthPermService.batchDeleteByRoleId(systemAuthRoleParam.getId());
iSystemAuthPermService.batchSaveByMenuIds(systemAuthRoleParam.getId(), systemAuthRoleParam.getMenuIds());
iSystemAuthPermService.cacheRoleMenusByRoleId(systemAuthRoleParam.getId());
}
/**
* 删除角色
*
* @author fzr
* @param id 主键参数
*/
@Override
@Transactional
public void del(Integer id) {
Assert.notNull(
systemAuthRoleMapper.selectOne(new QueryWrapper<SystemAuthRole>()
.select("id", "name")
.eq("id", id)
.last("limit 1")),
"角色已不存在!");
Assert.isNull(systemAuthAdminMapper.selectOne(new QueryWrapper<SystemAuthAdmin>()
.select("id", "role", "nickname")
.eq("role", id)
.eq("is_delete", 0)),
"角色已被管理员使用,请先移除");
systemAuthRoleMapper.deleteById(id);
iSystemAuthPermService.batchDeleteByRoleId(id);
RedisUtil.hDel(AdminConfig.backstageRolesKey, String.valueOf(id));
}
}

218
server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemDeptServiceImpl.java
View File

@@ -1,218 +0,0 @@
package com.hxkj.admin.service.system.impl;
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Assert;
import com.hxkj.admin.service.system.ISystemDeptService;
import com.hxkj.admin.validate.system.SystemDeptParam;
import com.hxkj.admin.vo.system.SystemDeptVo;
import com.hxkj.common.entity.system.SystemAdmin;
import com.hxkj.common.entity.system.SystemDept;
import com.hxkj.common.mapper.system.SystemAdminMapper;
import com.hxkj.common.mapper.system.SystemDeptMapper;
import com.hxkj.common.utils.ArrayUtil;
import com.hxkj.common.utils.TimeUtil;
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;
import java.util.Map;
@Service
class SystemDeptServiceImpl implements ISystemDeptService {
@Resource
SystemDeptMapper systemDeptMapper;
@Resource
SystemAdminMapper systemAdminMapper;
/**
* 岗位所有
*
* @author fzr
* @return List<SystemPostVo>
*/
@Override
public List<SystemDeptVo> all() {
List<SystemDept> systemDeptList = systemDeptMapper.selectList(new QueryWrapper<SystemDept>()
.gt("pid", 0)
.eq("is_delete", 0)
.orderByDesc((Arrays.asList("id", "sort"))));
List<SystemDeptVo> adminVoArrayList = new ArrayList<>();
for (SystemDept systemDept : systemDeptList) {
SystemDeptVo vo = new SystemDeptVo();
BeanUtils.copyProperties(systemDept, vo);
vo.setUpdateTime(TimeUtil.timestampToDate(systemDept.getUpdateTime()));
vo.setCreateTime(TimeUtil.timestampToDate(systemDept.getCreateTime()));
adminVoArrayList.add(vo);
}
return adminVoArrayList;
}
/**
* 部门列表
*
* @author fzr
* @param params 搜索参数
* @return JSONArray
*/
@Override
public JSONArray list(Map<String, String> params) {
QueryWrapper<SystemDept> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("is_delete", 0);
queryWrapper.orderByAsc(Arrays.asList("sort", "id"));
queryWrapper.select(SystemDept.class, info ->
!info.getColumn().equals("is_delete") &&
!info.getColumn().equals("delete_time"));
systemDeptMapper.setSearch(queryWrapper, params, new String[]{
"like:name:str",
"=:isStop@is_stop:int"
});
List<SystemDept> systemDeptList = systemDeptMapper.selectList(queryWrapper);
List<SystemDeptVo> lists = new ArrayList<>();
for (SystemDept systemDept : systemDeptList) {
SystemDeptVo vo = new SystemDeptVo();
BeanUtils.copyProperties(systemDept, vo);
vo.setCreateTime(TimeUtil.timestampToDate(systemDept.getCreateTime()));
vo.setUpdateTime(TimeUtil.timestampToDate(systemDept.getUpdateTime()));
lists.add(vo);
}
JSONArray jsonArray = JSONArray.parseArray(JSONArray.toJSONString(lists));
return ArrayUtil.listToTree(jsonArray, "id", "pid", "children");
}
/**
* 部门详情
*
* @author fzr
* @param id 主键
* @return SystemDeptVo
*/
@Override
public SystemDeptVo detail(Integer id) {
SystemDept systemDept = systemDeptMapper.selectOne(
new QueryWrapper<SystemDept>()
.select(SystemDept.class, info ->
!info.getColumn().equals("is_delete") &&
!info.getColumn().equals("delete_time"))
.eq("id", id)
.eq("is_delete", 0)
.last("limit 1"));
Assert.notNull(systemDept, "部门已不存在!");
SystemDeptVo vo = new SystemDeptVo();
BeanUtils.copyProperties(systemDept, vo);
vo.setCreateTime(TimeUtil.timestampToDate(systemDept.getCreateTime()));
vo.setUpdateTime(TimeUtil.timestampToDate(systemDept.getUpdateTime()));
return vo;
}
/**
* 部门新增
*
* @author fzr
* @param systemDeptParam 参数
*/
@Override
public void add(SystemDeptParam systemDeptParam) {
if (systemDeptParam.getPid() == 0) {
SystemDept systemDept = systemDeptMapper.selectOne(
new QueryWrapper<SystemDept>()
.select("id,pid,name")
.eq("pid", 0)
.eq("is_delete", 0)
.last("limit 1"));
Assert.isNull(systemDept, "顶级部门只允许有一个");
}
SystemDept model = new SystemDept();
model.setPid(systemDeptParam.getPid());
model.setName(systemDeptParam.getName());
model.setDuty(systemDeptParam.getDuty());
model.setMobile(systemDeptParam.getMobile());
model.setSort(systemDeptParam.getSort());
model.setIsStop(systemDeptParam.getIsStop());
model.setIsDelete(0);
model.setCreateTime(System.currentTimeMillis() / 1000);
model.setUpdateTime(System.currentTimeMillis() / 1000);
systemDeptMapper.insert(model);
}
/**
* 部门编辑
*
* @author fzr
* @param systemDeptParam 参数
*/
@Override
public void edit(SystemDeptParam systemDeptParam) {
SystemDept model = systemDeptMapper.selectOne(
new QueryWrapper<SystemDept>()
.select(SystemDept.class, info ->
!info.getColumn().equals("is_delete") &&
!info.getColumn().equals("delete_time"))
.eq("id", systemDeptParam.getId())
.eq("is_delete", 0)
.last("limit 1"));
Assert.notNull(model, "部门不存在");
Assert.isFalse((model.getPid() == 0 && systemDeptParam.getPid() > 0), "顶级部门不能修改上级");
Assert.isFalse(systemDeptParam.getId().equals(systemDeptParam.getPid()), "上级部门不能是自己");
model.setPid(systemDeptParam.getPid());
model.setName(systemDeptParam.getName());
model.setDuty(systemDeptParam.getDuty());
model.setMobile(systemDeptParam.getMobile());
model.setSort(systemDeptParam.getSort());
model.setIsStop(systemDeptParam.getIsStop());
model.setUpdateTime(System.currentTimeMillis() / 1000);
systemDeptMapper.updateById(model);
}
/**
* 部门删除
*
* @author fzr
* @param id 主键
*/
@Override
public void del(Integer id) {
SystemDept model = systemDeptMapper.selectOne(
new QueryWrapper<SystemDept>()
.select("id,pid,name")
.eq("id", id)
.eq("is_delete", 0)
.last("limit 1"));
Assert.notNull(model, "部门不存在");
Assert.isFalse((model.getPid() == 0), "顶级部门不能删除");
SystemAdmin systemAdmin = systemAdminMapper.selectOne(new QueryWrapper<SystemAdmin>()
.select("id,nickname")
.eq("dept_id", id)
.eq("is_delete", 0)
.last("limit 1"));
Assert.isNull(systemAdmin, "该部门已被管理员使用,请先移除");
model.setIsDelete(1);
model.setDeleteTime(System.currentTimeMillis() / 1000);
systemDeptMapper.updateById(model);
}
}

18
server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemLoginServiceImpl.java
View File

@@ -1,15 +1,15 @@
package com.hxkj.admin.service.system.impl;
import com.hxkj.admin.config.AdminConfig;
import com.hxkj.admin.service.system.ISystemAdminService;
import com.hxkj.admin.service.system.ISystemAuthAdminService;
import com.hxkj.admin.service.system.ISystemLoginService;
import com.hxkj.admin.validate.system.SystemLoginParam;
import com.hxkj.common.entity.system.SystemAdmin;
import com.hxkj.common.entity.system.SystemAuthAdmin;
import com.hxkj.common.entity.system.SystemLogLogin;
import com.hxkj.common.enums.HttpEnum;
import com.hxkj.common.exception.LoginException;
import com.hxkj.common.exception.OperateException;
import com.hxkj.common.mapper.system.SystemAdminMapper;
import com.hxkj.common.mapper.system.SystemAuthAdminMapper;
import com.hxkj.common.mapper.system.SystemLogLoginMapper;
import com.hxkj.common.utils.*;
import nl.bitwalker.useragentutils.UserAgent;
@@ -33,10 +33,10 @@ public class SystemLoginServiceImpl implements ISystemLoginService {
SystemLogLoginMapper systemLogLoginMapper;
@Resource
SystemAdminMapper systemAdminMapper;
SystemAuthAdminMapper systemAuthAdminMapper;
@Resource
ISystemAdminService iSystemAdminService;
ISystemAuthAdminService iSystemAuthAdminService;
private static final Logger log = LoggerFactory.getLogger(SystemLoginServiceImpl.class);
@@ -53,7 +53,7 @@ public class SystemLoginServiceImpl implements ISystemLoginService {
String username = systemLoginParam.getUsername();
String password = systemLoginParam.getPassword();
SystemAdmin sysAdmin = iSystemAdminService.findByUsername(username);
SystemAuthAdmin sysAdmin = iSystemAuthAdminService.findByUsername(username);
if (sysAdmin == null || sysAdmin.getIsDelete() == 1) {
this.recordLoginLog(0, systemLoginParam.getUsername(), HttpEnum.LOGIN_ACCOUNT_ERROR.getMsg());
throw new LoginException(HttpEnum.LOGIN_ACCOUNT_ERROR.getCode(), HttpEnum.LOGIN_ACCOUNT_ERROR.getMsg());
@@ -74,12 +74,12 @@ public class SystemLoginServiceImpl implements ISystemLoginService {
try {
sysAdmin.setLastLoginIp(IpUtil.getIpAddress());
sysAdmin.setLastLoginTime(System.currentTimeMillis() / 1000);
systemAdminMapper.updateById(sysAdmin);
systemAuthAdminMapper.updateById(sysAdmin);
// 缓存登录信息
String token = ToolsUtil.makeToken();
RedisUtil.set(AdminConfig.backstageTokenKey+token, sysAdmin.getId(), 7200);
iSystemAdminService.cacheAdminUserByUid(sysAdmin.getId());
iSystemAuthAdminService.cacheAdminUserByUid(sysAdmin.getId());
// 返回登录信息
Map<String, Object> response = new LinkedHashMap<>();
@@ -88,7 +88,7 @@ public class SystemLoginServiceImpl implements ISystemLoginService {
// 更新登录信息
sysAdmin.setLastLoginIp(IpUtil.getIpAddress());
sysAdmin.setLastLoginTime(TimeUtil.timestamp());
systemAdminMapper.updateById(sysAdmin);
systemAuthAdminMapper.updateById(sysAdmin);
// 记录登录日志
this.recordLoginLog(sysAdmin.getId(), systemLoginParam.getUsername(), "");

6
server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemLogServerImpl.java → server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemLogsServerImpl.java
View File

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.query.MPJQueryWrapper;
import com.hxkj.admin.service.system.ISystemLogServer;
import com.hxkj.admin.service.system.ISystemLogsServer;
import com.hxkj.admin.validate.common.PageParam;
import com.hxkj.admin.vo.system.LogLoginVo;
import com.hxkj.admin.vo.system.LogOperateVo;
@@ -28,7 +28,7 @@ import java.util.Map;
* 系统日志服务实现类
*/
@Service
public class SystemLogServerImpl implements ISystemLogServer {
public class SystemLogsServerImpl implements ISystemLogsServer {
@Resource
SystemLogOperateMapper logOperateMapper;
@@ -52,7 +52,7 @@ public class SystemLogServerImpl implements ISystemLogServer {
MPJQueryWrapper<SystemLogOperate> mpjQueryWrapper = new MPJQueryWrapper<SystemLogOperate>()
.selectAll(SystemLogOperate.class)
.select("sa.username,sa.nickname")
.leftJoin("?_system_admin sa ON sa.id=t.admin_id".replace("?_", GlobalConfig.tablePrefix))
.leftJoin("?_system_auth_admin sa ON sa.id=t.admin_id".replace("?_", GlobalConfig.tablePrefix))
.orderByDesc("id");
logOperateMapper.setSearch(mpjQueryWrapper, params, new String[]{

194
server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemMenuServiceImpl.java
View File

@@ -1,194 +0,0 @@
package com.hxkj.admin.service.system.impl;
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Assert;
import com.hxkj.admin.LikeAdminThreadLocal;
import com.hxkj.admin.config.AdminConfig;
import com.hxkj.admin.service.system.ISystemMenuService;
import com.hxkj.admin.service.system.ISystemRoleMenuService;
import com.hxkj.admin.validate.system.SystemMenuParam;
import com.hxkj.admin.vo.system.SystemMenuVo;
import com.hxkj.common.entity.system.SystemMenu;
import com.hxkj.common.mapper.system.SystemMenuMapper;
import com.hxkj.common.utils.*;
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 SystemMenuServiceImpl implements ISystemMenuService {
@Resource
SystemMenuMapper systemMenuMapper;
@Resource
ISystemRoleMenuService iSystemRoleMenuService;
/**
* 根据角色ID获取菜单
*
* @author fzr
* @param roleId 角色ID
* @return JSONArray
*/
@Override
public JSONArray selectMenuByRoleId(Integer roleId) {
Integer adminId = LikeAdminThreadLocal.getAdminId();
List<Integer> menuIds = iSystemRoleMenuService.selectMenuIdsByRoleId(roleId);
QueryWrapper<SystemMenu> queryWrapper = new QueryWrapper<>();
queryWrapper.in("menu_type", Arrays.asList("M", "C"));
queryWrapper.eq("is_disable", 0);
queryWrapper.orderByAsc(Arrays.asList("menu_sort", "id"));
if (adminId != 1 && menuIds.size() > 0) {
queryWrapper.in("id", menuIds);
}
List<SystemMenu> systemMenus = systemMenuMapper.selectList(queryWrapper);
List<SystemMenuVo> lists = new ArrayList<>();
for (SystemMenu systemMenu : systemMenus) {
SystemMenuVo vo = new SystemMenuVo();
BeanUtils.copyProperties(systemMenu, vo);
vo.setUpdateTime(TimeUtil.timestampToDate(systemMenu.getUpdateTime()));
vo.setCreateTime(TimeUtil.timestampToDate(systemMenu.getCreateTime()));
lists.add(vo);
}
JSONArray jsonArray = JSONArray.parseArray(JSONArray.toJSONString(lists));
return ArrayUtil.listToTree(jsonArray, "id", "pid", "children");
}
/**
* 菜单列表
*
* @author fzr
* @return JSONArray
*/
@Override
public JSONArray list() {
QueryWrapper<SystemMenu> queryWrapper = new QueryWrapper<>();
queryWrapper.orderByAsc(Arrays.asList("menu_sort", "id"));
List<SystemMenu> systemMenus = systemMenuMapper.selectList(queryWrapper);
List<SystemMenuVo> lists = new ArrayList<>();
for (SystemMenu systemMenu : systemMenus) {
SystemMenuVo vo = new SystemMenuVo();
BeanUtils.copyProperties(systemMenu, vo);
vo.setCreateTime(TimeUtil.timestampToDate(systemMenu.getCreateTime()));
vo.setUpdateTime(TimeUtil.timestampToDate(systemMenu.getUpdateTime()));
lists.add(vo);
}
JSONArray jsonArray = JSONArray.parseArray(JSONArray.toJSONString(lists));
return ArrayUtil.listToTree(jsonArray, "id", "pid", "children");
}
/**
* 菜单详情
*
* @author fzr
* @param id 主键参数
* @return SysMenu
*/
@Override
public SystemMenuVo detail(Integer id) {
SystemMenu systemMenu = systemMenuMapper.selectOne(new QueryWrapper<SystemMenu>().eq("id", id));
Assert.notNull(systemMenu, "菜单已不存在!");
SystemMenuVo vo = new SystemMenuVo();
BeanUtils.copyProperties(systemMenu, vo);
vo.setCreateTime(TimeUtil.timestampToDate(systemMenu.getCreateTime()));
vo.setUpdateTime(TimeUtil.timestampToDate(systemMenu.getUpdateTime()));
return vo;
}
/**
* 新增菜单
*
* @author fzr
* @param systemMenuParam 参数
*/
@Override
public void add(SystemMenuParam systemMenuParam) {
SystemMenu model = new SystemMenu();
model.setPid(systemMenuParam.getPid());
model.setMenuType(systemMenuParam.getMenuType());
model.setMenuName(systemMenuParam.getMenuName());
model.setMenuIcon(systemMenuParam.getMenuIcon());
model.setMenuSort(systemMenuParam.getMenuSort());
model.setPerms(systemMenuParam.getPerms());
model.setPaths(systemMenuParam.getPaths());
model.setComponent(systemMenuParam.getComponent());
model.setSelected(systemMenuParam.getSelected());
model.setParams(systemMenuParam.getParams());
model.setIsCache(systemMenuParam.getIsCache());
model.setIsShow(systemMenuParam.getIsShow());
model.setIsDisable(systemMenuParam.getIsDisable());
model.setCreateTime(System.currentTimeMillis() / 1000);
model.setUpdateTime(System.currentTimeMillis() / 1000);
systemMenuMapper.insert(model);
RedisUtil.del(AdminConfig.backstageRolesKey);
}
/**
* 编辑菜单
*
* @author fzr
* @param systemMenuParam 菜单
*/
@Override
public void edit(SystemMenuParam systemMenuParam) {
SystemMenu model = systemMenuMapper.selectOne(new QueryWrapper<SystemMenu>().eq("id", systemMenuParam.getId()));
Assert.notNull(model, "菜单已不存在!");
model.setMenuType(systemMenuParam.getMenuType());
model.setMenuName(systemMenuParam.getMenuName());
model.setMenuIcon(systemMenuParam.getMenuIcon());
model.setMenuSort(systemMenuParam.getMenuSort());
model.setPaths(systemMenuParam.getPaths());
model.setPerms(systemMenuParam.getPerms());
model.setComponent(systemMenuParam.getComponent());
model.setPid(systemMenuParam.getPid());
model.setSelected(systemMenuParam.getSelected());
model.setParams(systemMenuParam.getParams());
model.setIsCache(systemMenuParam.getIsCache());
model.setIsShow(systemMenuParam.getIsShow());
model.setIsDisable(systemMenuParam.getIsDisable());
model.setUpdateTime(System.currentTimeMillis() / 1000);
systemMenuMapper.updateById(model);
RedisUtil.del(AdminConfig.backstageRolesKey);
}
/**
* 删除菜单
*
* @author fzr
* @param id 主键参数
*/
@Override
public void del(Integer id) {
SystemMenu model = systemMenuMapper.selectOne(new QueryWrapper<SystemMenu>().eq("id", id));
Assert.notNull(model, "菜单已不存在!");
Assert.isNull(systemMenuMapper.selectOne(
new QueryWrapper<SystemMenu>().eq("pid", id)),
"请先删除子菜单再操作！");
systemMenuMapper.deleteById(id);
iSystemRoleMenuService.batchDeleteByMenuId(id);
RedisUtil.del(AdminConfig.backstageRolesKey);
}
}

197
server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemRoleServiceImpl.java
View File

@@ -1,197 +0,0 @@
package com.hxkj.admin.service.system.impl;
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.hxkj.admin.config.AdminConfig;
import com.hxkj.admin.service.system.ISystemRoleMenuService;
import com.hxkj.admin.service.system.ISystemRoleService;
import com.hxkj.admin.validate.common.PageParam;
import com.hxkj.admin.validate.system.SystemRoleParam;
import com.hxkj.admin.vo.system.SystemRoleVo;
import com.hxkj.common.core.PageResult;
import com.hxkj.common.entity.system.SystemAdmin;
import com.hxkj.common.entity.system.SystemRole;
import com.hxkj.common.mapper.system.SystemAdminMapper;
import com.hxkj.common.mapper.system.SystemRoleMapper;
import com.hxkj.common.utils.RedisUtil;
import com.hxkj.common.utils.TimeUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
/**
* 系统角色服务实现类
*/
@Service
public class SystemRoleServiceImpl implements ISystemRoleService {
@Resource
SystemAdminMapper systemAdminMapper;
@Resource
SystemRoleMapper systemRoleMapper;
@Resource
ISystemRoleMenuService iSystemRoleMenuService;
/**
* 角色列表
*
* @author fzr
* @param pageParam 参数
* @return PageResult<SysRoleListVo>
*/
@Override
public PageResult<SystemRoleVo> list(@Validated PageParam pageParam) {
Integer page = pageParam.getPageNo();
Integer limit = pageParam.getPageSize();
QueryWrapper<SystemRole> queryWrapper = new QueryWrapper<>();
queryWrapper.orderByDesc(Arrays.asList("sort", "id"));
IPage<SystemRole> iPage = systemRoleMapper.selectPage(new Page<>(page, limit), queryWrapper);
List<SystemRoleVo> list = new ArrayList<>();
for (SystemRole systemRole : iPage.getRecords()) {
SystemRoleVo vo = new SystemRoleVo();
BeanUtils.copyProperties(systemRole, vo);
Integer member = systemAdminMapper.selectCount(new QueryWrapper<SystemAdmin>()
.eq("is_delete", 0)
.eq("role", systemRole.getId()));
vo.setMenus(new ArrayList<>());
vo.setMember(member);
vo.setCreateTime(TimeUtil.timestampToDate(systemRole.getCreateTime()));
vo.setUpdateTime(TimeUtil.timestampToDate(systemRole.getUpdateTime()));
list.add(vo);
}
return PageResult.iPageHandle(iPage.getTotal(), iPage.getCurrent(), iPage.getSize(), list);
}
/**
* 角色详情
*
* @author fzr
* @param id 主键参数
* @return SysRole
*/
@Override
public SystemRoleVo detail(Integer id) {
SystemRole systemRole = systemRoleMapper.selectOne(new QueryWrapper<SystemRole>()
.eq("id", id)
.last("limit 1"));
Assert.notNull(systemRole, "角色已不存在!");
Integer member = systemAdminMapper.selectCount(new QueryWrapper<SystemAdmin>()
.eq("is_delete", 0)
.eq("role", systemRole.getId()));
SystemRoleVo vo = new SystemRoleVo();
BeanUtils.copyProperties(systemRole, vo);
vo.setMember(member);
vo.setMenus(iSystemRoleMenuService.selectMenuIdsByRoleId(systemRole.getId()));
vo.setCreateTime(TimeUtil.timestampToDate(systemRole.getCreateTime()));
vo.setUpdateTime(TimeUtil.timestampToDate(systemRole.getUpdateTime()));
return vo;
}
/**
* 新增角色
*
* @author fzr
* @param systemRoleParam 参数
*/
@Override
@Transactional
public void add(SystemRoleParam systemRoleParam) {
Assert.isNull(systemRoleMapper.selectOne(new QueryWrapper<SystemRole>()
.select("id,name")
.eq("name", systemRoleParam.getName().trim())
.last("limit 1")), "角色名称已存在!");
SystemRole model = new SystemRole();
model.setName(systemRoleParam.getName().trim());
model.setRemark(systemRoleParam.getRemark());
model.setIsDisable(systemRoleParam.getIsDisable());
model.setCreateTime(System.currentTimeMillis() / 1000);
model.setUpdateTime(System.currentTimeMillis() / 1000);
systemRoleMapper.insert(model);
System.out.println(model.getId());
System.out.println(systemRoleParam.getMenuIds());
iSystemRoleMenuService.batchSaveByMenuIds(model.getId(), systemRoleParam.getMenuIds());
}
/**
* 编辑角色
*
* @author fzr
* @param systemRoleParam 参数
*/
@Override
@Transactional
public void edit(SystemRoleParam systemRoleParam) {
Assert.notNull(systemRoleMapper.selectOne(new QueryWrapper<SystemRole>()
.select("id,name")
.eq("id", systemRoleParam.getId())
.last("limit 1")), "角色已不存在!");
Assert.isNull(systemRoleMapper.selectOne(new QueryWrapper<SystemRole>()
.select("id,name")
.ne("id", systemRoleParam.getId())
.eq("name", systemRoleParam.getName().trim())
.last("limit 1")), "角色名称已存在!");
SystemRole model = new SystemRole();
model.setId(systemRoleParam.getId());
model.setName(systemRoleParam.getName().trim());
model.setRemark(systemRoleParam.getRemark());
model.setSort(systemRoleParam.getSort());
model.setIsDisable(systemRoleParam.getIsDisable());
model.setUpdateTime(System.currentTimeMillis() / 1000);
systemRoleMapper.updateById(model);
iSystemRoleMenuService.batchDeleteByRoleId(systemRoleParam.getId());
iSystemRoleMenuService.batchSaveByMenuIds(systemRoleParam.getId(), systemRoleParam.getMenuIds());
iSystemRoleMenuService.cacheRoleMenusByRoleId(systemRoleParam.getId());
}
/**
* 删除角色
*
* @author fzr
* @param id 主键参数
*/
@Override
@Transactional
public void del(Integer id) {
Assert.notNull(
systemRoleMapper.selectOne(new QueryWrapper<SystemRole>()
.select("id", "name")
.eq("id", id)
.last("limit 1")),
"角色已不存在!");
Assert.isNull(systemAdminMapper.selectOne(new QueryWrapper<SystemAdmin>()
.select("id", "role", "nickname")
.eq("role", id)
.eq("is_delete", 0)),
"角色已被管理员使用,请先移除");
systemRoleMapper.deleteById(id);
iSystemRoleMenuService.batchDeleteByRoleId(id);
RedisUtil.hDel(AdminConfig.backstageRolesKey, String.valueOf(id));
}
}

2
server/like-admin/src/main/java/com/hxkj/admin/validate/article/ArticleTextParam.java → server/like-admin/src/main/java/com/hxkj/admin/validate/article/ArticleArchivesParam.java
View File

@@ -18,7 +18,7 @@ import java.io.Serializable;
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class ArticleTextParam implements Serializable {
public class ArticleArchivesParam implements Serializable {
private static final long serialVersionUID = 1L;

4
server/like-admin/src/main/java/com/hxkj/admin/validate/article/ArticleCateParam.java → server/like-admin/src/main/java/com/hxkj/admin/validate/article/ArticleCategoryParam.java
View File

@@ -18,7 +18,7 @@ import java.io.Serializable;
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class ArticleCateParam implements Serializable {
public class ArticleCategoryParam implements Serializable {
private static final long serialVersionUID = 1L;
@@ -26,7 +26,7 @@ public class ArticleCateParam implements Serializable {
public interface update{}
public interface delete{}
@IDMust(message = "id参数必传且需大于0", groups = {ArticleTextParam.create.class, ArticleTextParam.delete.class})
@IDMust(message = "id参数必传且需大于0", groups = {ArticleArchivesParam.create.class, ArticleArchivesParam.delete.class})
private Integer id;
@NotEmpty(message = "分类名称不能为空", groups = {create.class, update.class})

2
server/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemAdminParam.java → server/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemAuthAdminParam.java
View File

@@ -16,7 +16,7 @@ import java.io.Serializable;
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class SystemAdminParam implements Serializable {
public class SystemAuthAdminParam implements Serializable {
private static final long serialVersionUID = 1L;

2
server/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemDeptParam.java → server/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemAuthDeptParam.java
View File

@@ -17,7 +17,7 @@ import javax.validation.constraints.Pattern;
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class SystemDeptParam {
public class SystemAuthDeptParam {
public interface create{}
public interface update{}

2
server/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemMenuParam.java → server/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemAuthMenuParam.java
View File

@@ -18,7 +18,7 @@ import java.io.Serializable;
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class SystemMenuParam implements Serializable {
public class SystemAuthMenuParam implements Serializable {
public interface create{}
public interface update{}

2
server/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemPostParam.java → server/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemAuthPostParam.java
View File

@@ -15,7 +15,7 @@ import javax.validation.constraints.NotNull;
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class SystemPostParam {
public class SystemAuthPostParam {
public interface create{}
public interface update{}

5
server/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemRoleParam.java → server/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemAuthRoleParam.java
View File

@@ -11,10 +11,13 @@ import javax.validation.constraints.Max;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
/**
* 系统角色参数
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class SystemRoleParam implements Serializable {
public class SystemAuthRoleParam implements Serializable {
public interface create{}
public interface update{}

2
server/like-common/src/main/java/com/hxkj/common/entity/system/SystemAdmin.java → server/like-common/src/main/java/com/hxkj/common/entity/system/SystemAuthAdmin.java
View File

@@ -10,7 +10,7 @@ import java.io.Serializable;
* 系统管理员实体
*/
@Data
public class SystemAdmin implements Serializable {
public class SystemAuthAdmin implements Serializable {
private static final long serialVersionUID = 1L;

2
server/like-common/src/main/java/com/hxkj/common/entity/system/SystemDept.java → server/like-common/src/main/java/com/hxkj/common/entity/system/SystemAuthDept.java
View File

@@ -10,7 +10,7 @@ import java.io.Serializable;
* 系统岗位实体
*/
@Data
public class SystemDept implements Serializable {
public class SystemAuthDept implements Serializable {
private static final long serialVersionUID = 1L;

2
server/like-common/src/main/java/com/hxkj/common/entity/system/SystemMenu.java → server/like-common/src/main/java/com/hxkj/common/entity/system/SystemAuthMenu.java
View File

@@ -10,7 +10,7 @@ import java.io.Serializable;
* 系统菜单实体
*/
@Data
public class SystemMenu implements Serializable {
public class SystemAuthMenu implements Serializable {
private static final long serialVersionUID = 1L;

2
server/like-common/src/main/java/com/hxkj/common/entity/system/SystemRoleMenu.java → server/like-common/src/main/java/com/hxkj/common/entity/system/SystemAuthPerm.java
View File

@@ -10,7 +10,7 @@ import java.io.Serializable;
* 系统角色菜单实体
*/
@Data
public class SystemRoleMenu implements Serializable {
public class SystemAuthPerm implements Serializable {
private static final long serialVersionUID = 1L;

4
server/like-common/src/main/java/com/hxkj/common/entity/system/SystemPost.java → server/like-common/src/main/java/com/hxkj/common/entity/system/SystemAuthPost.java
View File

@@ -7,10 +7,10 @@ import lombok.Data;
import java.io.Serializable;
/**
* 岗位管理
* 系统岗位管理
*/
@Data
public class SystemPost implements Serializable {
public class SystemAuthPost implements Serializable {
private static final long serialVersionUID = 1L;

2
server/like-common/src/main/java/com/hxkj/common/entity/system/SystemRole.java → server/like-common/src/main/java/com/hxkj/common/entity/system/SystemAuthRole.java
View File

@@ -10,7 +10,7 @@ import java.io.Serializable;
* 系统角色实体
*/
@Data
public class SystemRole implements Serializable {
public class SystemAuthRole implements Serializable {
private static final long serialVersionUID = 1L;

12
server/like-common/src/main/java/com/hxkj/common/mapper/system/SystemAuthAdminMapper.java Normal file
View File

@@ -0,0 +1,12 @@
package com.hxkj.common.mapper.system;
import com.hxkj.common.core.basics.IBaseMapper;
import com.hxkj.common.entity.system.SystemAuthAdmin;
import org.apache.ibatis.annotations.Mapper;
/**
* 系统管理员Mapper
*/
@Mapper
public interface SystemAuthAdminMapper extends IBaseMapper<SystemAuthAdmin> {
}

6
server/like-common/src/main/java/com/hxkj/common/mapper/system/SystemMenuMapper.java → server/like-common/src/main/java/com/hxkj/common/mapper/system/SystemAuthDeptMapper.java
View File

@@ -1,12 +1,12 @@
package com.hxkj.common.mapper.system;
import com.hxkj.common.core.basics.IBaseMapper;
import com.hxkj.common.entity.system.SystemMenu;
import com.hxkj.common.entity.system.SystemAuthDept;
import org.apache.ibatis.annotations.Mapper;
/**
* 系统菜单
* 系统岗位Mapper
*/
@Mapper
public interface SystemMenuMapper extends IBaseMapper<SystemMenu> {
public interface SystemAuthDeptMapper extends IBaseMapper<SystemAuthDept> {
}

6
server/like-common/src/main/java/com/hxkj/common/mapper/system/SystemPostMapper.java → server/like-common/src/main/java/com/hxkj/common/mapper/system/SystemAuthMenuMapper.java
View File

@@ -1,12 +1,12 @@
package com.hxkj.common.mapper.system;
import com.hxkj.common.core.basics.IBaseMapper;
import com.hxkj.common.entity.system.SystemPost;
import com.hxkj.common.entity.system.SystemAuthMenu;
import org.apache.ibatis.annotations.Mapper;
/**
* 系统岗位
* 系统菜单Mapper
*/
@Mapper
public interface SystemPostMapper extends IBaseMapper<SystemPost> {
public interface SystemAuthMenuMapper extends IBaseMapper<SystemAuthMenu> {
}

6
server/like-common/src/main/java/com/hxkj/common/mapper/system/SystemAdminMapper.java → server/like-common/src/main/java/com/hxkj/common/mapper/system/SystemAuthPermMapper.java
View File

@@ -1,12 +1,12 @@
package com.hxkj.common.mapper.system;
import com.hxkj.common.core.basics.IBaseMapper;
import com.hxkj.common.entity.system.SystemAdmin;
import com.hxkj.common.entity.system.SystemAuthPerm;
import org.apache.ibatis.annotations.Mapper;
/**
* 系统管理员
* 角色菜单Mapper
*/
@Mapper
public interface SystemAdminMapper extends IBaseMapper<SystemAdmin> {
public interface SystemAuthPermMapper extends IBaseMapper<SystemAuthPerm> {
}

6
server/like-common/src/main/java/com/hxkj/common/mapper/system/SystemDeptMapper.java → server/like-common/src/main/java/com/hxkj/common/mapper/system/SystemAuthPostMapper.java
View File

@@ -1,12 +1,12 @@
package com.hxkj.common.mapper.system;
import com.hxkj.common.core.basics.IBaseMapper;
import com.hxkj.common.entity.system.SystemDept;
import com.hxkj.common.entity.system.SystemAuthPost;
import org.apache.ibatis.annotations.Mapper;
/**
* 系统岗位
* 系统岗位Mapper
*/
@Mapper
public interface SystemDeptMapper extends IBaseMapper<SystemDept> {
public interface SystemAuthPostMapper extends IBaseMapper<SystemAuthPost> {
}

12
server/like-common/src/main/java/com/hxkj/common/mapper/system/SystemAuthRoleMapper.java Normal file
View File

@@ -0,0 +1,12 @@
package com.hxkj.common.mapper.system;
import com.hxkj.common.core.basics.IBaseMapper;
import com.hxkj.common.entity.system.SystemAuthRole;
import org.apache.ibatis.annotations.Mapper;
/**
* 系统角色Mapper
*/
@Mapper
public interface SystemAuthRoleMapper extends IBaseMapper<SystemAuthRole> {
}

12
server/like-common/src/main/java/com/hxkj/common/mapper/system/SystemRoleMapper.java
View File

@@ -1,12 +0,0 @@
package com.hxkj.common.mapper.system;
import com.hxkj.common.core.basics.IBaseMapper;
import com.hxkj.common.entity.system.SystemRole;
import org.apache.ibatis.annotations.Mapper;
/**
* 系统角色
*/
@Mapper
public interface SystemRoleMapper extends IBaseMapper<SystemRole> {
}

12
server/like-common/src/main/java/com/hxkj/common/mapper/system/SystemRoleMenuMapper.java
View File

@@ -1,12 +0,0 @@
package com.hxkj.common.mapper.system;
import com.hxkj.common.core.basics.IBaseMapper;
import com.hxkj.common.entity.system.SystemRoleMenu;
import org.apache.ibatis.annotations.Mapper;
/**
* 角色菜单
*/
@Mapper
public interface SystemRoleMenuMapper extends IBaseMapper<SystemRoleMenu> {
}