处理添加分组时角色问题

分组管理员角色和分组成员角色维护。

lzga-modules/lzga-doc/src/main/java/com/jjt/doc/controller/DocGroupController.java

@@ -1,28 +1,19 @@
 package com.jjt.doc.controller;
 
-import java.util.List;
-import java.io.IOException;
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-
-import com.jjt.system.service.ISysUserRoleService;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.jjt.common.core.utils.poi.ExcelUtil;
+import com.jjt.common.core.web.controller.BaseController;
+import com.jjt.common.core.web.domain.AjaxResult;
+import com.jjt.common.core.web.page.TableDataInfo;
 import com.jjt.common.log.annotation.Log;
 import com.jjt.common.log.enums.BusinessType;
 import com.jjt.common.security.annotation.RequiresPermissions;
 import com.jjt.doc.domain.DocGroup;
 import com.jjt.doc.service.IDocGroupService;
-import com.jjt.common.core.web.controller.BaseController;
-import com.jjt.common.core.web.domain.AjaxResult;
-import com.jjt.common.core.utils.poi.ExcelUtil;
-import com.jjt.common.core.web.page.TableDataInfo;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 分组Controller
@@ -35,8 +26,6 @@ import com.jjt.common.core.web.page.TableDataInfo;
 public class DocGroupController extends BaseController {
     @Resource
     private IDocGroupService docGroupService;
-    @Resource
-    private ISysUserRoleService userRoleService;
 
     /**
      * 查询分组列表

lzga-modules/lzga-doc/src/main/java/com/jjt/doc/controller/DocGroupUserController.java

@@ -1,32 +1,22 @@
 package com.jjt.doc.controller;
 
-import java.util.List;
-import java.io.IOException;
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-
-import com.jjt.common.security.utils.SecurityUtils;
-import com.jjt.doc.domain.DocGroup;
-import com.jjt.doc.service.IDocGroupService;
-import com.jjt.system.api.domain.SysUser;
-import com.jjt.system.service.ISysUserRoleService;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.jjt.common.core.utils.poi.ExcelUtil;
+import com.jjt.common.core.web.controller.BaseController;
+import com.jjt.common.core.web.domain.AjaxResult;
+import com.jjt.common.core.web.page.TableDataInfo;
 import com.jjt.common.log.annotation.Log;
 import com.jjt.common.log.enums.BusinessType;
 import com.jjt.common.security.annotation.RequiresPermissions;
+import com.jjt.common.security.utils.SecurityUtils;
+import com.jjt.doc.domain.DocGroup;
 import com.jjt.doc.domain.DocGroupUser;
+import com.jjt.doc.service.IDocGroupService;
 import com.jjt.doc.service.IDocGroupUserService;
-import com.jjt.common.core.web.controller.BaseController;
-import com.jjt.common.core.web.domain.AjaxResult;
-import com.jjt.common.core.utils.poi.ExcelUtil;
-import com.jjt.common.core.web.page.TableDataInfo;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 分组成员Controller
@@ -41,8 +31,6 @@ public class DocGroupUserController extends BaseController {
     private IDocGroupUserService docGroupUserService;
     @Resource
     private IDocGroupService groupService;
-    @Resource
-    private ISysUserRoleService userRoleService;
 
     /**
      * 查询分组成员列表

lzga-modules/lzga-doc/src/main/java/com/jjt/doc/controller/DocSysRoleController.java

@@ -0,0 +1,105 @@
+package com.jjt.doc.controller;
+
+import java.util.List;
+import java.io.IOException;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.jjt.common.log.annotation.Log;
+import com.jjt.common.log.enums.BusinessType;
+import com.jjt.common.security.annotation.RequiresPermissions;
+import com.jjt.doc.domain.DocSysRole;
+import com.jjt.doc.service.IDocSysRoleService;
+import com.jjt.common.core.web.controller.BaseController;
+import com.jjt.common.core.web.domain.AjaxResult;
+import com.jjt.common.core.utils.poi.ExcelUtil;
+import com.jjt.common.core.web.page.TableDataInfo;
+
+/**
+ * 角色信息Controller
+ * 
+ * @author wukai
+ * @date 2023-04-21
+ */
+@RestController
+@RequestMapping("/docRole")
+public class DocSysRoleController extends BaseController
+{
+    @Resource
+    private IDocSysRoleService docSysRoleService;
+
+    /**
+     * 查询角色信息列表
+     */
+    @RequiresPermissions("doc:docRole:list")
+    @GetMapping("/list")
+    public TableDataInfo list(DocSysRole docSysRole)
+    {
+        startPage();
+        List<DocSysRole> list = docSysRoleService.selectDocSysRoleList(docSysRole);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出角色信息列表
+     */
+    @RequiresPermissions("doc:docRole:export")
+    @Log(title = "角色信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, DocSysRole docSysRole)
+    {
+        List<DocSysRole> list = docSysRoleService.selectDocSysRoleList(docSysRole);
+        ExcelUtil<DocSysRole> util = new ExcelUtil<DocSysRole>(DocSysRole.class);
+        util.exportExcel(response, list, "角色信息数据");
+    }
+
+    /**
+     * 获取角色信息详细信息
+     */
+    @RequiresPermissions("doc:docRole:query")
+    @GetMapping(value = "/{roleId}")
+    public AjaxResult getInfo(@PathVariable("roleId") Long roleId)
+    {
+        return success(docSysRoleService.selectDocSysRoleByRoleId(roleId));
+    }
+
+    /**
+     * 新增角色信息
+     */
+    @RequiresPermissions("doc:docRole:add")
+    @Log(title = "角色信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody DocSysRole docSysRole)
+    {
+        return toAjax(docSysRoleService.insertDocSysRole(docSysRole));
+    }
+
+    /**
+     * 修改角色信息
+     */
+    @RequiresPermissions("doc:docRole:edit")
+    @Log(title = "角色信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody DocSysRole docSysRole)
+    {
+        return toAjax(docSysRoleService.updateDocSysRole(docSysRole));
+    }
+
+    /**
+     * 删除角色信息
+     */
+    @RequiresPermissions("doc:docRole:remove")
+    @Log(title = "角色信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{roleIds}")
+    public AjaxResult remove(@PathVariable Long[] roleIds)
+    {
+        return toAjax(docSysRoleService.deleteDocSysRoleByRoleIds(roleIds));
+    }
+}

lzga-modules/lzga-doc/src/main/java/com/jjt/doc/controller/DocSysUserRoleController.java

@@ -0,0 +1,105 @@
+package com.jjt.doc.controller;
+
+import java.util.List;
+import java.io.IOException;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.jjt.common.log.annotation.Log;
+import com.jjt.common.log.enums.BusinessType;
+import com.jjt.common.security.annotation.RequiresPermissions;
+import com.jjt.doc.domain.DocSysUserRole;
+import com.jjt.doc.service.IDocSysUserRoleService;
+import com.jjt.common.core.web.controller.BaseController;
+import com.jjt.common.core.web.domain.AjaxResult;
+import com.jjt.common.core.utils.poi.ExcelUtil;
+import com.jjt.common.core.web.page.TableDataInfo;
+
+/**
+ * 用户和角色关联Controller
+ * 
+ * @author wukai
+ * @date 2023-04-21
+ */
+@RestController
+@RequestMapping("/docUserRole")
+public class DocSysUserRoleController extends BaseController
+{
+    @Resource
+    private IDocSysUserRoleService docSysUserRoleService;
+
+    /**
+     * 查询用户和角色关联列表
+     */
+    @RequiresPermissions("doc:docUserRole:list")
+    @GetMapping("/list")
+    public TableDataInfo list(DocSysUserRole docSysUserRole)
+    {
+        startPage();
+        List<DocSysUserRole> list = docSysUserRoleService.selectDocSysUserRoleList(docSysUserRole);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出用户和角色关联列表
+     */
+    @RequiresPermissions("doc:docUserRole:export")
+    @Log(title = "用户和角色关联", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, DocSysUserRole docSysUserRole)
+    {
+        List<DocSysUserRole> list = docSysUserRoleService.selectDocSysUserRoleList(docSysUserRole);
+        ExcelUtil<DocSysUserRole> util = new ExcelUtil<DocSysUserRole>(DocSysUserRole.class);
+        util.exportExcel(response, list, "用户和角色关联数据");
+    }
+
+    /**
+     * 获取用户和角色关联详细信息
+     */
+    @RequiresPermissions("doc:docUserRole:query")
+    @GetMapping(value = "/{userId}")
+    public AjaxResult getInfo(@PathVariable("userId") Long userId)
+    {
+        return success(docSysUserRoleService.selectDocSysUserRoleByUserId(userId));
+    }
+
+    /**
+     * 新增用户和角色关联
+     */
+    @RequiresPermissions("doc:docUserRole:add")
+    @Log(title = "用户和角色关联", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody DocSysUserRole docSysUserRole)
+    {
+        return toAjax(docSysUserRoleService.insertDocSysUserRole(docSysUserRole));
+    }
+
+    /**
+     * 修改用户和角色关联
+     */
+    @RequiresPermissions("doc:docUserRole:edit")
+    @Log(title = "用户和角色关联", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody DocSysUserRole docSysUserRole)
+    {
+        return toAjax(docSysUserRoleService.updateDocSysUserRole(docSysUserRole));
+    }
+
+    /**
+     * 删除用户和角色关联
+     */
+    @RequiresPermissions("doc:docUserRole:remove")
+    @Log(title = "用户和角色关联", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{userIds}")
+    public AjaxResult remove(@PathVariable Long[] userIds)
+    {
+        return toAjax(docSysUserRoleService.deleteDocSysUserRoleByUserIds(userIds));
+    }
+}

lzga-modules/lzga-doc/src/main/java/com/jjt/doc/domain/DocSysRole.java

@@ -0,0 +1,158 @@
+package com.jjt.doc.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.jjt.common.core.annotation.Excel;
+import com.jjt.common.core.web.domain.BaseEntity;
+
+/**
+ * 角色信息对象 sys_role
+ *
+ * @author wukai
+ * @date 2023-04-21
+ */
+
+@TableName("sys_role")
+public class DocSysRole{
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 角色ID
+     */
+    private Long roleId;
+
+    /**
+     * 角色名称
+     */
+    @Excel(name = "角色名称")
+    private String roleName;
+
+    /**
+     * 角色权限字符串
+     */
+    @Excel(name = "角色权限字符串")
+    private String roleKey;
+
+    /**
+     * 显示顺序
+     */
+    @Excel(name = "显示顺序")
+    private Long roleSort;
+
+    /**
+     * 数据范围（1：全部数据权限 2：自定数据权限 3：本部门数据权限 4：本部门及以下数据权限）
+     */
+    @Excel(name = "数据范围", readConverterExp = "1=：全部数据权限,2=：自定数据权限,3=：本部门数据权限,4=：本部门及以下数据权限")
+    private String dataScope;
+
+    /**
+     * 菜单树选择项是否关联显示
+     */
+    @Excel(name = "菜单树选择项是否关联显示")
+    private Integer menuCheckStrictly;
+
+    /**
+     * 部门树选择项是否关联显示
+     */
+    @Excel(name = "部门树选择项是否关联显示")
+    private Integer deptCheckStrictly;
+
+    /**
+     * 角色状态（0正常 1停用）
+     */
+    @Excel(name = "角色状态", readConverterExp = "0=正常,1=停用")
+    private String status;
+
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
+    private String delFlag;
+
+    public void setRoleId(Long roleId) {
+        this.roleId = roleId;
+    }
+
+    public Long getRoleId() {
+        return roleId;
+    }
+
+    public void setRoleName(String roleName) {
+        this.roleName = roleName;
+    }
+
+    public String getRoleName() {
+        return roleName;
+    }
+
+    public void setRoleKey(String roleKey) {
+        this.roleKey = roleKey;
+    }
+
+    public String getRoleKey() {
+        return roleKey;
+    }
+
+    public void setRoleSort(Long roleSort) {
+        this.roleSort = roleSort;
+    }
+
+    public Long getRoleSort() {
+        return roleSort;
+    }
+
+    public void setDataScope(String dataScope) {
+        this.dataScope = dataScope;
+    }
+
+    public String getDataScope() {
+        return dataScope;
+    }
+
+    public void setMenuCheckStrictly(Integer menuCheckStrictly) {
+        this.menuCheckStrictly = menuCheckStrictly;
+    }
+
+    public Integer getMenuCheckStrictly() {
+        return menuCheckStrictly;
+    }
+
+    public void setDeptCheckStrictly(Integer deptCheckStrictly) {
+        this.deptCheckStrictly = deptCheckStrictly;
+    }
+
+    public Integer getDeptCheckStrictly() {
+        return deptCheckStrictly;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setDelFlag(String delFlag) {
+        this.delFlag = delFlag;
+    }
+
+    public String getDelFlag() {
+        return delFlag;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("roleId", getRoleId())
+                .append("roleName", getRoleName())
+                .append("roleKey", getRoleKey())
+                .append("roleSort", getRoleSort())
+                .append("dataScope", getDataScope())
+                .append("menuCheckStrictly", getMenuCheckStrictly())
+                .append("deptCheckStrictly", getDeptCheckStrictly())
+                .append("status", getStatus())
+                .append("delFlag", getDelFlag())
+                .toString();
+    }
+}

lzga-modules/lzga-doc/src/main/java/com/jjt/system/domain/SysUserRole.java → lzga-modules/lzga-doc/src/main/java/com/jjt/doc/domain/DocSysUserRole.java

@@ -1,5 +1,6 @@
-package com.jjt.system.domain;
+package com.jjt.doc.domain;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.jjt.common.core.annotation.Excel;
@@ -7,44 +8,45 @@ import com.jjt.common.core.web.domain.BaseEntity;
 
 /**
  * 用户和角色关联对象 sys_user_role
- * 
+ *
  * @author wukai
  * @date 2023-04-21
  */
-public class SysUserRole extends BaseEntity
-{
+@TableName("sys_user_role")
+public class DocSysUserRole {
     private static final long serialVersionUID = 1L;
 
-    /** 用户ID */
+    /**
+     * 用户ID
+     */
     private Long userId;
 
-    /** 角色ID */
+    /**
+     * 角色ID
+     */
     private Long roleId;
 
-    public void setUserId(Long userId) 
-    {
+    public void setUserId(Long userId) {
         this.userId = userId;
     }
 
-    public Long getUserId() 
-    {
+    public Long getUserId() {
         return userId;
     }
-    public void setRoleId(Long roleId) 
-    {
+
+    public void setRoleId(Long roleId) {
         this.roleId = roleId;
     }
 
-    public Long getRoleId() 
-    {
+    public Long getRoleId() {
         return roleId;
     }
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("userId", getUserId())
-            .append("roleId", getRoleId())
-            .toString();
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("userId", getUserId())
+                .append("roleId", getRoleId())
+                .toString();
     }
 }

lzga-modules/lzga-doc/src/main/java/com/jjt/doc/domain/SysOperLog.java

@@ -1,262 +0,0 @@
-package com.jjt.doc.domain;
-
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.jjt.common.core.annotation.Excel;
-import com.jjt.common.core.web.domain.BaseEntity;
-
-/**
- * 操作日志记录对象 sys_oper_log
- *
- * @author wukai
- * @date 2023-03-15
- */
-public class SysOperLog extends BaseEntity {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 日志主键
-     */
-    private Long operId;
-
-    /**
-     * 模块标题
-     */
-    @Excel(name = "模块标题")
-    private String title;
-
-    /**
-     * 业务类型（0其它 1新增 2修改 3删除）
-     */
-    @Excel(name = "业务类型", readConverterExp = "0=其它,1=新增,2=修改,3=删除")
-    private Long businessType;
-
-    /**
-     * 方法名称
-     */
-    @Excel(name = "方法名称")
-    private String method;
-
-    /**
-     * 请求方式
-     */
-    @Excel(name = "请求方式")
-    private String requestMethod;
-
-    /**
-     * 操作类别（0其它 1后台用户 2手机端用户）
-     */
-    @Excel(name = "操作类别", readConverterExp = "0=其它,1=后台用户,2=手机端用户")
-    private Long operatorType;
-
-    /**
-     * 操作人员
-     */
-    @Excel(name = "操作人员")
-    private String operName;
-
-    /**
-     * 部门名称
-     */
-    @Excel(name = "部门名称")
-    private String deptName;
-
-    /**
-     * 请求URL
-     */
-    @Excel(name = "请求URL")
-    private String operUrl;
-
-    /**
-     * 主机地址
-     */
-    @Excel(name = "主机地址")
-    private String operIp;
-
-    /**
-     * 操作地点
-     */
-    @Excel(name = "操作地点")
-    private String operLocation;
-
-    /**
-     * 请求参数
-     */
-    @Excel(name = "请求参数")
-    private String operParam;
-
-    /**
-     * 返回参数
-     */
-    @Excel(name = "返回参数")
-    private String jsonResult;
-
-    /**
-     * 操作状态（0正常 1异常）
-     */
-    @Excel(name = "操作状态", readConverterExp = "0=正常,1=异常")
-    private Long status;
-
-    /**
-     * 错误消息
-     */
-    @Excel(name = "错误消息")
-    private String errorMsg;
-
-    /**
-     * 操作时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date operTime;
-
-
-    public void setOperId(Long operId) {
-        this.operId = operId;
-    }
-
-    public Long getOperId() {
-        return operId;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setBusinessType(Long businessType) {
-        this.businessType = businessType;
-    }
-
-    public Long getBusinessType() {
-        return businessType;
-    }
-
-    public void setMethod(String method) {
-        this.method = method;
-    }
-
-    public String getMethod() {
-        return method;
-    }
-
-    public void setRequestMethod(String requestMethod) {
-        this.requestMethod = requestMethod;
-    }
-
-    public String getRequestMethod() {
-        return requestMethod;
-    }
-
-    public void setOperatorType(Long operatorType) {
-        this.operatorType = operatorType;
-    }
-
-    public Long getOperatorType() {
-        return operatorType;
-    }
-
-    public void setOperName(String operName) {
-        this.operName = operName;
-    }
-
-    public String getOperName() {
-        return operName;
-    }
-
-    public void setDeptName(String deptName) {
-        this.deptName = deptName;
-    }
-
-    public String getDeptName() {
-        return deptName;
-    }
-
-    public void setOperUrl(String operUrl) {
-        this.operUrl = operUrl;
-    }
-
-    public String getOperUrl() {
-        return operUrl;
-    }
-
-    public void setOperIp(String operIp) {
-        this.operIp = operIp;
-    }
-
-    public String getOperIp() {
-        return operIp;
-    }
-
-    public void setOperLocation(String operLocation) {
-        this.operLocation = operLocation;
-    }
-
-    public String getOperLocation() {
-        return operLocation;
-    }
-
-    public void setOperParam(String operParam) {
-        this.operParam = operParam;
-    }
-
-    public String getOperParam() {
-        return operParam;
-    }
-
-    public void setJsonResult(String jsonResult) {
-        this.jsonResult = jsonResult;
-    }
-
-    public String getJsonResult() {
-        return jsonResult;
-    }
-
-    public void setStatus(Long status) {
-        this.status = status;
-    }
-
-    public Long getStatus() {
-        return status;
-    }
-
-    public void setErrorMsg(String errorMsg) {
-        this.errorMsg = errorMsg;
-    }
-
-    public String getErrorMsg() {
-        return errorMsg;
-    }
-
-    public void setOperTime(Date operTime) {
-        this.operTime = operTime;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("operId", getOperId())
-                .append("title", getTitle())
-                .append("businessType", getBusinessType())
-                .append("method", getMethod())
-                .append("requestMethod", getRequestMethod())
-                .append("operatorType", getOperatorType())
-                .append("operName", getOperName())
-                .append("deptName", getDeptName())
-                .append("operUrl", getOperUrl())
-                .append("operIp", getOperIp())
-                .append("operLocation", getOperLocation())
-                .append("operParam", getOperParam())
-                .append("jsonResult", getJsonResult())
-                .append("status", getStatus())
-                .append("errorMsg", getErrorMsg())
-                .toString();
-    }
-}

lzga-modules/lzga-doc/src/main/java/com/jjt/doc/mapper/DocGroupMapper.java

@@ -1,19 +1,20 @@
 package com.jjt.doc.mapper;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jjt.doc.domain.DocGroup;
 
 /**
  * 分组Mapper接口
- * 
+ *
  * @author wukai
  * @date 2023-04-20
  */
-public interface DocGroupMapper 
-{
+public interface DocGroupMapper extends BaseMapper<DocGroup> {
     /**
      * 查询分组
-     * 
+     *
      * @param groupId 分组主键
      * @return 分组
      */
@@ -21,7 +22,7 @@ public interface DocGroupMapper
 
     /**
      * 查询分组列表
-     * 
+     *
      * @param docGroup 分组
      * @return 分组集合
      */
@@ -29,7 +30,7 @@ public interface DocGroupMapper
 
     /**
      * 新增分组
-     * 
+     *
      * @param docGroup 分组
      * @return 结果
      */
@@ -37,7 +38,7 @@ public interface DocGroupMapper
 
     /**
      * 修改分组
-     * 
+     *
      * @param docGroup 分组
      * @return 结果
      */
@@ -45,7 +46,7 @@ public interface DocGroupMapper
 
     /**
      * 删除分组
-     * 
+     *
      * @param groupId 分组主键
      * @return 结果
      */
@@ -53,7 +54,7 @@ public interface DocGroupMapper
 
     /**
      * 批量删除分组
-     * 
+     *
      * @param groupIds 需要删除的数据主键集合
      * @return 结果
      */

lzga-modules/lzga-doc/src/main/java/com/jjt/system/mapper/SysRoleMapper.java → lzga-modules/lzga-doc/src/main/java/com/jjt/doc/mapper/DocSysRoleMapper.java

@@ -1,9 +1,9 @@
-package com.jjt.system.mapper;
+package com.jjt.doc.mapper;
 
 import java.util.List;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.jjt.system.domain.SysRole;
+import com.jjt.doc.domain.DocSysRole;
 
 /**
  * 角色信息Mapper接口
@@ -11,38 +11,38 @@ import com.jjt.system.domain.SysRole;
  * @author wukai
  * @date 2023-04-21
  */
-public interface SysRoleMapper extends BaseMapper<SysRole> {
+public interface DocSysRoleMapper extends BaseMapper<DocSysRole> {
     /**
      * 查询角色信息
      *
      * @param roleId 角色信息主键
      * @return 角色信息
      */
-    public SysRole selectSysRoleByRoleId(Long roleId);
+    public DocSysRole selectDocSysRoleByRoleId(Long roleId);
 
     /**
      * 查询角色信息列表
      *
-     * @param sysRole 角色信息
+     * @param docSysRole 角色信息
      * @return 角色信息集合
      */
-    public List<SysRole> selectSysRoleList(SysRole sysRole);
+    public List<DocSysRole> selectDocSysRoleList(DocSysRole docSysRole);
 
     /**
      * 新增角色信息
      *
-     * @param sysRole 角色信息
+     * @param docSysRole 角色信息
      * @return 结果
      */
-    public int insertSysRole(SysRole sysRole);
+    public int insertDocSysRole(DocSysRole docSysRole);
 
     /**
      * 修改角色信息
      *
-     * @param sysRole 角色信息
+     * @param docSysRole 角色信息
      * @return 结果
      */
-    public int updateSysRole(SysRole sysRole);
+    public int updateDocSysRole(DocSysRole docSysRole);
 
     /**
      * 删除角色信息
@@ -50,7 +50,7 @@ public interface SysRoleMapper extends BaseMapper<SysRole> {
      * @param roleId 角色信息主键
      * @return 结果
      */
-    public int deleteSysRoleByRoleId(Long roleId);
+    public int deleteDocSysRoleByRoleId(Long roleId);
 
     /**
      * 批量删除角色信息
@@ -58,5 +58,5 @@ public interface SysRoleMapper extends BaseMapper<SysRole> {
      * @param roleIds 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteSysRoleByRoleIds(Long[] roleIds);
+    public int deleteDocSysRoleByRoleIds(Long[] roleIds);
 }

lzga-modules/lzga-doc/src/main/java/com/jjt/doc/mapper/DocSysUserRoleMapper.java

@@ -0,0 +1,108 @@
+package com.jjt.doc.mapper;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jjt.doc.domain.DocSysUserRole;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * 用户和角色关联Mapper接口
+ *
+ * @author wukai
+ * @date 2023-04-21
+ */
+public interface DocSysUserRoleMapper extends BaseMapper<DocSysUserRole> {
+    /**
+     * 查询用户和角色关联
+     *
+     * @param userId 用户和角色关联主键
+     * @return 用户和角色关联
+     */
+    public DocSysUserRole selectDocSysUserRoleByUserId(Long userId);
+
+    /**
+     * 查询用户和角色关联列表
+     *
+     * @param docSysUserRole 用户和角色关联
+     * @return 用户和角色关联集合
+     */
+    public List<DocSysUserRole> selectDocSysUserRoleList(DocSysUserRole docSysUserRole);
+
+    /**
+     * 新增用户和角色关联
+     *
+     * @param docSysUserRole 用户和角色关联
+     * @return 结果
+     */
+    public int insertDocSysUserRole(DocSysUserRole docSysUserRole);
+
+    /**
+     * 修改用户和角色关联
+     *
+     * @param docSysUserRole 用户和角色关联
+     * @return 结果
+     */
+    public int updateDocSysUserRole(DocSysUserRole docSysUserRole);
+
+    /**
+     * 删除用户和角色关联
+     *
+     * @param userId 用户和角色关联主键
+     * @return 结果
+     */
+    public int deleteDocSysUserRoleByUserId(Long userId);
+
+    /**
+     * 批量删除用户和角色关联
+     *
+     * @param userIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteDocSysUserRoleByUserIds(Long[] userIds);
+
+    /**
+     * 清理非分组管理员的角色信息
+     *
+     * @param roleId
+     * @return
+     */
+    @Delete("delete from sys_user_role where role_id=#{roleId} and user_id not in (select group_manager from doc_group where IS_DEL!='1')")
+    public int clearGroupManagerRole(Long roleId);
+
+    /**
+     * 插入分组管理员的角色信息
+     *
+     * @param roleId
+     * @return
+     */
+    @Insert("insert into sys_user_role (role_id,user_id)" +
+            " select distinct #{roleId},group_manager from doc_group" +
+            " where IS_DEL!='1' and group_manager not in (select user_id from sys_user_role where role_id=#{roleId})")
+    public int insertGroupManagerRole(Long roleId);
+
+    /**
+     * 清理非分组管理员的角色信息
+     *
+     * @param roleId
+     * @return
+     */
+    @Delete("delete from sys_user_role" +
+            " where role_id=#{roleId} and user_id not in " +
+            " (select b.user_id from doc_group a,doc_group_user b where a.GROUP_ID=b.GROUP_ID and a.IS_DEL!='1')")
+    public int clearGroupUserRole(Long roleId);
+
+    /**
+     * 插入分组成员角色信息
+     *
+     * @param roleId
+     * @return
+     */
+    @Insert("insert into sys_user_role (role_id,user_id)" +
+            " select distinct #{roleId},b.user_id from doc_group a,doc_group_user b" +
+            " where  a.GROUP_ID=b.GROUP_ID and a.IS_DEL!='1'" +
+            " and b.user_id not in (select user_id from sys_user_role where role_id=#{roleId})")
+    public int insertGroupUserRole(Long roleId);
+}

lzga-modules/lzga-doc/src/main/java/com/jjt/system/service/ISysRoleService.java → lzga-modules/lzga-doc/src/main/java/com/jjt/doc/service/IDocSysRoleService.java

@@ -1,7 +1,7 @@
-package com.jjt.system.service;
+package com.jjt.doc.service;
 
 import java.util.List;
-import com.jjt.system.domain.SysRole;
+import com.jjt.doc.domain.DocSysRole;
 
 /**
  * 角色信息Service接口
@@ -9,7 +9,7 @@ import com.jjt.system.domain.SysRole;
  * @author wukai
  * @date 2023-04-21
  */
-public interface ISysRoleService 
+public interface IDocSysRoleService 
 {
     /**
      * 查询角色信息
@@ -17,31 +17,31 @@ public interface ISysRoleService
      * @param roleId 角色信息主键
      * @return 角色信息
      */
-    public SysRole selectSysRoleByRoleId(Long roleId);
+    public DocSysRole selectDocSysRoleByRoleId(Long roleId);
 
     /**
      * 查询角色信息列表
      * 
-     * @param sysRole 角色信息
+     * @param docSysRole 角色信息
      * @return 角色信息集合
      */
-    public List<SysRole> selectSysRoleList(SysRole sysRole);
+    public List<DocSysRole> selectDocSysRoleList(DocSysRole docSysRole);
 
     /**
      * 新增角色信息
      * 
-     * @param sysRole 角色信息
+     * @param docSysRole 角色信息
      * @return 结果
      */
-    public int insertSysRole(SysRole sysRole);
+    public int insertDocSysRole(DocSysRole docSysRole);
 
     /**
      * 修改角色信息
      * 
-     * @param sysRole 角色信息
+     * @param docSysRole 角色信息
      * @return 结果
      */
-    public int updateSysRole(SysRole sysRole);
+    public int updateDocSysRole(DocSysRole docSysRole);
 
     /**
      * 批量删除角色信息
@@ -49,7 +49,7 @@ public interface ISysRoleService
      * @param roleIds 需要删除的角色信息主键集合
      * @return 结果
      */
-    public int deleteSysRoleByRoleIds(Long[] roleIds);
+    public int deleteDocSysRoleByRoleIds(Long[] roleIds);
 
     /**
      * 删除角色信息信息
@@ -57,5 +57,5 @@ public interface ISysRoleService
      * @param roleId 角色信息主键
      * @return 结果
      */
-    public int deleteSysRoleByRoleId(Long roleId);
+    public int deleteDocSysRoleByRoleId(Long roleId);
 }

lzga-modules/lzga-doc/src/main/java/com/jjt/system/service/ISysUserRoleService.java → lzga-modules/lzga-doc/src/main/java/com/jjt/doc/service/IDocSysUserRoleService.java

@@ -1,7 +1,7 @@
-package com.jjt.system.service;
+package com.jjt.doc.service;
 
 import java.util.List;
-import com.jjt.system.domain.SysUserRole;
+import com.jjt.doc.domain.DocSysUserRole;
 
 /**
  * 用户和角色关联Service接口
@@ -9,7 +9,7 @@ import com.jjt.system.domain.SysUserRole;
  * @author wukai
  * @date 2023-04-21
  */
-public interface ISysUserRoleService 
+public interface IDocSysUserRoleService 
 {
     /**
      * 查询用户和角色关联
@@ -17,31 +17,31 @@ public interface ISysUserRoleService
      * @param userId 用户和角色关联主键
      * @return 用户和角色关联
      */
-    public SysUserRole selectSysUserRoleByUserId(Long userId);
+    public DocSysUserRole selectDocSysUserRoleByUserId(Long userId);
 
     /**
      * 查询用户和角色关联列表
      * 
-     * @param sysUserRole 用户和角色关联
+     * @param docSysUserRole 用户和角色关联
      * @return 用户和角色关联集合
      */
-    public List<SysUserRole> selectSysUserRoleList(SysUserRole sysUserRole);
+    public List<DocSysUserRole> selectDocSysUserRoleList(DocSysUserRole docSysUserRole);
 
     /**
      * 新增用户和角色关联
      * 
-     * @param sysUserRole 用户和角色关联
+     * @param docSysUserRole 用户和角色关联
      * @return 结果
      */
-    public int insertSysUserRole(SysUserRole sysUserRole);
+    public int insertDocSysUserRole(DocSysUserRole docSysUserRole);
 
     /**
      * 修改用户和角色关联
      * 
-     * @param sysUserRole 用户和角色关联
+     * @param docSysUserRole 用户和角色关联
      * @return 结果
      */
-    public int updateSysUserRole(SysUserRole sysUserRole);
+    public int updateDocSysUserRole(DocSysUserRole docSysUserRole);
 
     /**
      * 批量删除用户和角色关联
@@ -49,7 +49,7 @@ public interface ISysUserRoleService
      * @param userIds 需要删除的用户和角色关联主键集合
      * @return 结果
      */
-    public int deleteSysUserRoleByUserIds(Long[] userIds);
+    public int deleteDocSysUserRoleByUserIds(Long[] userIds);
 
     /**
      * 删除用户和角色关联信息
@@ -57,5 +57,5 @@ public interface ISysUserRoleService
      * @param userId 用户和角色关联主键
      * @return 结果
      */
-    public int deleteSysUserRoleByUserId(Long userId);
+    public int deleteDocSysUserRoleByUserId(Long userId);
 }

lzga-modules/lzga-doc/src/main/java/com/jjt/doc/service/impl/DocGroupServiceImpl.java

@@ -1,20 +1,19 @@
 package com.jjt.doc.service.impl;
 
-import java.util.List;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.jjt.common.core.utils.DateUtils;
-import com.jjt.system.domain.SysRole;
-import com.jjt.system.domain.SysUserRole;
-import com.jjt.system.mapper.SysRoleMapper;
-import com.jjt.system.mapper.SysUserRoleMapper;
-import org.springframework.stereotype.Service;
-import com.jjt.doc.mapper.DocGroupMapper;
 import com.jjt.doc.domain.DocGroup;
+import com.jjt.doc.domain.DocSysRole;
+import com.jjt.doc.domain.DocSysUserRole;
+import com.jjt.doc.mapper.DocGroupMapper;
+import com.jjt.doc.mapper.DocSysRoleMapper;
+import com.jjt.doc.mapper.DocSysUserRoleMapper;
+import com.jjt.doc.service.IDocGroupService;
+import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-
-import com.jjt.doc.service.IDocGroupService;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 分组Service业务层处理
@@ -27,9 +26,9 @@ public class DocGroupServiceImpl implements IDocGroupService {
     @Resource
     private DocGroupMapper docGroupMapper;
     @Resource
-    private SysUserRoleMapper userRoleMapper;
+    private DocSysUserRoleMapper userRoleMapper;
     @Resource
-    private SysRoleMapper roleMapper;
+    private DocSysRoleMapper roleMapper;
 
     /**
      * 查询分组
@@ -61,14 +60,22 @@ public class DocGroupServiceImpl implements IDocGroupService {
      */
     @Override
     public int insertDocGroup(DocGroup docGroup) {
-        QueryWrapper<SysRole> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("role_key", "group.manager");
-//        queryWrapper.eq("role_key", "group.user");
-
-        SysRole role = roleMapper.selectOne(queryWrapper);
-
         docGroup.setCreateTime(DateUtils.getNowDate());
-        return docGroupMapper.insertDocGroup(docGroup);
+        int r = docGroupMapper.insertDocGroup(docGroup);
+        groupManagerRole();
+        return r;
+    }
+
+    /**
+     * 处理分组管理员角色相关事情
+     */
+    private void groupManagerRole() {
+        //查询分组管理员角色
+        QueryWrapper<DocSysRole> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("role_key", "group.manager");
+        DocSysRole role = roleMapper.selectOne(queryWrapper);
+        userRoleMapper.clearGroupManagerRole(role.getRoleId());
+        userRoleMapper.insertGroupManagerRole(role.getRoleId());
     }
 
     /**
@@ -80,7 +87,9 @@ public class DocGroupServiceImpl implements IDocGroupService {
     @Override
     public int updateDocGroup(DocGroup docGroup) {
         docGroup.setUpdateTime(DateUtils.getNowDate());
-        return docGroupMapper.updateDocGroup(docGroup);
+        int r = docGroupMapper.updateDocGroup(docGroup);
+        groupManagerRole();
+        return r;
     }
 
     /**
@@ -91,7 +100,9 @@ public class DocGroupServiceImpl implements IDocGroupService {
      */
     @Override
     public int deleteDocGroupByGroupIds(Long[] groupIds) {
-        return docGroupMapper.deleteDocGroupByGroupIds(groupIds);
+        int r = docGroupMapper.deleteDocGroupByGroupIds(groupIds);
+        groupManagerRole();
+        return r;
     }
 
     /**
@@ -102,6 +113,8 @@ public class DocGroupServiceImpl implements IDocGroupService {
      */
     @Override
     public int deleteDocGroupByGroupId(Long groupId) {
-        return docGroupMapper.deleteDocGroupByGroupId(groupId);
+        int r = docGroupMapper.deleteDocGroupByGroupId(groupId);
+        groupManagerRole();
+        return r;
     }
 }

lzga-modules/lzga-doc/src/main/java/com/jjt/doc/service/impl/DocGroupUserServiceImpl.java

@@ -1,17 +1,20 @@
 package com.jjt.doc.service.impl;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import com.jjt.system.api.domain.SysUser;
-import com.jjt.system.service.ISysUserRoleService;
-import org.springframework.stereotype.Service;
-import com.jjt.doc.mapper.DocGroupUserMapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.jjt.doc.domain.DocGroup;
 import com.jjt.doc.domain.DocGroupUser;
+import com.jjt.doc.domain.DocSysRole;
+import com.jjt.doc.domain.DocSysUserRole;
+import com.jjt.doc.mapper.DocGroupUserMapper;
+import com.jjt.doc.mapper.DocSysRoleMapper;
+import com.jjt.doc.mapper.DocSysUserRoleMapper;
+import com.jjt.doc.service.IDocGroupUserService;
+import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-
-import com.jjt.doc.service.IDocGroupUserService;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 分组成员Service业务层处理
@@ -23,6 +26,23 @@ import com.jjt.doc.service.IDocGroupUserService;
 public class DocGroupUserServiceImpl implements IDocGroupUserService {
     @Resource
     private DocGroupUserMapper docGroupUserMapper;
+    @Resource
+    private DocSysUserRoleMapper userRoleMapper;
+    @Resource
+    private DocSysRoleMapper roleMapper;
+
+    /**
+     * 处理分组成员角色相关事情
+     */
+    private void groupUserRole() {
+        //查询分组成员角色
+        QueryWrapper<DocSysRole> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("role_key", "group.user");
+        DocSysRole role = roleMapper.selectOne(queryWrapper);
+        //清理后插入
+        userRoleMapper.clearGroupUserRole(role.getRoleId());
+        userRoleMapper.insertGroupUserRole(role.getRoleId());
+    }
 
 
     /**
@@ -118,7 +138,9 @@ public class DocGroupUserServiceImpl implements IDocGroupUserService {
             gu.setGroupId(groupId);
             list.add(gu);
         }
-        return docGroupUserMapper.batchGroupUser(list);
+        int r = docGroupUserMapper.batchGroupUser(list);
+        groupUserRole();
+        return r;
     }
 
     /**
@@ -130,6 +152,8 @@ public class DocGroupUserServiceImpl implements IDocGroupUserService {
      */
     @Override
     public int deleteGroupUsers(Long groupId, Long[] userIds) {
-        return docGroupUserMapper.deleteGroupUsers(groupId, userIds);
+        int r = docGroupUserMapper.deleteGroupUsers(groupId, userIds);
+        groupUserRole();
+        return r;
     }
 }

lzga-modules/lzga-doc/src/main/java/com/jjt/doc/service/impl/DocSysRoleServiceImpl.java

@@ -0,0 +1,90 @@
+package com.jjt.doc.service.impl;
+
+import java.util.List;
+
+import com.jjt.common.core.utils.DateUtils;
+import org.springframework.stereotype.Service;
+import com.jjt.doc.mapper.DocSysRoleMapper;
+import com.jjt.doc.domain.DocSysRole;
+
+import javax.annotation.Resource;
+
+import com.jjt.doc.service.IDocSysRoleService;
+
+/**
+ * 角色信息Service业务层处理
+ *
+ * @author wukai
+ * @date 2023-04-21
+ */
+@Service
+public class DocSysRoleServiceImpl implements IDocSysRoleService {
+    @Resource
+    private DocSysRoleMapper docSysRoleMapper;
+
+    /**
+     * 查询角色信息
+     *
+     * @param roleId 角色信息主键
+     * @return 角色信息
+     */
+    @Override
+    public DocSysRole selectDocSysRoleByRoleId(Long roleId) {
+        return docSysRoleMapper.selectDocSysRoleByRoleId(roleId);
+    }
+
+    /**
+     * 查询角色信息列表
+     *
+     * @param docSysRole 角色信息
+     * @return 角色信息
+     */
+    @Override
+    public List<DocSysRole> selectDocSysRoleList(DocSysRole docSysRole) {
+        return docSysRoleMapper.selectDocSysRoleList(docSysRole);
+    }
+
+    /**
+     * 新增角色信息
+     *
+     * @param docSysRole 角色信息
+     * @return 结果
+     */
+    @Override
+    public int insertDocSysRole(DocSysRole docSysRole) {
+        return docSysRoleMapper.insertDocSysRole(docSysRole);
+    }
+
+    /**
+     * 修改角色信息
+     *
+     * @param docSysRole 角色信息
+     * @return 结果
+     */
+    @Override
+    public int updateDocSysRole(DocSysRole docSysRole) {
+        return docSysRoleMapper.updateDocSysRole(docSysRole);
+    }
+
+    /**
+     * 批量删除角色信息
+     *
+     * @param roleIds 需要删除的角色信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteDocSysRoleByRoleIds(Long[] roleIds) {
+        return docSysRoleMapper.deleteDocSysRoleByRoleIds(roleIds);
+    }
+
+    /**
+     * 删除角色信息信息
+     *
+     * @param roleId 角色信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteDocSysRoleByRoleId(Long roleId) {
+        return docSysRoleMapper.deleteDocSysRoleByRoleId(roleId);
+    }
+}

lzga-modules/lzga-doc/src/main/java/com/jjt/doc/service/impl/DocSysUserRoleServiceImpl.java

@@ -0,0 +1,89 @@
+package com.jjt.doc.service.impl;
+
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+import com.jjt.doc.mapper.DocSysUserRoleMapper;
+import com.jjt.doc.domain.DocSysUserRole;
+
+import javax.annotation.Resource;
+
+import com.jjt.doc.service.IDocSysUserRoleService;
+
+/**
+ * 用户和角色关联Service业务层处理
+ *
+ * @author wukai
+ * @date 2023-04-21
+ */
+@Service
+public class DocSysUserRoleServiceImpl implements IDocSysUserRoleService {
+    @Resource
+    private DocSysUserRoleMapper docSysUserRoleMapper;
+
+    /**
+     * 查询用户和角色关联
+     *
+     * @param userId 用户和角色关联主键
+     * @return 用户和角色关联
+     */
+    @Override
+    public DocSysUserRole selectDocSysUserRoleByUserId(Long userId) {
+        return docSysUserRoleMapper.selectDocSysUserRoleByUserId(userId);
+    }
+
+    /**
+     * 查询用户和角色关联列表
+     *
+     * @param docSysUserRole 用户和角色关联
+     * @return 用户和角色关联
+     */
+    @Override
+    public List<DocSysUserRole> selectDocSysUserRoleList(DocSysUserRole docSysUserRole) {
+        return docSysUserRoleMapper.selectDocSysUserRoleList(docSysUserRole);
+    }
+
+    /**
+     * 新增用户和角色关联
+     *
+     * @param docSysUserRole 用户和角色关联
+     * @return 结果
+     */
+    @Override
+    public int insertDocSysUserRole(DocSysUserRole docSysUserRole) {
+        return docSysUserRoleMapper.insertDocSysUserRole(docSysUserRole);
+    }
+
+    /**
+     * 修改用户和角色关联
+     *
+     * @param docSysUserRole 用户和角色关联
+     * @return 结果
+     */
+    @Override
+    public int updateDocSysUserRole(DocSysUserRole docSysUserRole) {
+        return docSysUserRoleMapper.updateDocSysUserRole(docSysUserRole);
+    }
+
+    /**
+     * 批量删除用户和角色关联
+     *
+     * @param userIds 需要删除的用户和角色关联主键
+     * @return 结果
+     */
+    @Override
+    public int deleteDocSysUserRoleByUserIds(Long[] userIds) {
+        return docSysUserRoleMapper.deleteDocSysUserRoleByUserIds(userIds);
+    }
+
+    /**
+     * 删除用户和角色关联信息
+     *
+     * @param userId 用户和角色关联主键
+     * @return 结果
+     */
+    @Override
+    public int deleteDocSysUserRoleByUserId(Long userId) {
+        return docSysUserRoleMapper.deleteDocSysUserRoleByUserId(userId);
+    }
+}

lzga-modules/lzga-doc/src/main/java/com/jjt/system/domain/SysRole.java

@@ -1,153 +0,0 @@
-package com.jjt.system.domain;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.jjt.common.core.annotation.Excel;
-import com.jjt.common.core.web.domain.BaseEntity;
-
-/**
- * 角色信息对象 sys_role
- * 
- * @author wukai
- * @date 2023-04-21
- */
-public class SysRole extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 角色ID */
-    private Long roleId;
-
-    /** 角色名称 */
-    @Excel(name = "角色名称")
-    private String roleName;
-
-    /** 角色权限字符串 */
-    @Excel(name = "角色权限字符串")
-    private String roleKey;
-
-    /** 显示顺序 */
-    @Excel(name = "显示顺序")
-    private Long roleSort;
-
-    /** 数据范围（1：全部数据权限 2：自定数据权限 3：本部门数据权限 4：本部门及以下数据权限） */
-    @Excel(name = "数据范围", readConverterExp = "1=：全部数据权限,2=：自定数据权限,3=：本部门数据权限,4=：本部门及以下数据权限")
-    private String dataScope;
-
-    /** 菜单树选择项是否关联显示 */
-    @Excel(name = "菜单树选择项是否关联显示")
-    private Integer menuCheckStrictly;
-
-    /** 部门树选择项是否关联显示 */
-    @Excel(name = "部门树选择项是否关联显示")
-    private Integer deptCheckStrictly;
-
-    /** 角色状态（0正常 1停用） */
-    @Excel(name = "角色状态", readConverterExp = "0=正常,1=停用")
-    private String status;
-
-    /** 删除标志（0代表存在 2代表删除） */
-    private String delFlag;
-
-    public void setRoleId(Long roleId) 
-    {
-        this.roleId = roleId;
-    }
-
-    public Long getRoleId() 
-    {
-        return roleId;
-    }
-    public void setRoleName(String roleName) 
-    {
-        this.roleName = roleName;
-    }
-
-    public String getRoleName() 
-    {
-        return roleName;
-    }
-    public void setRoleKey(String roleKey) 
-    {
-        this.roleKey = roleKey;
-    }
-
-    public String getRoleKey() 
-    {
-        return roleKey;
-    }
-    public void setRoleSort(Long roleSort) 
-    {
-        this.roleSort = roleSort;
-    }
-
-    public Long getRoleSort() 
-    {
-        return roleSort;
-    }
-    public void setDataScope(String dataScope) 
-    {
-        this.dataScope = dataScope;
-    }
-
-    public String getDataScope() 
-    {
-        return dataScope;
-    }
-    public void setMenuCheckStrictly(Integer menuCheckStrictly) 
-    {
-        this.menuCheckStrictly = menuCheckStrictly;
-    }
-
-    public Integer getMenuCheckStrictly() 
-    {
-        return menuCheckStrictly;
-    }
-    public void setDeptCheckStrictly(Integer deptCheckStrictly) 
-    {
-        this.deptCheckStrictly = deptCheckStrictly;
-    }
-
-    public Integer getDeptCheckStrictly() 
-    {
-        return deptCheckStrictly;
-    }
-    public void setStatus(String status) 
-    {
-        this.status = status;
-    }
-
-    public String getStatus() 
-    {
-        return status;
-    }
-    public void setDelFlag(String delFlag) 
-    {
-        this.delFlag = delFlag;
-    }
-
-    public String getDelFlag() 
-    {
-        return delFlag;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("roleId", getRoleId())
-            .append("roleName", getRoleName())
-            .append("roleKey", getRoleKey())
-            .append("roleSort", getRoleSort())
-            .append("dataScope", getDataScope())
-            .append("menuCheckStrictly", getMenuCheckStrictly())
-            .append("deptCheckStrictly", getDeptCheckStrictly())
-            .append("status", getStatus())
-            .append("delFlag", getDelFlag())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
-    }
-}

lzga-modules/lzga-doc/src/main/java/com/jjt/system/mapper/SysUserRoleMapper.java

@@ -1,63 +0,0 @@
-package com.jjt.system.mapper;
-
-import java.util.List;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.jjt.system.domain.SysRole;
-import com.jjt.system.domain.SysUserRole;
-
-/**
- * 用户和角色关联Mapper接口
- *
- * @author wukai
- * @date 2023-04-21
- */
-public interface SysUserRoleMapper extends BaseMapper<SysUserRole> {
-    /**
-     * 查询用户和角色关联
-     *
-     * @param userId 用户和角色关联主键
-     * @return 用户和角色关联
-     */
-    public SysUserRole selectSysUserRoleByUserId(Long userId);
-
-    /**
-     * 查询用户和角色关联列表
-     *
-     * @param sysUserRole 用户和角色关联
-     * @return 用户和角色关联集合
-     */
-    public List<SysUserRole> selectSysUserRoleList(SysUserRole sysUserRole);
-
-    /**
-     * 新增用户和角色关联
-     *
-     * @param sysUserRole 用户和角色关联
-     * @return 结果
-     */
-    public int insertSysUserRole(SysUserRole sysUserRole);
-
-    /**
-     * 修改用户和角色关联
-     *
-     * @param sysUserRole 用户和角色关联
-     * @return 结果
-     */
-    public int updateSysUserRole(SysUserRole sysUserRole);
-
-    /**
-     * 删除用户和角色关联
-     *
-     * @param userId 用户和角色关联主键
-     * @return 结果
-     */
-    public int deleteSysUserRoleByUserId(Long userId);
-
-    /**
-     * 批量删除用户和角色关联
-     *
-     * @param userIds 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int deleteSysUserRoleByUserIds(Long[] userIds);
-}

lzga-modules/lzga-doc/src/main/java/com/jjt/system/service/impl/SysRoleServiceImpl.java

@@ -1,96 +0,0 @@
-package com.jjt.system.service.impl;
-
-import java.util.List;
-import com.jjt.common.core.utils.DateUtils;
-import org.springframework.stereotype.Service;
-import com.jjt.system.mapper.SysRoleMapper;
-import com.jjt.system.domain.SysRole;
-import javax.annotation.Resource;
-import com.jjt.system.service.ISysRoleService;
-
-/**
- * 角色信息Service业务层处理
- *
- * @author wukai
- * @date 2023-04-21
- */
-@Service
-public class SysRoleServiceImpl implements ISysRoleService
-{
-    @Resource
-    private SysRoleMapper sysRoleMapper;
-
-    /**
-     * 查询角色信息
-     *
-     * @param roleId 角色信息主键
-     * @return 角色信息
-     */
-    @Override
-    public SysRole selectSysRoleByRoleId(Long roleId)
-    {
-        return sysRoleMapper.selectSysRoleByRoleId(roleId);
-    }
-
-    /**
-     * 查询角色信息列表
-     *
-     * @param sysRole 角色信息
-     * @return 角色信息
-     */
-    @Override
-    public List<SysRole> selectSysRoleList(SysRole sysRole)
-    {
-        return sysRoleMapper.selectSysRoleList(sysRole);
-    }
-
-    /**
-     * 新增角色信息
-     *
-     * @param sysRole 角色信息
-     * @return 结果
-     */
-    @Override
-    public int insertSysRole(SysRole sysRole)
-    {
-        sysRole.setCreateTime(DateUtils.getNowDate());
-        return sysRoleMapper.insertSysRole(sysRole);
-    }
-
-    /**
-     * 修改角色信息
-     *
-     * @param sysRole 角色信息
-     * @return 结果
-     */
-    @Override
-    public int updateSysRole(SysRole sysRole)
-    {
-        sysRole.setUpdateTime(DateUtils.getNowDate());
-        return sysRoleMapper.updateSysRole(sysRole);
-    }
-
-    /**
-     * 批量删除角色信息
-     *
-     * @param roleIds 需要删除的角色信息主键
-     * @return 结果
-     */
-    @Override
-    public int deleteSysRoleByRoleIds(Long[] roleIds)
-    {
-        return sysRoleMapper.deleteSysRoleByRoleIds(roleIds);
-    }
-
-    /**
-     * 删除角色信息信息
-     *
-     * @param roleId 角色信息主键
-     * @return 结果
-     */
-    @Override
-    public int deleteSysRoleByRoleId(Long roleId)
-    {
-        return sysRoleMapper.deleteSysRoleByRoleId(roleId);
-    }
-}

lzga-modules/lzga-doc/src/main/java/com/jjt/system/service/impl/SysUserRoleServiceImpl.java

@@ -1,93 +0,0 @@
-package com.jjt.system.service.impl;
-
-import java.util.List;
-import org.springframework.stereotype.Service;
-import com.jjt.system.mapper.SysUserRoleMapper;
-import com.jjt.system.domain.SysUserRole;
-import javax.annotation.Resource;
-import com.jjt.system.service.ISysUserRoleService;
-
-/**
- * 用户和角色关联Service业务层处理
- *
- * @author wukai
- * @date 2023-04-21
- */
-@Service
-public class SysUserRoleServiceImpl implements ISysUserRoleService
-{
-    @Resource
-    private SysUserRoleMapper sysUserRoleMapper;
-
-    /**
-     * 查询用户和角色关联
-     *
-     * @param userId 用户和角色关联主键
-     * @return 用户和角色关联
-     */
-    @Override
-    public SysUserRole selectSysUserRoleByUserId(Long userId)
-    {
-        return sysUserRoleMapper.selectSysUserRoleByUserId(userId);
-    }
-
-    /**
-     * 查询用户和角色关联列表
-     *
-     * @param sysUserRole 用户和角色关联
-     * @return 用户和角色关联
-     */
-    @Override
-    public List<SysUserRole> selectSysUserRoleList(SysUserRole sysUserRole)
-    {
-        return sysUserRoleMapper.selectSysUserRoleList(sysUserRole);
-    }
-
-    /**
-     * 新增用户和角色关联
-     *
-     * @param sysUserRole 用户和角色关联
-     * @return 结果
-     */
-    @Override
-    public int insertSysUserRole(SysUserRole sysUserRole)
-    {
-        return sysUserRoleMapper.insertSysUserRole(sysUserRole);
-    }
-
-    /**
-     * 修改用户和角色关联
-     *
-     * @param sysUserRole 用户和角色关联
-     * @return 结果
-     */
-    @Override
-    public int updateSysUserRole(SysUserRole sysUserRole)
-    {
-        return sysUserRoleMapper.updateSysUserRole(sysUserRole);
-    }
-
-    /**
-     * 批量删除用户和角色关联
-     *
-     * @param userIds 需要删除的用户和角色关联主键
-     * @return 结果
-     */
-    @Override
-    public int deleteSysUserRoleByUserIds(Long[] userIds)
-    {
-        return sysUserRoleMapper.deleteSysUserRoleByUserIds(userIds);
-    }
-
-    /**
-     * 删除用户和角色关联信息
-     *
-     * @param userId 用户和角色关联主键
-     * @return 结果
-     */
-    @Override
-    public int deleteSysUserRoleByUserId(Long userId)
-    {
-        return sysUserRoleMapper.deleteSysUserRoleByUserId(userId);
-    }
-}

lzga-modules/lzga-doc/src/main/resources/mapper/system/SysRoleMapper.xml → lzga-modules/lzga-doc/src/main/resources/mapper/doc/DocSysRoleMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.jjt.system.mapper.SysRoleMapper">
+<mapper namespace="com.jjt.doc.mapper.DocSysRoleMapper">
     
-    <resultMap type="SysRole" id="SysRoleResult">
+    <resultMap type="DocSysRole" id="DocSysRoleResult">
         <result property="roleId"    column="role_id"    />
         <result property="roleName"    column="role_name"    />
         <result property="roleKey"    column="role_key"    />
@@ -21,12 +21,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remark"    column="remark"    />
     </resultMap>
 
-    <sql id="selectSysRoleVo">
+    <sql id="selectDocSysRoleVo">
         select role_id, role_name, role_key, role_sort, data_scope, menu_check_strictly, dept_check_strictly, status, del_flag, create_by, create_time, update_by, update_time, remark from sys_role
     </sql>
 
-    <select id="selectSysRoleList" parameterType="SysRole" resultMap="SysRoleResult">
-        <include refid="selectSysRoleVo"/>
+    <select id="selectDocSysRoleList" parameterType="DocSysRole" resultMap="DocSysRoleResult">
+        <include refid="selectDocSysRoleVo"/>
         <where>  
             <if test="roleName != null  and roleName != ''"> and role_name like concat('%', #{roleName}, '%')</if>
             <if test="roleKey != null  and roleKey != ''"> and role_key = #{roleKey}</if>
@@ -38,12 +38,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
     
-    <select id="selectSysRoleByRoleId" parameterType="Long" resultMap="SysRoleResult">
-        <include refid="selectSysRoleVo"/>
+    <select id="selectDocSysRoleByRoleId" parameterType="Long" resultMap="DocSysRoleResult">
+        <include refid="selectDocSysRoleVo"/>
         where role_id = #{roleId}
     </select>
         
-    <insert id="insertSysRole" parameterType="SysRole" useGeneratedKeys="true" keyProperty="roleId">
+    <insert id="insertDocSysRole" parameterType="DocSysRole" useGeneratedKeys="true" keyProperty="roleId">
         insert into sys_role
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="roleName != null and roleName != ''">role_name,</if>
@@ -77,7 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="updateSysRole" parameterType="SysRole">
+    <update id="updateDocSysRole" parameterType="DocSysRole">
         update sys_role
         <trim prefix="SET" suffixOverrides=",">
             <if test="roleName != null and roleName != ''">role_name = #{roleName},</if>
@@ -97,11 +97,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where role_id = #{roleId}
     </update>
 
-    <delete id="deleteSysRoleByRoleId" parameterType="Long">
+    <delete id="deleteDocSysRoleByRoleId" parameterType="Long">
         delete from sys_role where role_id = #{roleId}
     </delete>
 
-    <delete id="deleteSysRoleByRoleIds" parameterType="String">
+    <delete id="deleteDocSysRoleByRoleIds" parameterType="String">
         delete from sys_role where role_id in 
         <foreach item="roleId" collection="array" open="(" separator="," close=")">
             #{roleId}

lzga-modules/lzga-doc/src/main/resources/mapper/system/SysUserRoleMapper.xml → lzga-modules/lzga-doc/src/main/resources/mapper/doc/DocSysUserRoleMapper.xml

@@ -2,29 +2,29 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.jjt.system.mapper.SysUserRoleMapper">
+<mapper namespace="com.jjt.doc.mapper.DocSysUserRoleMapper">
     
-    <resultMap type="SysUserRole" id="SysUserRoleResult">
+    <resultMap type="DocSysUserRole" id="DocSysUserRoleResult">
         <result property="userId"    column="user_id"    />
         <result property="roleId"    column="role_id"    />
     </resultMap>
 
-    <sql id="selectSysUserRoleVo">
+    <sql id="selectDocSysUserRoleVo">
         select user_id, role_id from sys_user_role
     </sql>
 
-    <select id="selectSysUserRoleList" parameterType="SysUserRole" resultMap="SysUserRoleResult">
-        <include refid="selectSysUserRoleVo"/>
+    <select id="selectDocSysUserRoleList" parameterType="DocSysUserRole" resultMap="DocSysUserRoleResult">
+        <include refid="selectDocSysUserRoleVo"/>
         <where>  
         </where>
     </select>
     
-    <select id="selectSysUserRoleByUserId" parameterType="Long" resultMap="SysUserRoleResult">
-        <include refid="selectSysUserRoleVo"/>
+    <select id="selectDocSysUserRoleByUserId" parameterType="Long" resultMap="DocSysUserRoleResult">
+        <include refid="selectDocSysUserRoleVo"/>
         where user_id = #{userId}
     </select>
         
-    <insert id="insertSysUserRole" parameterType="SysUserRole">
+    <insert id="insertDocSysUserRole" parameterType="DocSysUserRole">
         insert into sys_user_role
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="userId != null">user_id,</if>
@@ -36,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="updateSysUserRole" parameterType="SysUserRole">
+    <update id="updateDocSysUserRole" parameterType="DocSysUserRole">
         update sys_user_role
         <trim prefix="SET" suffixOverrides=",">
             <if test="roleId != null">role_id = #{roleId},</if>
@@ -44,11 +44,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where user_id = #{userId}
     </update>
 
-    <delete id="deleteSysUserRoleByUserId" parameterType="Long">
+    <delete id="deleteDocSysUserRoleByUserId" parameterType="Long">
         delete from sys_user_role where user_id = #{userId}
     </delete>
 
-    <delete id="deleteSysUserRoleByUserIds" parameterType="String">
+    <delete id="deleteDocSysUserRoleByUserIds" parameterType="String">
         delete from sys_user_role where user_id in 
         <foreach item="userId" collection="array" open="(" separator="," close=")">
             #{userId}