init: 系统管理相关

“谢茂盛”
1 parent 69a3e8e7
Showing 24 changed files with 936 additions and 55 deletions
src/main/java/com/order/erp/config/AdminMetaObjectHandler.java
src/main/java/com/order/erp/controller/DeptController.java
src/main/java/com/order/erp/controller/JobController.java
src/main/java/com/order/erp/controller/MenuController.java
src/main/java/com/order/erp/controller/RoleController.java
src/main/java/com/order/erp/controller/UserController.java
src/main/java/com/order/erp/domain/dto/BaseDO.java
src/main/java/com/order/erp/domain/vo/admin/AdminAuthRoleVO.java
src/main/java/com/order/erp/domain/vo/admin/AdminAuthUserVO.java
src/main/java/com/order/erp/domain/vo/admin/AdminDeptResultVO.java
src/main/java/com/order/erp/domain/vo/admin/AdminJobResultVO.java
src/main/java/com/order/erp/domain/vo/admin/AdminMenuResult.java
src/main/java/com/order/erp/domain/vo/admin/AdminMenuVO.java
src/main/java/com/order/erp/domain/vo/admin/AdminRoleVO.java
src/main/java/com/order/erp/domain/vo/admin/AdminUserResultVO.java
src/main/java/com/order/erp/domain/vo/admin/AdminUserVO.java
src/main/java/com/order/erp/service/admin/AdminMenuService.java
src/main/java/com/order/erp/service/admin/AdminRoleService.java
src/main/java/com/order/erp/service/admin/AdminUserService.java
src/main/java/com/order/erp/service/admin/impl/AdminDeptServiceImpl.java
 package com.order.erp.config;
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import com.order.erp.common.constant.Constant;
+import com.order.erp.common.utils.SecurityUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.ibatis.reflection.MetaObject;
+import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.stereotype.Component;
 import java.time.LocalDateTime;
@@ -26,27 +29,27 @@ public class AdminMetaObjectHandler implements MetaObjectHandler {
         LocalDateTime now = LocalDateTime.now();
         this.strictInsertFill(metaObject, CREATE_TIME, LocalDateTime.class, now);
         this.strictInsertFill(metaObject, MODIFY_TIME, LocalDateTime.class, now);
-//        this.strictInsertFill(metaObject, ENABLE_FLAG, Integer.class, Constant.ENABLE_TEN);
-//        LoginUserDetail loginUser = UserUtils.getLoginUser();
-//        if (null == loginUser) {
-//            return;
-//        }
-//
-//        this.strictInsertFill(metaObject, CREATE_BY, String.class, loginUser.getRealName());
-//
-//        this.strictInsertFill(metaObject, MODIFY_BY, String.class, loginUser.getRealName());
+        this.strictInsertFill(metaObject, ENABLE_FLAG, Integer.class, Constant.ENABLE_TEN);
+        UserDetails loginUser = SecurityUtils.getUserDetails();
+        if (null == loginUser) {
+            return;
+        }
+
+        this.strictInsertFill(metaObject, CREATE_BY, String.class, loginUser.getUsername());
+
+        this.strictInsertFill(metaObject, MODIFY_BY, String.class, loginUser.getUsername());
     }
     @Override
     public void updateFill(MetaObject metaObject) {
-        this.strictInsertFill(metaObject, MODIFY_TIME, LocalDateTime.class, LocalDateTime.now());
+        this.strictUpdateFill(metaObject, MODIFY_TIME, LocalDateTime.class, LocalDateTime.now());
-//        LoginUserDetail loginUser = UserUtils.getLoginUser();
-//        if (null == loginUser) {
-//            return;
-//        }
-//        this.strictInsertFill(metaObject, MODIFY_BY, String.class, loginUser.getRealName());
+        UserDetails loginUser = SecurityUtils.getUserDetails();
+        if (null == loginUser) {
+            return;
+        }
+        this.strictUpdateFill(metaObject, MODIFY_BY, String.class, loginUser.getUsername());
     }
 }
+package com.order.erp.controller;
+
+import com.order.erp.common.constant.ServerResult;
+import com.order.erp.domain.vo.admin.AdminDeptQueryVO;
+import com.order.erp.domain.vo.admin.AdminDeptVO;
+import com.order.erp.log.Log;
+import com.order.erp.service.admin.AdminDeptService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * @date 2019-03-25
+ */
+@RestController
+@Api(tags = "系统：部门管理")
+@RequestMapping("/order/erp/depts")
+public class DeptController {
+
+    @Resource
+    private AdminDeptService deptService;
+
+
+    @Log("查询部门")
+    @ApiOperation("查询部门")
+    @PostMapping(value = "/list_by_page")
+    @PreAuthorize("@el.check('user:list','dept:list')")
+    public ServerResult listByPage(@RequestBody @Validated AdminDeptQueryVO queryVO) {
+        return deptService.list(queryVO);
+    }
+
+    @Log("新增部门")
+    @ApiOperation("新增部门")
+    @PostMapping("/add")
+    @PreAuthorize("@el.check('dept:add')")
+    public ServerResult add(@RequestBody @Validated AdminDeptVO deptVO) {
+        return deptService.add(deptVO);
+    }
+
+    @Log("修改部门")
+    @ApiOperation("修改部门")
+    @PutMapping
+    @PreAuthorize("@el.check('dept:edit')")
+    public ServerResult edit(@RequestBody @Validated AdminDeptVO deptVO) {
+        return deptService.edit(deptVO);
+    }
+
+    @Log("删除部门")
+    @ApiOperation("删除部门")
+    @DeleteMapping
+    @PreAuthorize("@el.check('dept:del')")
+    public ServerResult delete(@RequestBody @Validated AdminDeptQueryVO queryVO) {
+        return ServerResult.success(deptService.deleteById(queryVO));
+    }
+}
 \ No newline at end of file
+package com.order.erp.controller;
+
+import com.order.erp.common.constant.ServerResult;
+import com.order.erp.domain.vo.admin.AdminJobQueryVO;
+import com.order.erp.domain.vo.admin.AdminJobVO;
+import com.order.erp.log.Log;
+import com.order.erp.service.admin.AdminJobService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * @date 2019-03-29
+ */
+@Api(tags = "系统：岗位管理")
+@RestController
+@RequestMapping("/order/erp/jobs")
+public class JobController {
+
+    @Resource
+    private AdminJobService jobService;
+
+    @Log("查询岗位")
+    @ApiOperation("查询岗位")
+    @PostMapping(value = "/list_by_page")
+    @PreAuthorize("@el.check('job:list','user:list')")
+    public ServerResult listByPage(@RequestBody @Validated AdminJobQueryVO queryVO) {
+        return jobService.list(queryVO);
+    }
+
+    @Log("新增岗位")
+    @ApiOperation("新增岗位")
+    @PostMapping(value = "/add")
+    @PreAuthorize("@el.check('job:add')")
+    public ServerResult add(@RequestBody @Validated AdminJobVO jobVO) {
+        return jobService.add(jobVO);
+    }
+
+    @Log("修改岗位")
+    @ApiOperation("修改岗位")
+    @PostMapping(value = "/edit")
+    @PreAuthorize("@el.check('job:edit')")
+    public ServerResult edit(@RequestBody @Validated AdminJobVO jobVO) {
+        return jobService.edit(jobVO);
+    }
+
+    @Log("删除岗位")
+    @ApiOperation("删除岗位")
+    @PostMapping(value = "/delete")
+    @PreAuthorize("@el.check('job:del')")
+    public ServerResult delete(@RequestBody @Validated AdminJobQueryVO queryVO) {
+        return jobService.deleteById(queryVO);
+    }
+}
 \ No newline at end of file
+package com.order.erp.controller;
+
+import com.order.erp.common.constant.ServerResult;
+import com.order.erp.domain.vo.admin.AdminMenuQueryVO;
+import com.order.erp.domain.vo.admin.AdminMenuVO;
+import com.order.erp.log.Log;
+import com.order.erp.service.admin.AdminMenuService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * @date 2018-12-03
+ */
+@Api(tags = "系统：菜单管理")
+@RestController
+@RequestMapping("/order/erp/menus")
+@SuppressWarnings("unchecked")
+public class MenuController {
+
+    @Resource
+    private AdminMenuService menuService;
+
+    @ApiOperation("获取前端所需菜单")
+    @PostMapping(value = "/build")
+    public ServerResult buildMenus() {
+        return ServerResult.success();
+    }
+
+    @ApiOperation("返回全部的菜单")
+    @PostMapping(value = "/tree")
+    @PreAuthorize("@el.check('menu:list','roles:list')")
+    public ServerResult getMenuTree() {
+        return ServerResult.success();
+    }
+
+    @Log("查询菜单")
+    @ApiOperation("查询菜单")
+    @PostMapping(value = "/all")
+    @PreAuthorize("@el.check('menu:list')")
+    public ServerResult all(@RequestBody @Validated AdminMenuQueryVO queryVO) {
+        return menuService.all(queryVO);
+    }
+
+    @Log("新增菜单")
+    @ApiOperation("新增菜单")
+    @PostMapping(value = "/add")
+    @PreAuthorize("@el.check('menu:add')")
+    public ServerResult add(@RequestBody @Validated AdminMenuVO menuVO) {
+        return menuService.add(menuVO);
+    }
+
+    @Log("修改菜单")
+    @ApiOperation("修改菜单")
+    @PostMapping(value = "/edit")
+    @PreAuthorize("@el.check('menu:edit')")
+    public ServerResult edit(@RequestBody @Validated AdminMenuVO menuVO) {
+        return menuService.edit(menuVO);
+    }
+
+    @Log("删除菜单")
+    @ApiOperation("删除菜单")
+    @PostMapping(value = "/delete")
+    @PreAuthorize("@el.check('menu:del')")
+    public ServerResult delete(@RequestBody @Validated AdminMenuQueryVO queryVO) {
+        return menuService.deleteById(queryVO);
+    }
+}
 package com.order.erp.controller;
 import com.order.erp.common.constant.ServerResult;
+import com.order.erp.domain.vo.admin.AdminAuthRoleVO;
 import com.order.erp.domain.vo.admin.AdminRoleQueryVO;
 import com.order.erp.domain.vo.admin.AdminRoleVO;
 import com.order.erp.log.Log;
@@ -61,7 +62,7 @@ public class RoleController {
     @PostMapping(value = "/add")
     @PreAuthorize("@el.check('roles:add')")
     public ServerResult add(@RequestBody @Validated AdminRoleVO roleVO) {
-        return ServerResult.success();
+        return roleService.add(roleVO);
     }
     @Log("修改角色")
@@ -69,15 +70,15 @@ public class RoleController {
     @PostMapping(value = "/edit")
     @PreAuthorize("@el.check('roles:edit')")
     public ServerResult edit(@RequestBody @Validated AdminRoleVO roleVO) {
-        return ServerResult.success();
+        return roleService.edit(roleVO);
     }
-    @Log("修改角色菜单")
-    @ApiOperation("修改角色菜单")
-    @PostMapping(value = "/edit_menu")
+    @Log("授权角色菜单")
+    @ApiOperation("授权角色菜单")
+    @PostMapping(value = "/auth_menu")
     @PreAuthorize("@el.check('roles:edit')")
-    public ServerResult editMenu(@RequestBody @Validated AdminRoleVO roleVO) {
-        return ServerResult.success();
+    public ServerResult authMenu(@RequestBody @Validated AdminAuthRoleVO roleVO) {
+        return roleService.authMenu(roleVO);
     }
     @Log("删除角色")
@@ -85,6 +86,6 @@ public class RoleController {
     @PostMapping(value = "/delete")
     @PreAuthorize("@el.check('roles:del')")
     public ServerResult delete(@RequestBody @Validated AdminRoleQueryVO queryVO) {
-        return ServerResult.success();
+        return roleService.deleteById(queryVO);
     }
 }
+package com.order.erp.controller;
+
+import com.order.erp.common.constant.ServerResult;
+import com.order.erp.config.DataScope;
+import com.order.erp.domain.vo.admin.AdminAuthUserVO;
+import com.order.erp.domain.vo.admin.AdminUserQueryVO;
+import com.order.erp.domain.vo.admin.AdminUserVO;
+import com.order.erp.log.Log;
+import com.order.erp.service.admin.AdminUserService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+
+/**
+ * @date 2018-11-23
+ */
+@Api(tags = "系统：用户管理")
+@RestController
+@RequestMapping("/order/erp/users")
+public class UserController {
+
+    @Value("${rsa.private_key}")
+    private String privateKey;
+
+    @Resource
+    private AdminUserService userService;
+
+    @Resource
+    private DataScope dataScope;
+
+    @Log("查询用户")
+    @ApiOperation("查询用户")
+    @PostMapping(value = "list_by_page")
+    @PreAuthorize("@el.check('user:list')")
+    public ServerResult listByPage(@RequestBody @Validated AdminUserQueryVO queryVO) {
+        return userService.list(queryVO);
+    }
+
+    @Log("授权角色")
+    @ApiOperation("授权角色")
+    @PostMapping(value = "/auth_role")
+    @PreAuthorize("@el.check('user:add')")
+    public ServerResult authRole(@RequestBody @Validated AdminAuthUserVO userVO) {
+        return userService.authRole(userVO);
+    }
+
+    @Log("新增用户")
+    @ApiOperation("新增用户")
+    @PostMapping(value = "/add")
+    @PreAuthorize("@el.check('user:add')")
+    public ServerResult add(@RequestBody @Validated AdminUserVO userVO) {
+        return userService.add(userVO);
+    }
+
+    @Log("修改用户")
+    @ApiOperation("修改用户")
+    @PostMapping(value = "/edit")
+    @PreAuthorize("@el.check('user:edit')")
+    public ServerResult edit(@RequestBody @Validated AdminUserVO userVO) {
+        return userService.edit(userVO);
+    }
+
+    @Log("修改用户：个人中心")
+    @ApiOperation("修改用户：个人中心")
+    @PostMapping(value = "/center")
+    public ServerResult center(@RequestBody @Validated AdminUserVO userVO) {
+        return ServerResult.success();
+    }
+
+    @Log("删除用户")
+    @ApiOperation("删除用户")
+    @PostMapping(value = "/delete")
+    @PreAuthorize("@el.check('user:del')")
+    public ServerResult delete(@RequestBody @Validated AdminUserQueryVO queryVO) {
+        return userService.deleteById(queryVO);
+    }
+
+    @ApiOperation("修改密码")
+    @PostMapping(value = "/updatePass")
+    public ServerResult updatePass(@RequestBody @Validated AdminUserQueryVO queryVO) {
+        return ServerResult.success();
+    }
+
+    @ApiOperation("修改头像")
+    @PostMapping(value = "/updateAvatar")
+    public ServerResult updateAvatar(@RequestParam MultipartFile file) {
+        return ServerResult.success();
+    }
+
+    @Log("修改邮箱")
+    @ApiOperation("修改邮箱")
+    @PostMapping(value = "/updateEmail")
+    public ServerResult updateEmail(@RequestBody @Validated AdminUserQueryVO queryVO) {
+        return ServerResult.success();
+    }
+}
 package com.order.erp.domain.dto;
-import cn.hutool.core.date.DatePattern;
-import com.fasterxml.jackson.annotation.JsonFormat;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
+import org.apache.ibatis.type.LocalDateTimeTypeHandler;
 import java.io.Serializable;
 import java.time.LocalDateTime;
@@ -20,28 +22,32 @@ public class BaseDO implements Serializable {
     /**
      * 创建时间
      */
-    @JsonFormat(timezone = "GMT+8", pattern = DatePattern.NORM_DATETIME_PATTERN)
+    @TableField(fill = FieldFill.INSERT, typeHandler = LocalDateTimeTypeHandler.class)
     private LocalDateTime createTime;
     /**
      * 创建人
      */
+    @TableField(fill = FieldFill.INSERT)
     private String createBy;
     /**
      * 修改时间
      */
-    @JsonFormat(timezone = "GMT+8", pattern = DatePattern.NORM_DATETIME_PATTERN)
+    @TableField(fill = FieldFill.INSERT_UPDATE, typeHandler = LocalDateTimeTypeHandler.class)
     private LocalDateTime modifyTime;
     /**
      * 修改人
      */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
     private String modifyBy;
     /**
      * 是否可用 10-可用 20-删除 30-禁用
      */
+    @TableLogic
+    @TableField(fill = FieldFill.INSERT)
     private Integer enableFlag;
     /**
+package com.order.erp.domain.vo.admin;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Set;
+
+/**
+ * @author makejava
+ * @since 2023-08-30 17:51:48
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class AdminAuthRoleVO implements Serializable {
+
+    /**
+     * 角色id
+     */
+    @NotNull(message = "角色id不能为空")
+    private Long roleId;
+
+    /**
+     * 菜单id
+     */
+    @NotNull(message = "菜单ids不能为空")
+    private Set<Long> menuIds;
+}
+package com.order.erp.domain.vo.admin;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Set;
+
+/**
+ * @author makejava
+ * @since 2023-08-30 17:51:48
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class AdminAuthUserVO implements Serializable {
+
+    /**
+     * 用户id
+     */
+    @NotNull(message = "用户id不能为空")
+    private Long userId;
+
+    /**
+     * 角色id
+     */
+    @NotNull(message = "角色id不能为空")
+    private Set<Long> roleIds;
+}
+package com.order.erp.domain.vo.admin;
+
+import cn.hutool.core.date.DatePattern;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 角色表(AdminRole)实体类
+ *
+ * @author makejava
+ * @since 2023-08-30 17:51:48
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class AdminDeptResultVO implements Serializable {
+
+    private Long id;
+
+    /**
+     * 岗位名称
+     */
+    private String name;
+
+    /**
+     * 上级部门
+     */
+    private Long pid;
+
+    /**
+     * 子部门数目
+     */
+    private Integer subCount;
+
+    /**
+     * 排序
+     */
+    private Integer deptSort;
+
+
+}
+package com.order.erp.domain.vo.admin;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+
+/**
+ * @author makejava
+ * @since 2023-08-30 17:51:48
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class AdminJobResultVO implements Serializable {
+
+    private Long id;
+
+    /**
+     * 岗位名称
+     */
+    private String name;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+
+}
+package com.order.erp.domain.vo.admin;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * @author xms
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class AdminMenuResult implements Serializable {
+
+    private Long id;
+    /**
+     * 上级菜单ID
+     */
+    private Long pid;
+
+    /**
+     * 子菜单数目
+     */
+    private Integer subCount;
+
+    /**
+     * 类型，目录、菜单、按钮
+     */
+    private Integer type;
+
+    /**
+     * 菜单标题
+     */
+    private String title;
+
+    /**
+     * 菜单名称
+     */
+    private String name;
+
+    /**
+     * 组件
+     */
+    private String component;
+
+    /**
+     * 排序
+     */
+    private Integer menuSort;
+
+    /**
+     * 图标
+     */
+    private String icon;
+
+    /**
+     * 路径
+     */
+    private String path;
+
+    /**
+     * 是否为外链 0:否，1：是
+     */
+    private Integer iFrame;
+
+    /**
+     * cache
+     */
+    private Integer cache;
+
+    /**
+     * 权限
+     */
+    private String permission;
+
+    /**
+     * 是否隐藏
+     */
+    private Integer hidden;
+
+    private List<AdminMenuResult> children;
+
+    private LocalDateTime createTime;
+}
@@ -26,6 +26,10 @@ public class AdminMenuVO implements Serializable {
      */
     private Long pid;
     /**
+     * 菜单标题
+     */
+    private String title;
+    /**
      * 菜单名称
      */
     private String name;
@@ -25,14 +25,11 @@ public class AdminRoleVO implements Serializable {
      * 角色名称
      */
     private String name;
+
     /**
-     * 备注
-     */
-    private String remark;
-    /**
-     * 权限
+     * 描述
      */
-    private String permission;
+    private String description;
     /**
      * 数据权限类型 全部 、 本级 、 自定义
      */
+package com.order.erp.domain.vo.admin;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 角色表(AdminRole)实体类
+ *
+ * @author makejava
+ * @since 2023-08-30 17:51:48
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class AdminUserResultVO implements Serializable {
+
+    private Long id;
+
+    /**
+     * 部门id
+     */
+    private Long deptId;
+
+    /**
+     * 用户名称
+     */
+    private String userName;
+
+    /**
+     * 用户昵称
+     */
+    private String nickName;
+
+    /**
+     * 性别
+     */
+    private String gender;
+
+    /**
+     * 手机号码
+     */
+    private String phone;
+
+    /**
+     * 邮箱
+     */
+    private String email;
+
+    /**
+     * 头像地址
+     */
+    private String avatarName;
+
+    /**
+     * 头像真实路径
+     */
+    private String avatarPath;
+
+    /**
+     * 密码
+     */
+    private String password;
+
+    /**
+     * 是否为admin账号
+     */
+    private Boolean isAdmin;
+
+    /**
+     * 修改密码的时间
+     */
+    private LocalDateTime pwdResetTime;
+
+
+}
@@ -4,6 +4,7 @@ import lombok.*;
 import lombok.experimental.SuperBuilder;
 import java.io.Serializable;
+import java.time.LocalDateTime;
 /**
  * 用户表(AdminUser)实体类
@@ -21,34 +22,61 @@ public class AdminUserVO implements Serializable {
     private static final long serialVersionUID = 840682837180084937L;
     private Long id;
+
+    /**
+     * 部门id
+     */
+    private Long deptId;
+
     /**
      * 用户名称
      */
     private String userName;
+
     /**
      * 用户昵称
      */
     private String nickName;
+
     /**
      * 性别
      */
-    private String sex;
+    private String gender;
+
     /**
-     * 工作性质
+     * 手机号码
      */
-    private String workerType;
+    private String phone;
+
     /**
      * 邮箱
      */
     private String email;
+
     /**
-     * 手机号
+     * 头像地址
      */
-    private String phone;
+    private String avatarName;
+
+    /**
+     * 头像真实路径
+     */
+    private String avatarPath;
+
     /**
      * 密码
      */
     private String password;
+    /**
+     * 是否为admin账号
+     */
+    private Boolean isAdmin;
+
+    /**
+     * 修改密码的时间
+     */
+    private LocalDateTime pwdResetTime;
+
 }
@@ -31,6 +31,13 @@ public interface AdminMenuService extends IService&lt;AdminMenuDO&gt; {
     ServerResult list(AdminMenuQueryVO adminMenuQueryVO);
     /**
+     *
+     * @param adminMenuQueryVO
+     * @return
+     */
+    ServerResult all(AdminMenuQueryVO adminMenuQueryVO);
+
+    /**
      * 新增数据
      *
      * @param adminMenuVO 数据VO
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.order.erp.common.constant.ServerResult;
 import com.order.erp.domain.dto.admin.AdminRoleDO;
 import com.order.erp.domain.vo.UserVO;
+import com.order.erp.domain.vo.admin.AdminAuthRoleVO;
 import com.order.erp.domain.vo.admin.AdminRoleQueryVO;
 import com.order.erp.domain.vo.admin.AdminRoleVO;
 import org.springframework.security.core.GrantedAuthority;
@@ -63,6 +64,14 @@ public interface AdminRoleService extends IService&lt;AdminRoleDO&gt; {
     ServerResult edit(AdminRoleVO adminRoleVO);
     /**
+     * 角色-菜单-授权
+     *
+     * @param adminAuthRoleVO
+     * @return
+     */
+    ServerResult authMenu(AdminAuthRoleVO adminAuthRoleVO);
+
+    /**
      * 通过主键删除数据
      *
      * @param adminRoleQueryVO 筛选条件
@@ -39,6 +39,13 @@ public interface AdminUserService extends IService&lt;AdminUserDO&gt; {
     ServerResult add(AdminUserVO adminUserVO);
     /**
+     *
+     * @param adminUserVO
+     * @return
+     */
+    ServerResult authRole(AdminAuthUserVO adminUserVO);
+
+    /**
      * 修改数据
      *
      * @param adminUserVO 数据VO
@@ -2,20 +2,29 @@ package com.order.erp.service.admin.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.order.erp.common.constant.Constant;
 import com.order.erp.common.constant.ServerResult;
+import com.order.erp.domain.dto.BaseDO;
 import com.order.erp.domain.dto.admin.AdminDeptDO;
 import com.order.erp.domain.vo.admin.AdminDeptQueryVO;
+import com.order.erp.domain.vo.admin.AdminDeptResultVO;
 import com.order.erp.domain.vo.admin.AdminDeptVO;
 import com.order.erp.mapper.admin.AdminDeptMapper;
 import com.order.erp.service.admin.AdminDeptService;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
 /**
  * 部门表(AdminDept)表服务实现类
@@ -50,13 +59,38 @@ public class AdminDeptServiceImpl extends ServiceImpl&lt;AdminDeptMapper, AdminDept
     /**
      * 分页查询
      *
-     * @param adminDeptQueryVO 筛选条件
+     * @param queryVO 筛选条件
      * @return 查询结果
      */
     @Override
-    public ServerResult list(AdminDeptQueryVO adminDeptQueryVO) {
+    public ServerResult list(AdminDeptQueryVO queryVO) {
+
+        LambdaQueryWrapper<AdminDeptDO> queryWrapper = buildQueryByParam(queryVO);
+        Page page = new Page<>(queryVO.getPageNo(), queryVO.getPageSize());
+        IPage<AdminDeptDO> iPage = page(page, queryWrapper);
-        return null;
+        Page<AdminDeptResultVO> webVOPage = new Page<>();
+        List<AdminDeptDO> adminDeptDOS = iPage.getRecords();
+        if (CollectionUtils.isNotEmpty(adminDeptDOS)) {
+            List<AdminDeptResultVO> queryVos = adminDeptDOS.stream().map(x -> {
+                AdminDeptResultVO resultVO = new AdminDeptResultVO();
+                BeanUtils.copyProperties(x, resultVO);
+                return resultVO;
+            }).collect(Collectors.toList());
+            webVOPage.setRecords(queryVos);
+        }
+        BeanUtils.copyProperties(page, webVOPage, "records");
+        return ServerResult.success(webVOPage);
+    }
+
+    /**
+     * @param queryVO
+     * @return
+     */
+    private LambdaQueryWrapper<AdminDeptDO> buildQueryByParam(AdminDeptQueryVO queryVO) {
+        return new LambdaQueryWrapper<AdminDeptDO>()
+                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .eq(StringUtils.isNotBlank(queryVO.getName()), AdminDeptDO::getName, queryVO.getName());
     }
     /**
@@ -2,20 +2,29 @@ package com.order.erp.service.admin.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.order.erp.common.constant.Constant;
 import com.order.erp.common.constant.ServerResult;
+import com.order.erp.domain.dto.BaseDO;
 import com.order.erp.domain.dto.admin.AdminJobDO;
 import com.order.erp.domain.vo.admin.AdminJobQueryVO;
+import com.order.erp.domain.vo.admin.AdminJobResultVO;
 import com.order.erp.domain.vo.admin.AdminJobVO;
 import com.order.erp.mapper.admin.AdminJobMapper;
 import com.order.erp.service.admin.AdminJobService;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
 /**
  * 岗位表(AdminJob)表服务实现类
@@ -50,13 +59,39 @@ public class AdminJobServiceImpl extends ServiceImpl&lt;AdminJobMapper, AdminJobDO&gt;
     /**
      * 分页查询
      *
-     * @param adminJobQueryVO 筛选条件
+     * @param queryVO 筛选条件
      * @return 查询结果
      */
     @Override
-    public ServerResult list(AdminJobQueryVO adminJobQueryVO) {
+    public ServerResult list(AdminJobQueryVO queryVO) {
+
+        LambdaQueryWrapper<AdminJobDO> queryWrapper = buildQueryByParam(queryVO);
+        Page page = new Page<>(queryVO.getPageNo(), queryVO.getPageSize());
+        IPage<AdminJobDO> iPage = page(page, queryWrapper);
+
+        Page<AdminJobResultVO> webVOPage = new Page<>();
+        List<AdminJobDO> adminJobDOList = iPage.getRecords();
+        if (CollectionUtils.isNotEmpty(adminJobDOList)) {
+            List<AdminJobResultVO> queryVos = adminJobDOList.stream().map(x -> {
+                AdminJobResultVO resultVO = new AdminJobResultVO();
+                BeanUtils.copyProperties(x, resultVO);
+                return resultVO;
+            }).collect(Collectors.toList());
+            webVOPage.setRecords(queryVos);
+        }
+        BeanUtils.copyProperties(page, webVOPage, "records");
+        return ServerResult.success(webVOPage);
+    }
+
-        return null;
+    /**
+     * @param queryVO
+     * @return
+     */
+    private LambdaQueryWrapper<AdminJobDO> buildQueryByParam(AdminJobQueryVO queryVO) {
+        return new LambdaQueryWrapper<AdminJobDO>()
+                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .eq(StringUtils.isNotBlank(queryVO.getName()), AdminJobDO::getName, queryVO.getName());
     }
     /**
@@ -2,20 +2,25 @@ package com.order.erp.service.admin.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.order.erp.common.constant.Constant;
 import com.order.erp.common.constant.ServerResult;
+import com.order.erp.domain.dto.BaseDO;
 import com.order.erp.domain.dto.admin.AdminMenuDO;
 import com.order.erp.domain.vo.admin.AdminMenuQueryVO;
+import com.order.erp.domain.vo.admin.AdminMenuResult;
 import com.order.erp.domain.vo.admin.AdminMenuVO;
 import com.order.erp.mapper.admin.AdminMenuMapper;
 import com.order.erp.service.admin.AdminMenuService;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
+import java.util.stream.Collectors;
 /**
  * 角色表(AdminMenu)表服务实现类
@@ -59,6 +64,50 @@ public class AdminMenuServiceImpl extends ServiceImpl&lt;AdminMenuMapper, AdminMenu
         return null;
     }
+    @Override
+    public ServerResult all(AdminMenuQueryVO adminMenuQueryVO) {
+        List<AdminMenuDO> menuDOList = list(new LambdaQueryWrapper<AdminMenuDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN));
+
+        if (CollectionUtils.isEmpty(menuDOList)) {
+            return ServerResult.success();
+        }
+
+        return ServerResult.success(buildTree(menuDOList));
+    }
+
+    /**
+     * @param menuDOList
+     * @return
+     */
+    private List<AdminMenuResult> buildTree(List<AdminMenuDO> menuDOList) {
+        List<AdminMenuResult> menuDtos = menuDOList.stream().map(x -> {
+            AdminMenuResult result = new AdminMenuResult();
+            BeanUtils.copyProperties(x, result);
+            return result;
+        }).collect(Collectors.toList());
+
+        List<AdminMenuResult> trees = new ArrayList<>();
+        Set<Long> ids = new HashSet<>();
+        for (AdminMenuResult menuDTO : menuDtos) {
+            if (Objects.nonNull(menuDTO.getPid())) {
+                trees.add(menuDTO);
+            }
+            for (AdminMenuResult it : menuDtos) {
+                if (Objects.nonNull(it.getPid()) && it.getPid().equals(menuDTO.getId())) {
+                    if (menuDTO.getChildren() == null) {
+                        menuDTO.setChildren(new ArrayList<>());
+                    }
+                    menuDTO.getChildren().add(it);
+                    ids.add(it.getId());
+                }
+            }
+        }
+        if (trees.size() == 0) {
+            trees = menuDtos.stream().filter(s -> !ids.contains(s.getId())).collect(Collectors.toList());
+        }
+        return trees;
+    }
+
     /**
      * 新增数据
      *
@@ -11,15 +11,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.order.erp.common.constant.Constant;
 import com.order.erp.common.constant.ServerResult;
+import com.order.erp.common.utils.TransactionHelper;
 import com.order.erp.domain.dto.BaseDO;
 import com.order.erp.domain.dto.admin.AdminMenuDO;
 import com.order.erp.domain.dto.admin.AdminRoleDO;
 import com.order.erp.domain.dto.admin.AdminRoleMenuDO;
 import com.order.erp.domain.vo.UserVO;
-import com.order.erp.domain.vo.admin.AdminRoleQueryVO;
-import com.order.erp.domain.vo.admin.AdminRoleResultVO;
-import com.order.erp.domain.vo.admin.AdminRoleVO;
-import com.order.erp.domain.vo.admin.RoleSmallVO;
+import com.order.erp.domain.vo.admin.*;
 import com.order.erp.mapper.admin.AdminRoleMapper;
 import com.order.erp.service.admin.AdminMenuService;
 import com.order.erp.service.admin.AdminRoleMenuService;
@@ -55,6 +53,9 @@ public class AdminRoleServiceImpl extends ServiceImpl&lt;AdminRoleMapper, AdminRole
     @Resource
     private AdminMenuService menuService;
+    @Resource
+    private TransactionHelper transactionHelper;
+
     /**
      * 通过ID查询单条数据
@@ -134,7 +135,6 @@ public class AdminRoleServiceImpl extends ServiceImpl&lt;AdminRoleMapper, AdminRole
      */
     @Override
     public ServerResult add(AdminRoleVO adminRoleVO) {
-        //todo 校验
         if (Objects.nonNull(adminRoleVO.getId())) {
             adminRoleVO.setId(null);
         }
@@ -164,6 +164,30 @@ public class AdminRoleServiceImpl extends ServiceImpl&lt;AdminRoleMapper, AdminRole
         return ServerResult.success();
     }
+    @Override
+    public ServerResult authMenu(AdminAuthRoleVO adminAuthRoleVO) {
+        AdminRoleDO roleDO = getById(adminAuthRoleVO.getRoleId());
+        if (Objects.isNull(roleDO)) {
+            return ServerResult.fail("角色不存在");
+        }
+        List<AdminRoleMenuDO> list = adminAuthRoleVO.getMenuIds().stream().map(x -> {
+            return AdminRoleMenuDO.builder().roleId(adminAuthRoleVO.getRoleId()).menuId(x).build();
+        }).collect(Collectors.toList());
+        if (CollectionUtils.isEmpty(list)) {
+            return ServerResult.success();
+        }
+        try {
+            transactionHelper.run(() -> {
+                roleMenuService.remove(new LambdaQueryWrapper<AdminRoleMenuDO>().eq(AdminRoleMenuDO::getRoleId, adminAuthRoleVO.getRoleId()));
+                roleMenuService.saveBatch(list);
+            });
+        } catch (Exception e) {
+            log.error("授权异常：e:{}", e.getMessage());
+        }
+
+        return ServerResult.success();
+    }
+
     /**
      * 通过主键删除数据
      *
@@ -4,7 +4,10 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.canrd.shop.common.constant.ServerResultCode;
 import com.order.erp.common.constant.Constant;
@@ -12,6 +15,7 @@ import com.order.erp.common.constant.ServerResult;
 import com.order.erp.common.exception.BusinessException;
 import com.order.erp.common.utils.ImgCaptchaUtils;
 import com.order.erp.common.utils.RedisUtil;
+import com.order.erp.common.utils.TransactionHelper;
 import com.order.erp.domain.dto.BaseDO;
 import com.order.erp.domain.dto.admin.*;
 import com.order.erp.domain.vo.UserVO;
@@ -28,6 +32,7 @@ import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
@@ -78,6 +83,12 @@ public class AdminUserServiceImpl extends ServiceImpl&lt;AdminUserMapper, AdminUser
     @Resource
     private AdminRoleService roleService;
+    @Resource
+    private PasswordEncoder passwordEncoder;
+
+    @Resource
+    private TransactionHelper transactionHelper;
+
     /**
      * 通过ID查询单条数据
      * <p>
@@ -100,13 +111,40 @@ public class AdminUserServiceImpl extends ServiceImpl&lt;AdminUserMapper, AdminUser
     /**
      * 分页查询
      *
-     * @param adminUserQueryVO 筛选条件
+     * @param queryVO 筛选条件
      * @return 查询结果
      */
     @Override
-    public ServerResult list(AdminUserQueryVO adminUserQueryVO) {
+    public ServerResult list(AdminUserQueryVO queryVO) {
+
+        LambdaQueryWrapper<AdminUserDO> queryWrapper = buildQueryByParam(queryVO);
+        Page page = new Page<>(queryVO.getPageNo(), queryVO.getPageSize());
+        IPage<AdminUserDO> iPage = page(page, queryWrapper);
+
+        Page<AdminUserResultVO> webVOPage = new Page<>();
+        List<AdminUserDO> adminDeptDOS = iPage.getRecords();
+        if (CollectionUtils.isNotEmpty(adminDeptDOS)) {
+            List<AdminUserResultVO> queryVos = adminDeptDOS.stream().map(x -> {
+                AdminUserResultVO resultVO = new AdminUserResultVO();
+                BeanUtils.copyProperties(x, resultVO);
+                return resultVO;
+            }).collect(Collectors.toList());
+            webVOPage.setRecords(queryVos);
+        }
+        BeanUtils.copyProperties(page, webVOPage, "records");
+        return ServerResult.success(webVOPage);
+    }
-        return ServerResult.success();
+    /**
+     * @param queryVO
+     * @return
+     */
+    private LambdaQueryWrapper<AdminUserDO> buildQueryByParam(AdminUserQueryVO queryVO) {
+        return new LambdaQueryWrapper<AdminUserDO>()
+                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .eq(StringUtils.isNotBlank(queryVO.getUserName()), AdminUserDO::getUserName, queryVO.getUserName())
+                .eq(StringUtils.isNotBlank(queryVO.getPhone()), AdminUserDO::getPhone, queryVO.getPhone())
+                .eq(StringUtils.isNotBlank(queryVO.getEmail()), AdminUserDO::getEmail, queryVO.getEmail());
     }
     /**
@@ -122,12 +160,36 @@ public class AdminUserServiceImpl extends ServiceImpl&lt;AdminUserMapper, AdminUser
             adminUserVO.setId(null);
         }
         AdminUserDO adminUserDo = BeanUtil.copyProperties(adminUserVO, AdminUserDO.class);
-
+        adminUserDo.setPassword(passwordEncoder.encode("123456"));
         save(adminUserDo);
         return ServerResult.success();
     }
+    @Override
+    public ServerResult authRole(AdminAuthUserVO adminUserVO) {
+        AdminUserDO userDO = getById(adminUserVO.getUserId());
+        if (Objects.isNull(userDO)) {
+            return ServerResult.fail("用户不存在");
+        }
+        List<AdminUserRoleDO> list = adminUserVO.getRoleIds().stream().map(x -> {
+            return AdminUserRoleDO.builder().userId(adminUserVO.getUserId()).roleId(x).build();
+        }).collect(Collectors.toList());
+        if (CollectionUtils.isEmpty(list)) {
+            return ServerResult.success();
+        }
+        try {
+            transactionHelper.run(() -> {
+                userRoleService.remove(new LambdaQueryWrapper<AdminUserRoleDO>().eq(AdminUserRoleDO::getUserId, adminUserVO.getUserId()));
+                userRoleService.saveBatch(list);
+            });
+        } catch (Exception e) {
+            log.error("授权异常：e:{}", e.getMessage());
+        }
+
+        return ServerResult.success();
+    }
+
     /**
      * 修改数据
      *