Selaa lähdekoodia

修改基础表id

Administrator 4 vuotta sitten
vanhempi
commit
e7c33d4fc0
75 muutettua tiedostoa jossa 691 lisäystä ja 701 poistoa
  1. 6 8
      boman-api/boman-api-system/src/main/java/com/boman/system/api/domain/SysDept.java
  2. 5 5
      boman-api/boman-api-system/src/main/java/com/boman/system/api/domain/SysOperLog.java
  3. 28 27
      boman-api/boman-api-system/src/main/java/com/boman/system/api/domain/SysRole.java
  4. 11 11
      boman-api/boman-api-system/src/main/java/com/boman/system/api/domain/SysUser.java
  5. 2 2
      boman-common/boman-common-datascope/src/main/java/com/boman/common/datascope/aspect/DataScopeAspect.java
  6. 0 0
      boman-common/boman-common-security/src/main/java/com/boman/common/security/service/TokenService.java
  7. 6 6
      boman-modules/boman-system/src/main/java/com/boman/system/controller/SysConfigController.java
  8. 14 14
      boman-modules/boman-system/src/main/java/com/boman/system/controller/SysDeptController.java
  9. 6 6
      boman-modules/boman-system/src/main/java/com/boman/system/controller/SysDictDataController.java
  10. 6 6
      boman-modules/boman-system/src/main/java/com/boman/system/controller/SysDictTypeController.java
  11. 3 3
      boman-modules/boman-system/src/main/java/com/boman/system/controller/SysLogininforController.java
  12. 10 10
      boman-modules/boman-system/src/main/java/com/boman/system/controller/SysMenuController.java
  13. 6 6
      boman-modules/boman-system/src/main/java/com/boman/system/controller/SysNoticeController.java
  14. 3 3
      boman-modules/boman-system/src/main/java/com/boman/system/controller/SysOperlogController.java
  15. 6 6
      boman-modules/boman-system/src/main/java/com/boman/system/controller/SysPostController.java
  16. 6 6
      boman-modules/boman-system/src/main/java/com/boman/system/controller/SysRoleController.java
  17. 16 16
      boman-modules/boman-system/src/main/java/com/boman/system/controller/SysUserController.java
  18. 13 20
      boman-modules/boman-system/src/main/java/com/boman/system/domain/SysConfig.java
  19. 6 6
      boman-modules/boman-system/src/main/java/com/boman/system/domain/SysDictData.java
  20. 6 6
      boman-modules/boman-system/src/main/java/com/boman/system/domain/SysDictType.java
  21. 5 5
      boman-modules/boman-system/src/main/java/com/boman/system/domain/SysLogininfor.java
  22. 6 6
      boman-modules/boman-system/src/main/java/com/boman/system/domain/SysMenu.java
  23. 6 6
      boman-modules/boman-system/src/main/java/com/boman/system/domain/SysNotice.java
  24. 6 6
      boman-modules/boman-system/src/main/java/com/boman/system/domain/SysPost.java
  25. 2 2
      boman-modules/boman-system/src/main/java/com/boman/system/domain/vo/TreeSelect.java
  26. 4 4
      boman-modules/boman-system/src/main/java/com/boman/system/mapper/SysConfigMapper.java
  27. 14 14
      boman-modules/boman-system/src/main/java/com/boman/system/mapper/SysDeptMapper.java
  28. 6 6
      boman-modules/boman-system/src/main/java/com/boman/system/mapper/SysDictDataMapper.java
  29. 6 6
      boman-modules/boman-system/src/main/java/com/boman/system/mapper/SysDictTypeMapper.java
  30. 2 2
      boman-modules/boman-system/src/main/java/com/boman/system/mapper/SysLogininforMapper.java
  31. 10 10
      boman-modules/boman-system/src/main/java/com/boman/system/mapper/SysMenuMapper.java
  32. 6 6
      boman-modules/boman-system/src/main/java/com/boman/system/mapper/SysNoticeMapper.java
  33. 4 4
      boman-modules/boman-system/src/main/java/com/boman/system/mapper/SysOperLogMapper.java
  34. 8 8
      boman-modules/boman-system/src/main/java/com/boman/system/mapper/SysPostMapper.java
  35. 4 4
      boman-modules/boman-system/src/main/java/com/boman/system/mapper/SysRoleMapper.java
  36. 6 6
      boman-modules/boman-system/src/main/java/com/boman/system/mapper/SysUserMapper.java
  37. 3 3
      boman-modules/boman-system/src/main/java/com/boman/system/mapper/SysUserRoleMapper.java
  38. 4 4
      boman-modules/boman-system/src/main/java/com/boman/system/service/ISysConfigService.java
  39. 10 10
      boman-modules/boman-system/src/main/java/com/boman/system/service/ISysDeptService.java
  40. 4 4
      boman-modules/boman-system/src/main/java/com/boman/system/service/ISysDictDataService.java
  41. 4 4
      boman-modules/boman-system/src/main/java/com/boman/system/service/ISysDictTypeService.java
  42. 2 2
      boman-modules/boman-system/src/main/java/com/boman/system/service/ISysLogininforService.java
  43. 12 12
      boman-modules/boman-system/src/main/java/com/boman/system/service/ISysMenuService.java
  44. 6 6
      boman-modules/boman-system/src/main/java/com/boman/system/service/ISysNoticeService.java
  45. 4 4
      boman-modules/boman-system/src/main/java/com/boman/system/service/ISysOperLogService.java
  46. 4 4
      boman-modules/boman-system/src/main/java/com/boman/system/service/ISysPermissionService.java
  47. 8 8
      boman-modules/boman-system/src/main/java/com/boman/system/service/ISysPostService.java
  48. 11 11
      boman-modules/boman-system/src/main/java/com/boman/system/service/ISysRoleService.java
  49. 6 6
      boman-modules/boman-system/src/main/java/com/boman/system/service/ISysUserService.java
  50. 10 10
      boman-modules/boman-system/src/main/java/com/boman/system/service/impl/SysConfigServiceImpl.java
  51. 27 27
      boman-modules/boman-system/src/main/java/com/boman/system/service/impl/SysDeptServiceImpl.java
  52. 6 6
      boman-modules/boman-system/src/main/java/com/boman/system/service/impl/SysDictDataServiceImpl.java
  53. 11 11
      boman-modules/boman-system/src/main/java/com/boman/system/service/impl/SysDictTypeServiceImpl.java
  54. 3 3
      boman-modules/boman-system/src/main/java/com/boman/system/service/impl/SysLogininforServiceImpl.java
  55. 23 23
      boman-modules/boman-system/src/main/java/com/boman/system/service/impl/SysMenuServiceImpl.java
  56. 9 9
      boman-modules/boman-system/src/main/java/com/boman/system/service/impl/SysNoticeServiceImpl.java
  57. 6 6
      boman-modules/boman-system/src/main/java/com/boman/system/service/impl/SysOperLogServiceImpl.java
  58. 8 8
      boman-modules/boman-system/src/main/java/com/boman/system/service/impl/SysPermissionServiceImpl.java
  59. 22 22
      boman-modules/boman-system/src/main/java/com/boman/system/service/impl/SysPostServiceImpl.java
  60. 32 32
      boman-modules/boman-system/src/main/java/com/boman/system/service/impl/SysRoleServiceImpl.java
  61. 25 25
      boman-modules/boman-system/src/main/java/com/boman/system/service/impl/SysUserServiceImpl.java
  62. 9 9
      boman-modules/boman-system/src/main/resources/mapper/system/SysConfigMapper.xml
  63. 22 22
      boman-modules/boman-system/src/main/resources/mapper/system/SysDeptMapper.xml
  64. 10 10
      boman-modules/boman-system/src/main/resources/mapper/system/SysDictDataMapper.xml
  65. 8 8
      boman-modules/boman-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
  66. 6 6
      boman-modules/boman-system/src/main/resources/mapper/system/SysLogininforMapper.xml
  67. 29 29
      boman-modules/boman-system/src/main/resources/mapper/system/SysMenuMapper.xml
  68. 8 8
      boman-modules/boman-system/src/main/resources/mapper/system/SysNoticeMapper.xml
  69. 7 7
      boman-modules/boman-system/src/main/resources/mapper/system/SysOperLogMapper.xml
  70. 22 22
      boman-modules/boman-system/src/main/resources/mapper/system/SysPostMapper.xml
  71. 22 22
      boman-modules/boman-system/src/main/resources/mapper/system/SysRoleMapper.xml
  72. 1 1
      boman-modules/boman-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml
  73. 22 24
      boman-modules/boman-system/src/main/resources/mapper/system/SysUserMapper.xml
  74. 1 1
      boman-modules/boman-system/src/main/resources/mapper/system/SysUserPostMapper.xml
  75. 10 10
      boman-modules/boman-system/src/main/resources/mapper/system/SysUserRoleMapper.xml

+ 6 - 8
boman-api/boman-api-system/src/main/java/com/boman/system/api/domain/SysDept.java

@@ -19,7 +19,7 @@ public class SysDept extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 部门ID */
-    private Long deptId;
+    private Long id;
 
     /** 父部门ID */
     private Long parentId;
@@ -54,14 +54,12 @@ public class SysDept extends BaseEntity
     /** 子部门 */
     private List<SysDept> children = new ArrayList<SysDept>();
 
-    public Long getDeptId()
-    {
-        return deptId;
+    public Long getId() {
+        return id;
     }
 
-    public void setDeptId(Long deptId)
-    {
-        this.deptId = deptId;
+    public void setId(Long id) {
+        this.id = id;
     }
 
     public Long getParentId()
@@ -183,7 +181,7 @@ public class SysDept extends BaseEntity
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("deptId", getDeptId())
+            .append("id", getId())
             .append("parentId", getParentId())
             .append("ancestors", getAncestors())
             .append("deptName", getDeptName())

+ 5 - 5
boman-api/boman-api-system/src/main/java/com/boman/system/api/domain/SysOperLog.java

@@ -17,7 +17,7 @@ public class SysOperLog extends BaseEntity
 
     /** 日志主键 */
     @Excel(name = "操作序号", cellType = ColumnType.NUMERIC)
-    private Long operId;
+    private Long id;
 
     /** 操作模块 */
     @Excel(name = "操作模块")
@@ -79,14 +79,14 @@ public class SysOperLog extends BaseEntity
     @Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date operTime;
 
-    public Long getOperId()
+    public Long getid()
     {
-        return operId;
+        return id;
     }
 
-    public void setOperId(Long operId)
+    public void setid(Long id)
     {
-        this.operId = operId;
+        this.id = id;
     }
 
     public String getTitle()

+ 28 - 27
boman-api/boman-api-system/src/main/java/com/boman/system/api/domain/SysRole.java

@@ -8,6 +8,8 @@ import com.boman.common.core.annotation.Excel;
 import com.boman.common.core.annotation.Excel.ColumnType;
 import com.boman.common.core.web.domain.BaseEntity;
 
+import java.util.Arrays;
+
 /**
  * 角色表 sys_role
  * 
@@ -19,7 +21,7 @@ public class SysRole extends BaseEntity
 
     /** 角色ID */
     @Excel(name = "角色序号", cellType = ColumnType.NUMERIC)
-    private Long roleId;
+    private Long id;
 
     /** 角色名称 */
     @Excel(name = "角色名称")
@@ -64,29 +66,29 @@ public class SysRole extends BaseEntity
 
     }
 
-    public SysRole(Long roleId)
+    public SysRole(Long id)
     {
-        this.roleId = roleId;
+        this.id = id;
     }
 
-    public Long getRoleId()
+    public Long getId()
     {
-        return roleId;
+        return id;
     }
 
-    public void setRoleId(Long roleId)
+    public void setId(Long id)
     {
-        this.roleId = roleId;
+        this.id = id;
     }
 
     public boolean isAdmin()
     {
-        return isAdmin(this.roleId);
+        return isAdmin(this.id);
     }
 
-    public static boolean isAdmin(Long roleId)
+    public static boolean isAdmin(Long id)
     {
-        return roleId != null && 1L == roleId;
+        return id != null && 1L == id;
     }
 
     @NotBlank(message = "角色名称不能为空")
@@ -203,23 +205,22 @@ public class SysRole extends BaseEntity
     {
         this.deptIds = deptIds;
     }
-    
+
+    @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", isMenuCheckStrictly())
-            .append("deptCheckStrictly", isDeptCheckStrictly())
-            .append("status", getStatus())
-            .append("delFlag", getDelFlag())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
+        return "SysRole{" +
+                "id=" + id +
+                ", roleName='" + roleName + '\'' +
+                ", roleKey='" + roleKey + '\'' +
+                ", roleSort='" + roleSort + '\'' +
+                ", dataScope='" + dataScope + '\'' +
+                ", menuCheckStrictly=" + menuCheckStrictly +
+                ", deptCheckStrictly=" + deptCheckStrictly +
+                ", status='" + status + '\'' +
+                ", delFlag='" + delFlag + '\'' +
+                ", flag=" + flag +
+                ", menuIds=" + Arrays.toString(menuIds) +
+                ", deptIds=" + Arrays.toString(deptIds) +
+                '}';
     }
 }

+ 11 - 11
boman-api/boman-api-system/src/main/java/com/boman/system/api/domain/SysUser.java

@@ -25,7 +25,7 @@ public class SysUser extends BaseEntity
 
     /** 用户ID */
     @Excel(name = "用户序号", cellType = ColumnType.NUMERIC, prompt = "用户编号")
-    private Long userId;
+    private Long id;
 
     /** 部门ID */
     @Excel(name = "部门编号", type = Type.IMPORT)
@@ -96,29 +96,29 @@ public class SysUser extends BaseEntity
 
     }
 
-    public SysUser(Long userId)
+    public SysUser(Long id)
     {
-        this.userId = userId;
+        this.id = id;
     }
 
-    public Long getUserId()
+    public Long getId()
     {
-        return userId;
+        return id;
     }
 
-    public void setUserId(Long userId)
+    public void setId(Long id)
     {
-        this.userId = userId;
+        this.id = id;
     }
 
     public boolean isAdmin()
     {
-        return isAdmin(this.userId);
+        return isAdmin(this.id);
     }
 
-    public static boolean isAdmin(Long userId)
+    public static boolean isAdmin(Long id)
     {
-        return userId != null && 1L == userId;
+        return id != null && 1L == id;
     }
 
     public Long getDeptId()
@@ -301,7 +301,7 @@ public class SysUser extends BaseEntity
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("userId", getUserId())
+            .append("id", getId())
             .append("deptId", getDeptId())
             .append("userName", getUserName())
             .append("nickName", getNickName())

+ 2 - 2
boman-common/boman-common-datascope/src/main/java/com/boman/common/datascope/aspect/DataScopeAspect.java

@@ -117,7 +117,7 @@ public class DataScopeAspect
             {
                 sqlString.append(StringUtils.format(
                         " OR {}.dept_id IN ( SELECT dept_id FROM sys_role_dept WHERE role_id = {} ) ", deptAlias,
-                        role.getRoleId()));
+                        role.getId()));
             }
             else if (DATA_SCOPE_DEPT.equals(dataScope))
             {
@@ -133,7 +133,7 @@ public class DataScopeAspect
             {
                 if (StringUtils.isNotBlank(userAlias))
                 {
-                    sqlString.append(StringUtils.format(" OR {}.user_id = {} ", userAlias, user.getUserId()));
+                    sqlString.append(StringUtils.format(" OR {}.user_id = {} ", userAlias, user.getId()));
                 }
                 else
                 {

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
boman-common/boman-common-security/src/main/java/com/boman/common/security/service/TokenService.java


+ 6 - 6
boman-modules/boman-system/src/main/java/com/boman/system/controller/SysConfigController.java

@@ -62,10 +62,10 @@ public class SysConfigController extends BaseController
     /**
      * 根据参数编号获取详细信息
      */
-    @GetMapping(value = "/{configId}")
-    public AjaxResult getInfo(@PathVariable Long configId)
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable Long id)
     {
-        return AjaxResult.success(configService.selectConfigById(configId));
+        return AjaxResult.success(configService.selectConfigById(id));
     }
 
     /**
@@ -114,10 +114,10 @@ public class SysConfigController extends BaseController
      */
     @PreAuthorize(hasPermi = "system:config:remove")
     @Log(title = "参数管理", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{configIds}")
-    public AjaxResult remove(@PathVariable Long[] configIds)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
     {
-        return toAjax(configService.deleteConfigByIds(configIds));
+        return toAjax(configService.deleteConfigByIds(ids));
     }
 
     /**

+ 14 - 14
boman-modules/boman-system/src/main/java/com/boman/system/controller/SysDeptController.java

@@ -51,16 +51,16 @@ public class SysDeptController extends BaseController
      * 查询部门列表(排除节点)
      */
     @PreAuthorize(hasPermi = "system:dept:list")
-    @GetMapping("/list/exclude/{deptId}")
-    public AjaxResult excludeChild(@PathVariable(value = "deptId", required = false) Long deptId)
+    @GetMapping("/list/exclude/{id}")
+    public AjaxResult excludeChild(@PathVariable(value = "id", required = false) Long id)
     {
         List<SysDept> depts = deptService.selectDeptList(new SysDept());
         Iterator<SysDept> it = depts.iterator();
         while (it.hasNext())
         {
             SysDept d = (SysDept) it.next();
-            if (d.getDeptId().intValue() == deptId
-                    || ArrayUtils.contains(StringUtils.split(d.getAncestors(), ","), deptId + ""))
+            if (d.getId().intValue() == id
+                    || ArrayUtils.contains(StringUtils.split(d.getAncestors(), ","), id + ""))
             {
                 it.remove();
             }
@@ -72,10 +72,10 @@ public class SysDeptController extends BaseController
      * 根据部门编号获取详细信息
      */
     @PreAuthorize(hasPermi = "system:dept:query")
-    @GetMapping(value = "/{deptId}")
-    public AjaxResult getInfo(@PathVariable Long deptId)
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable Long id)
     {
-        return AjaxResult.success(deptService.selectDeptById(deptId));
+        return AjaxResult.success(deptService.selectDeptById(id));
     }
 
     /**
@@ -129,12 +129,12 @@ public class SysDeptController extends BaseController
         {
             return AjaxResult.error("修改部门'" + dept.getDeptName() + "'失败,部门名称已存在");
         }
-        else if (dept.getParentId().equals(dept.getDeptId()))
+        else if (dept.getParentId().equals(dept.getId()))
         {
             return AjaxResult.error("修改部门'" + dept.getDeptName() + "'失败,上级部门不能是自己");
         }
         else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus())
-                && deptService.selectNormalChildrenDeptById(dept.getDeptId()) > 0)
+                && deptService.selectNormalChildrenDeptById(dept.getId()) > 0)
         {
             return AjaxResult.error("该部门包含未停用的子部门!");
         }
@@ -147,17 +147,17 @@ public class SysDeptController extends BaseController
      */
     @PreAuthorize(hasPermi = "system:dept:remove")
     @Log(title = "部门管理", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{deptId}")
-    public AjaxResult remove(@PathVariable Long deptId)
+    @DeleteMapping("/{id}")
+    public AjaxResult remove(@PathVariable Long id)
     {
-        if (deptService.hasChildByDeptId(deptId))
+        if (deptService.hasChildById(id))
         {
             return AjaxResult.error("存在下级部门,不允许删除");
         }
-        if (deptService.checkDeptExistUser(deptId))
+        if (deptService.checkDeptExistUser(id))
         {
             return AjaxResult.error("部门存在用户,不允许删除");
         }
-        return toAjax(deptService.deleteDeptById(deptId));
+        return toAjax(deptService.deleteDeptById(id));
     }
 }

+ 6 - 6
boman-modules/boman-system/src/main/java/com/boman/system/controller/SysDictDataController.java

@@ -65,10 +65,10 @@ public class SysDictDataController extends BaseController
      * 查询字典数据详细
      */
     @PreAuthorize(hasPermi = "system:dict:query")
-    @GetMapping(value = "/{dictCode}")
-    public AjaxResult getInfo(@PathVariable Long dictCode)
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable Long id)
     {
-        return AjaxResult.success(dictDataService.selectDictDataById(dictCode));
+        return AjaxResult.success(dictDataService.selectDictDataById(id));
     }
 
     /**
@@ -114,9 +114,9 @@ public class SysDictDataController extends BaseController
      */
     @PreAuthorize(hasPermi = "system:dict:remove")
     @Log(title = "字典类型", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{dictCodes}")
-    public AjaxResult remove(@PathVariable Long[] dictCodes)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
     {
-        return toAjax(dictDataService.deleteDictDataByIds(dictCodes));
+        return toAjax(dictDataService.deleteDictDataByIds(ids));
     }
 }

+ 6 - 6
boman-modules/boman-system/src/main/java/com/boman/system/controller/SysDictTypeController.java

@@ -60,10 +60,10 @@ public class SysDictTypeController extends BaseController
      * 查询字典类型详细
      */
     @PreAuthorize(hasPermi = "system:dict:query")
-    @GetMapping(value = "/{dictId}")
-    public AjaxResult getInfo(@PathVariable Long dictId)
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable Long id)
     {
-        return AjaxResult.success(dictTypeService.selectDictTypeById(dictId));
+        return AjaxResult.success(dictTypeService.selectDictTypeById(id));
     }
 
     /**
@@ -103,10 +103,10 @@ public class SysDictTypeController extends BaseController
      */
     @PreAuthorize(hasPermi = "system:dict:remove")
     @Log(title = "字典类型", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{dictIds}")
-    public AjaxResult remove(@PathVariable Long[] dictIds)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
     {
-        return toAjax(dictTypeService.deleteDictTypeByIds(dictIds));
+        return toAjax(dictTypeService.deleteDictTypeByIds(ids));
     }
 
     /**

+ 3 - 3
boman-modules/boman-system/src/main/java/com/boman/system/controller/SysLogininforController.java

@@ -57,10 +57,10 @@ public class SysLogininforController extends BaseController
 
     @PreAuthorize(hasPermi = "system:logininfor:remove")
     @Log(title = "登录日志", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{infoIds}")
-    public AjaxResult remove(@PathVariable Long[] infoIds)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
     {
-        return toAjax(logininforService.deleteLogininforByIds(infoIds));
+        return toAjax(logininforService.deleteLogininforByIds(ids));
     }
 
     @PreAuthorize(hasPermi = "system:logininfor:remove")

+ 10 - 10
boman-modules/boman-system/src/main/java/com/boman/system/controller/SysMenuController.java

@@ -51,10 +51,10 @@ public class SysMenuController extends BaseController
      * 根据菜单编号获取详细信息
      */
     @PreAuthorize(hasPermi = "system:menu:query")
-    @GetMapping(value = "/{menuId}")
-    public AjaxResult getInfo(@PathVariable Long menuId)
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable Long id)
     {
-        return AjaxResult.success(menuService.selectMenuById(menuId));
+        return AjaxResult.success(menuService.selectMenuById(id));
     }
 
     /**
@@ -120,7 +120,7 @@ public class SysMenuController extends BaseController
         {
             return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败,地址必须以http(s)://开头");
         }
-        else if (menu.getMenuId().equals(menu.getParentId()))
+        else if (menu.getId().equals(menu.getParentId()))
         {
             return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败,上级菜单不能选择自己");
         }
@@ -133,18 +133,18 @@ public class SysMenuController extends BaseController
      */
     @PreAuthorize(hasPermi = "system:menu:remove")
     @Log(title = "菜单管理", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{menuId}")
-    public AjaxResult remove(@PathVariable("menuId") Long menuId)
+    @DeleteMapping("/{id}")
+    public AjaxResult remove(@PathVariable("id") Long id)
     {
-        if (menuService.hasChildByMenuId(menuId))
+        if (menuService.hasChildById(id))
         {
             return AjaxResult.error("存在子菜单,不允许删除");
         }
-        if (menuService.checkMenuExistRole(menuId))
+        if (menuService.checkMenuExistRole(id))
         {
             return AjaxResult.error("菜单已分配,不允许删除");
         }
-        return toAjax(menuService.deleteMenuById(menuId));
+        return toAjax(menuService.deleteMenuById(id));
     }
 
     /**
@@ -156,7 +156,7 @@ public class SysMenuController extends BaseController
     public AjaxResult getRouters()
     {
         Long userId = SecurityUtils.getUserId();
-        List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId);
+        List<SysMenu> menus = menuService.selectMenuTreeById(userId);
         return AjaxResult.success(menuService.buildMenus(menus));
     }
 }

+ 6 - 6
boman-modules/boman-system/src/main/java/com/boman/system/controller/SysNoticeController.java

@@ -49,10 +49,10 @@ public class SysNoticeController extends BaseController
      * 根据通知公告编号获取详细信息
      */
     @PreAuthorize(hasPermi = "system:notice:query")
-    @GetMapping(value = "/{noticeId}")
-    public AjaxResult getInfo(@PathVariable Long noticeId)
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable Long id)
     {
-        return AjaxResult.success(noticeService.selectNoticeById(noticeId));
+        return AjaxResult.success(noticeService.selectNoticeById(id));
     }
 
     /**
@@ -84,9 +84,9 @@ public class SysNoticeController extends BaseController
      */
     @PreAuthorize(hasPermi = "system:notice:remove")
     @Log(title = "通知公告", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{noticeIds}")
-    public AjaxResult remove(@PathVariable Long[] noticeIds)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
     {
-        return toAjax(noticeService.deleteNoticeByIds(noticeIds));
+        return toAjax(noticeService.deleteNoticeByIds(ids));
     }
 }

+ 3 - 3
boman-modules/boman-system/src/main/java/com/boman/system/controller/SysOperlogController.java

@@ -53,10 +53,10 @@ public class SysOperlogController extends BaseController
     }
 
     @PreAuthorize(hasPermi = "system:operlog:remove")
-    @DeleteMapping("/{operIds}")
-    public AjaxResult remove(@PathVariable Long[] operIds)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
     {
-        return toAjax(operLogService.deleteOperLogByIds(operIds));
+        return toAjax(operLogService.deleteOperLogByIds(ids));
     }
 
     @PreAuthorize(hasPermi = "system:operlog:remove")

+ 6 - 6
boman-modules/boman-system/src/main/java/com/boman/system/controller/SysPostController.java

@@ -63,10 +63,10 @@ public class SysPostController extends BaseController
      * 根据岗位编号获取详细信息
      */
     @PreAuthorize(hasPermi = "system:post:query")
-    @GetMapping(value = "/{postId}")
-    public AjaxResult getInfo(@PathVariable Long postId)
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable Long id)
     {
-        return AjaxResult.success(postService.selectPostById(postId));
+        return AjaxResult.success(postService.selectPostById(id));
     }
 
     /**
@@ -114,10 +114,10 @@ public class SysPostController extends BaseController
      */
     @PreAuthorize(hasPermi = "system:post:remove")
     @Log(title = "岗位管理", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{postIds}")
-    public AjaxResult remove(@PathVariable Long[] postIds)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
     {
-        return toAjax(postService.deletePostByIds(postIds));
+        return toAjax(postService.deletePostByIds(ids));
     }
 
     /**

+ 6 - 6
boman-modules/boman-system/src/main/java/com/boman/system/controller/SysRoleController.java

@@ -60,10 +60,10 @@ public class SysRoleController extends BaseController
      * 根据角色编号获取详细信息
      */
     @PreAuthorize(hasPermi = "system:role:query")
-    @GetMapping(value = "/{roleId}")
-    public AjaxResult getInfo(@PathVariable Long roleId)
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable Long id)
     {
-        return AjaxResult.success(roleService.selectRoleById(roleId));
+        return AjaxResult.success(roleService.selectRoleById(id));
     }
 
     /**
@@ -138,10 +138,10 @@ public class SysRoleController extends BaseController
      */
     @PreAuthorize(hasPermi = "system:role:remove")
     @Log(title = "角色管理", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{roleIds}")
-    public AjaxResult remove(@PathVariable Long[] roleIds)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
     {
-        return toAjax(roleService.deleteRoleByIds(roleIds));
+        return toAjax(roleService.deleteRoleByIds(ids));
     }
 
     /**

+ 16 - 16
boman-modules/boman-system/src/main/java/com/boman/system/controller/SysUserController.java

@@ -109,9 +109,9 @@ public class SysUserController extends BaseController
             return R.fail("用户名或密码错误");
         }
         // 角色集合
-        Set<String> roles = permissionService.getRolePermission(sysUser.getUserId());
+        Set<String> roles = permissionService.getRolePermission(sysUser.getId());
         // 权限集合
-        Set<String> permissions = permissionService.getMenuPermission(sysUser.getUserId());
+        Set<String> permissions = permissionService.getMenuPermission(sysUser.getId());
         LoginUser sysUserVo = new LoginUser();
         sysUserVo.setSysUser(sysUser);
         sysUserVo.setRoles(roles);
@@ -127,13 +127,13 @@ public class SysUserController extends BaseController
     @GetMapping("getInfo")
     public AjaxResult getInfo()
     {
-        Long userId = SecurityUtils.getUserId();
+        Long id = SecurityUtils.getUserId();
         // 角色集合
-        Set<String> roles = permissionService.getRolePermission(userId);
+        Set<String> roles = permissionService.getRolePermission(id);
         // 权限集合
-        Set<String> permissions = permissionService.getMenuPermission(userId);
+        Set<String> permissions = permissionService.getMenuPermission(id);
         AjaxResult ajax = AjaxResult.success();
-        ajax.put("user", userService.selectUserById(userId));
+        ajax.put("user", userService.selectUserById(id));
         ajax.put("roles", roles);
         ajax.put("permissions", permissions);
         return ajax;
@@ -143,18 +143,18 @@ public class SysUserController extends BaseController
      * 根据用户编号获取详细信息
      */
     @PreAuthorize(hasPermi = "system:user:query")
-    @GetMapping(value = { "/", "/{userId}" })
-    public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId)
+    @GetMapping(value = { "/", "/{id}" })
+    public AjaxResult getInfo(@PathVariable(value = "id", required = false) Long id)
     {
         AjaxResult ajax = AjaxResult.success();
         List<SysRole> roles = roleService.selectRoleAll();
-        ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
+        ajax.put("roles", SysUser.isAdmin(id) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
         ajax.put("posts", postService.selectPostAll());
-        if (StringUtils.isNotNull(userId))
+        if (StringUtils.isNotNull(id))
         {
-            ajax.put(AjaxResult.DATA_TAG, userService.selectUserById(userId));
-            ajax.put("postIds", postService.selectPostListByUserId(userId));
-            ajax.put("roleIds", roleService.selectRoleListByUserId(userId));
+            ajax.put(AjaxResult.DATA_TAG, userService.selectUserById(id));
+            ajax.put("postIds", postService.selectPostListById(id));
+            ajax.put("roleIds", roleService.selectRoleListById(id));
         }
         return ajax;
     }
@@ -214,10 +214,10 @@ public class SysUserController extends BaseController
      */
     @PreAuthorize(hasPermi = "system:user:remove")
     @Log(title = "用户管理", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{userIds}")
-    public AjaxResult remove(@PathVariable Long[] userIds)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
     {
-        return toAjax(userService.deleteUserByIds(userIds));
+        return toAjax(userService.deleteUserByIds(ids));
     }
 
     /**

+ 13 - 20
boman-modules/boman-system/src/main/java/com/boman/system/domain/SysConfig.java

@@ -19,7 +19,7 @@ public class SysConfig extends BaseEntity
 
     /** 参数主键 */
     @Excel(name = "参数主键", cellType = ColumnType.NUMERIC)
-    private Long configId;
+    private Long id;
 
     /** 参数名称 */
     @Excel(name = "参数名称")
@@ -37,14 +37,12 @@ public class SysConfig extends BaseEntity
     @Excel(name = "系统内置", readConverterExp = "Y=是,N=否")
     private String configType;
 
-    public Long getConfigId()
-    {
-        return configId;
+    public Long getId() {
+        return id;
     }
 
-    public void setConfigId(Long configId)
-    {
-        this.configId = configId;
+    public void setId(Long id) {
+        this.id = id;
     }
 
     @NotBlank(message = "参数名称不能为空")
@@ -92,20 +90,15 @@ public class SysConfig extends BaseEntity
     {
         this.configType = configType;
     }
-    
+
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("configId", getConfigId())
-            .append("configName", getConfigName())
-            .append("configKey", getConfigKey())
-            .append("configValue", getConfigValue())
-            .append("configType", getConfigType())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
+        return "SysConfig{" +
+                "id=" + id +
+                ", configName='" + configName + '\'' +
+                ", configKey='" + configKey + '\'' +
+                ", configValue='" + configValue + '\'' +
+                ", configType='" + configType + '\'' +
+                '}';
     }
 }

+ 6 - 6
boman-modules/boman-system/src/main/java/com/boman/system/domain/SysDictData.java

@@ -20,7 +20,7 @@ public class SysDictData extends BaseEntity
 
     /** 字典编码 */
     @Excel(name = "字典编码", cellType = ColumnType.NUMERIC)
-    private Long dictCode;
+    private Long id;
 
     /** 字典排序 */
     @Excel(name = "字典排序", cellType = ColumnType.NUMERIC)
@@ -52,14 +52,14 @@ public class SysDictData extends BaseEntity
     @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
     private String status;
 
-    public Long getDictCode()
+    public Long getId()
     {
-        return dictCode;
+        return id;
     }
 
-    public void setDictCode(Long dictCode)
+    public void setId(Long id)
     {
-        this.dictCode = dictCode;
+        this.id = id;
     }
 
     public Long getDictSort()
@@ -157,7 +157,7 @@ public class SysDictData extends BaseEntity
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("dictCode", getDictCode())
+            .append("id", getId())
             .append("dictSort", getDictSort())
             .append("dictLabel", getDictLabel())
             .append("dictValue", getDictValue())

+ 6 - 6
boman-modules/boman-system/src/main/java/com/boman/system/domain/SysDictType.java

@@ -19,7 +19,7 @@ public class SysDictType extends BaseEntity
 
     /** 字典主键 */
     @Excel(name = "字典主键", cellType = ColumnType.NUMERIC)
-    private Long dictId;
+    private Long id;
 
     /** 字典名称 */
     @Excel(name = "字典名称")
@@ -33,14 +33,14 @@ public class SysDictType extends BaseEntity
     @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
     private String status;
 
-    public Long getDictId()
+    public Long getId()
     {
-        return dictId;
+        return id;
     }
 
-    public void setDictId(Long dictId)
+    public void setId(Long id)
     {
-        this.dictId = dictId;
+        this.id = id;
     }
 
     @NotBlank(message = "字典名称不能为空")
@@ -80,7 +80,7 @@ public class SysDictType extends BaseEntity
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("dictId", getDictId())
+            .append("id", getId())
             .append("dictName", getDictName())
             .append("dictType", getDictType())
             .append("status", getStatus())

+ 5 - 5
boman-modules/boman-system/src/main/java/com/boman/system/domain/SysLogininfor.java

@@ -17,7 +17,7 @@ public class SysLogininfor extends BaseEntity
 
     /** ID */
     @Excel(name = "序号", cellType = ColumnType.NUMERIC)
-    private Long infoId;
+    private Long id;
 
     /** 用户账号 */
     @Excel(name = "用户账号")
@@ -40,14 +40,14 @@ public class SysLogininfor extends BaseEntity
     @Excel(name = "访问时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date accessTime;
 
-    public Long getInfoId()
+    public Long getId()
     {
-        return infoId;
+        return id;
     }
 
-    public void setInfoId(Long infoId)
+    public void setId(Long id)
     {
-        this.infoId = infoId;
+        this.id = id;
     }
 
     public String getUserName()

+ 6 - 6
boman-modules/boman-system/src/main/java/com/boman/system/domain/SysMenu.java

@@ -19,7 +19,7 @@ public class SysMenu extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 菜单ID */
-    private Long menuId;
+    private Long id;
 
     /** 菜单名称 */
     private String menuName;
@@ -63,14 +63,14 @@ public class SysMenu extends BaseEntity
     /** 子菜单 */
     private List<SysMenu> children = new ArrayList<SysMenu>();
 
-    public Long getMenuId()
+    public Long getId()
     {
-        return menuId;
+        return id;
     }
 
-    public void setMenuId(Long menuId)
+    public void setId(Long id)
     {
-        this.menuId = menuId;
+        this.id = id;
     }
 
     @NotBlank(message = "菜单名称不能为空")
@@ -223,7 +223,7 @@ public class SysMenu extends BaseEntity
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("menuId", getMenuId())
+            .append("id", getId())
             .append("menuName", getMenuName())
             .append("parentId", getParentId())
             .append("orderNum", getOrderNum())

+ 6 - 6
boman-modules/boman-system/src/main/java/com/boman/system/domain/SysNotice.java

@@ -17,7 +17,7 @@ public class SysNotice extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 公告ID */
-    private Long noticeId;
+    private Long id;
 
     /** 公告标题 */
     private String noticeTitle;
@@ -31,14 +31,14 @@ public class SysNotice extends BaseEntity
     /** 公告状态(0正常 1关闭) */
     private String status;
 
-    public Long getNoticeId()
+    public Long getId()
     {
-        return noticeId;
+        return id;
     }
 
-    public void setNoticeId(Long noticeId)
+    public void setId(Long id)
     {
-        this.noticeId = noticeId;
+        this.id = id;
     }
 
     public void setNoticeTitle(String noticeTitle)
@@ -86,7 +86,7 @@ public class SysNotice extends BaseEntity
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("noticeId", getNoticeId())
+            .append("id", getId())
             .append("noticeTitle", getNoticeTitle())
             .append("noticeType", getNoticeType())
             .append("noticeContent", getNoticeContent())

+ 6 - 6
boman-modules/boman-system/src/main/java/com/boman/system/domain/SysPost.java

@@ -19,7 +19,7 @@ public class SysPost extends BaseEntity
 
     /** 岗位序号 */
     @Excel(name = "岗位序号", cellType = ColumnType.NUMERIC)
-    private Long postId;
+    private Long id;
 
     /** 岗位编码 */
     @Excel(name = "岗位编码")
@@ -40,14 +40,14 @@ public class SysPost extends BaseEntity
     /** 用户是否存在此岗位标识 默认不存在 */
     private boolean flag = false;
 
-    public Long getPostId()
+    public Long getId()
     {
-        return postId;
+        return id;
     }
 
-    public void setPostId(Long postId)
+    public void setId(Long id)
     {
-        this.postId = postId;
+        this.id = id;
     }
 
     @NotBlank(message = "岗位编码不能为空")
@@ -108,7 +108,7 @@ public class SysPost extends BaseEntity
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("postId", getPostId())
+            .append("id", getId())
             .append("postCode", getPostCode())
             .append("postName", getPostName())
             .append("postSort", getPostSort())

+ 2 - 2
boman-modules/boman-system/src/main/java/com/boman/system/domain/vo/TreeSelect.java

@@ -33,14 +33,14 @@ public class TreeSelect implements Serializable
 
     public TreeSelect(SysDept dept)
     {
-        this.id = dept.getDeptId();
+        this.id = dept.getId();
         this.label = dept.getDeptName();
         this.children = dept.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList());
     }
 
     public TreeSelect(SysMenu menu)
     {
-        this.id = menu.getMenuId();
+        this.id = menu.getId();
         this.label = menu.getMenuName();
         this.children = menu.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList());
     }

+ 4 - 4
boman-modules/boman-system/src/main/java/com/boman/system/mapper/SysConfigMapper.java

@@ -57,16 +57,16 @@ public interface SysConfigMapper
     /**
      * 删除参数配置
      * 
-     * @param configId 参数ID
+     * @param id 参数ID
      * @return 结果
      */
-    public int deleteConfigById(Long configId);
+    public int deleteConfigById(Long id);
 
     /**
      * 批量删除参数信息
      * 
-     * @param configIds 需要删除的参数ID
+     * @param ids 需要删除的参数ID
      * @return 结果
      */
-    public int deleteConfigByIds(Long[] configIds);
+    public int deleteConfigByIds(Long[] ids);
 }

+ 14 - 14
boman-modules/boman-system/src/main/java/com/boman/system/mapper/SysDeptMapper.java

@@ -24,51 +24,51 @@ public interface SysDeptMapper
     /**
      * 根据角色ID查询部门树信息
      * 
-     * @param roleId 角色ID
+     * @param id 角色ID
      * @param deptCheckStrictly 部门树选择项是否关联显示
      * @return 选中部门列表
      */
-    public List<Integer> selectDeptListByRoleId(@Param("roleId") Long roleId, @Param("deptCheckStrictly") boolean deptCheckStrictly);
+    public List<Integer> selectDeptListById(@Param("id") Long id, @Param("deptCheckStrictly") boolean deptCheckStrictly);
 
     /**
      * 根据部门ID查询信息
      * 
-     * @param deptId 部门ID
+     * @param id 部门ID
      * @return 部门信息
      */
-    public SysDept selectDeptById(Long deptId);
+    public SysDept selectDeptById(Long id);
 
     /**
      * 根据ID查询所有子部门
      * 
-     * @param deptId 部门ID
+     * @param id 部门ID
      * @return 部门列表
      */
-    public List<SysDept> selectChildrenDeptById(Long deptId);
+    public List<SysDept> selectChildrenDeptById(Long id);
 
     /**
      * 根据ID查询所有子部门(正常状态)
      * 
-     * @param deptId 部门ID
+     * @param id 部门ID
      * @return 子部门数
      */
-    public int selectNormalChildrenDeptById(Long deptId);
+    public int selectNormalChildrenDeptById(Long id);
 
     /**
      * 是否存在子节点
      * 
-     * @param deptId 部门ID
+     * @param id 部门ID
      * @return 结果
      */
-    public int hasChildByDeptId(Long deptId);
+    public int hasChildById(Long id);
 
     /**
      * 查询部门是否存在用户
      * 
-     * @param deptId 部门ID
+     * @param id 部门ID
      * @return 结果
      */
-    public int checkDeptExistUser(Long deptId);
+    public int checkDeptExistUser(Long id);
 
     /**
      * 校验部门名称是否唯一
@@ -113,8 +113,8 @@ public interface SysDeptMapper
     /**
      * 删除部门管理信息
      * 
-     * @param deptId 部门ID
+     * @param id 部门ID
      * @return 结果
      */
-    public int deleteDeptById(Long deptId);
+    public int deleteDeptById(Long id);
 }

+ 6 - 6
boman-modules/boman-system/src/main/java/com/boman/system/mapper/SysDictDataMapper.java

@@ -41,10 +41,10 @@ public interface SysDictDataMapper
     /**
      * 根据字典数据ID查询信息
      * 
-     * @param dictCode 字典数据ID
+     * @param id 字典数据ID
      * @return 字典数据
      */
-    public SysDictData selectDictDataById(Long dictCode);
+    public SysDictData selectDictDataById(Long id);
 
     /**
      * 查询字典数据
@@ -57,18 +57,18 @@ public interface SysDictDataMapper
     /**
      * 通过字典ID删除字典数据信息
      * 
-     * @param dictCode 字典数据ID
+     * @param id 字典数据ID
      * @return 结果
      */
-    public int deleteDictDataById(Long dictCode);
+    public int deleteDictDataById(Long id);
 
     /**
      * 批量删除字典数据信息
      * 
-     * @param dictCodes 需要删除的字典数据ID
+     * @param ids 需要删除的字典数据ID
      * @return 结果
      */
-    public int deleteDictDataByIds(Long[] dictCodes);
+    public int deleteDictDataByIds(Long[] ids);
 
     /**
      * 新增字典数据信息

+ 6 - 6
boman-modules/boman-system/src/main/java/com/boman/system/mapper/SysDictTypeMapper.java

@@ -32,10 +32,10 @@ public interface SysDictTypeMapper
     /**
      * 根据字典类型ID查询信息
      * 
-     * @param dictId 字典类型ID
+     * @param id 字典类型ID
      * @return 字典类型
      */
-    public SysDictType selectDictTypeById(Long dictId);
+    public SysDictType selectDictTypeById(Long id);
 
     /**
      * 根据字典类型查询信息
@@ -48,18 +48,18 @@ public interface SysDictTypeMapper
     /**
      * 通过字典ID删除字典信息
      * 
-     * @param dictId 字典ID
+     * @param id 字典ID
      * @return 结果
      */
-    public int deleteDictTypeById(Long dictId);
+    public int deleteDictTypeById(Long id);
 
     /**
      * 批量删除字典类型信息
      * 
-     * @param dictIds 需要删除的字典ID
+     * @param ids 需要删除的字典ID
      * @return 结果
      */
-    public int deleteDictTypeByIds(Long[] dictIds);
+    public int deleteDictTypeByIds(Long[] ids);
 
     /**
      * 新增字典类型信息

+ 2 - 2
boman-modules/boman-system/src/main/java/com/boman/system/mapper/SysLogininforMapper.java

@@ -28,10 +28,10 @@ public interface SysLogininforMapper
     /**
      * 批量删除系统登录日志
      * 
-     * @param infoIds 需要删除的登录日志ID
+     * @param ids 需要删除的登录日志ID
      * @return 结果
      */
-    public int deleteLogininforByIds(Long[] infoIds);
+    public int deleteLogininforByIds(Long[] ids);
 
     /**
      * 清空系统登录日志

+ 10 - 10
boman-modules/boman-system/src/main/java/com/boman/system/mapper/SysMenuMapper.java

@@ -39,10 +39,10 @@ public interface SysMenuMapper
     /**
      * 根据用户ID查询权限
      * 
-     * @param userId 用户ID
+     * @param id 用户ID
      * @return 权限列表
      */
-    public List<String> selectMenuPermsByUserId(Long userId);
+    public List<String> selectMenuPermsById(Long id);
 
     /**
      * 根据用户ID查询菜单
@@ -54,10 +54,10 @@ public interface SysMenuMapper
     /**
      * 根据用户ID查询菜单
      * 
-     * @param username 用户ID
+     * @param id 用户ID
      * @return 菜单列表
      */
-    public List<SysMenu> selectMenuTreeByUserId(Long userId);
+    public List<SysMenu> selectMenuTreeById(Long id);
 
     /**
      * 根据角色ID查询菜单树信息
@@ -71,18 +71,18 @@ public interface SysMenuMapper
     /**
      * 根据菜单ID查询信息
      * 
-     * @param menuId 菜单ID
+     * @param id 菜单ID
      * @return 菜单信息
      */
-    public SysMenu selectMenuById(Long menuId);
+    public SysMenu selectMenuById(Long id);
 
     /**
      * 是否存在菜单子节点
      * 
-     * @param menuId 菜单ID
+     * @param id 菜单ID
      * @return 结果
      */
-    public int hasChildByMenuId(Long menuId);
+    public int hasChildById(Long id);
 
     /**
      * 新增菜单信息
@@ -103,10 +103,10 @@ public interface SysMenuMapper
     /**
      * 删除菜单管理信息
      * 
-     * @param menuId 菜单ID
+     * @param id 菜单ID
      * @return 结果
      */
-    public int deleteMenuById(Long menuId);
+    public int deleteMenuById(Long id);
 
     /**
      * 校验菜单名称是否唯一

+ 6 - 6
boman-modules/boman-system/src/main/java/com/boman/system/mapper/SysNoticeMapper.java

@@ -14,10 +14,10 @@ public interface SysNoticeMapper
     /**
      * 查询公告信息
      * 
-     * @param noticeId 公告ID
+     * @param id 公告ID
      * @return 公告信息
      */
-    public SysNotice selectNoticeById(Long noticeId);
+    public SysNotice selectNoticeById(Long id);
 
     /**
      * 查询公告列表
@@ -46,16 +46,16 @@ public interface SysNoticeMapper
     /**
      * 批量删除公告
      * 
-     * @param noticeId 公告ID
+     * @param id 公告ID
      * @return 结果
      */
-    public int deleteNoticeById(Long noticeId);
+    public int deleteNoticeById(Long id);
 
     /**
      * 批量删除公告信息
      * 
-     * @param noticeIds 需要删除的公告ID
+     * @param ids 需要删除的公告ID
      * @return 结果
      */
-    public int deleteNoticeByIds(Long[] noticeIds);
+    public int deleteNoticeByIds(Long[] ids);
 }

+ 4 - 4
boman-modules/boman-system/src/main/java/com/boman/system/mapper/SysOperLogMapper.java

@@ -29,18 +29,18 @@ public interface SysOperLogMapper
     /**
      * 批量删除系统操作日志
      * 
-     * @param operIds 需要删除的操作日志ID
+     * @param ids 需要删除的操作日志ID
      * @return 结果
      */
-    public int deleteOperLogByIds(Long[] operIds);
+    public int deleteOperLogByIds(Long[] ids);
 
     /**
      * 查询操作日志详细
      * 
-     * @param operId 操作ID
+     * @param id 操作ID
      * @return 操作日志对象
      */
-    public SysOperLog selectOperLogById(Long operId);
+    public SysOperLog selectOperLogById(Long id);
 
     /**
      * 清空操作日志

+ 8 - 8
boman-modules/boman-system/src/main/java/com/boman/system/mapper/SysPostMapper.java

@@ -29,18 +29,18 @@ public interface SysPostMapper
     /**
      * 通过岗位ID查询岗位信息
      * 
-     * @param postId 岗位ID
+     * @param id 岗位ID
      * @return 角色对象信息
      */
-    public SysPost selectPostById(Long postId);
+    public SysPost selectPostById(Long id);
 
     /**
      * 根据用户ID获取岗位选择框列表
      * 
-     * @param userId 用户ID
+     * @param id 用户ID
      * @return 选中岗位ID列表
      */
-    public List<Integer> selectPostListByUserId(Long userId);
+    public List<Integer> selectPostListById(Long id);
 
     /**
      * 查询用户所属岗位组
@@ -53,18 +53,18 @@ public interface SysPostMapper
     /**
      * 删除岗位信息
      * 
-     * @param postId 岗位ID
+     * @param id 岗位ID
      * @return 结果
      */
-    public int deletePostById(Long postId);
+    public int deletePostById(Long id);
 
     /**
      * 批量删除岗位信息
      * 
-     * @param postIds 需要删除的岗位ID
+     * @param ids 需要删除的岗位ID
      * @return 结果
      */
-    public int deletePostByIds(Long[] postIds);
+    public int deletePostByIds(Long[] ids);
 
     /**
      * 修改岗位信息

+ 4 - 4
boman-modules/boman-system/src/main/java/com/boman/system/mapper/SysRoleMapper.java

@@ -22,10 +22,10 @@ public interface SysRoleMapper
     /**
      * 根据用户ID查询角色
      * 
-     * @param userId 用户ID
+     * @param id 用户ID
      * @return 角色列表
      */
-    public List<SysRole> selectRolePermissionByUserId(Long userId);
+    public List<SysRole> selectRolePermissionById(Long id);
 
     /**
      * 查询所有角色
@@ -37,10 +37,10 @@ public interface SysRoleMapper
     /**
      * 根据用户ID获取角色选择框列表
      * 
-     * @param userId 用户ID
+     * @param id 用户ID
      * @return 选中角色ID列表
      */
-    public List<Integer> selectRoleListByUserId(Long userId);
+    public List<Integer> selectRoleListById(Long id);
 
     /**
      * 通过角色ID查询角色

+ 6 - 6
boman-modules/boman-system/src/main/java/com/boman/system/mapper/SysUserMapper.java

@@ -32,10 +32,10 @@ public interface SysUserMapper
     /**
      * 通过用户ID查询用户
      * 
-     * @param userId 用户ID
+     * @param id 用户ID
      * @return 用户对象信息
      */
-    public SysUser selectUserById(Long userId);
+    public SysUser selectUserById(Long id);
 
     /**
      * 新增用户信息
@@ -74,18 +74,18 @@ public interface SysUserMapper
     /**
      * 通过用户ID删除用户
      * 
-     * @param userId 用户ID
+     * @param id 用户ID
      * @return 结果
      */
-    public int deleteUserById(Long userId);
+    public int deleteUserById(Long id);
 
     /**
      * 批量删除用户信息
      * 
-     * @param userIds 需要删除的用户ID
+     * @param ids 需要删除的用户ID
      * @return 结果
      */
-    public int deleteUserByIds(Long[] userIds);
+    public int deleteUserByIds(Long[] ids);
 
     /**
      * 校验用户名称是否唯一

+ 3 - 3
boman-modules/boman-system/src/main/java/com/boman/system/mapper/SysUserRoleMapper.java

@@ -56,9 +56,9 @@ public interface SysUserRoleMapper
     /**
      * 批量取消授权用户角色
      * 
-     * @param roleId 角色ID
-     * @param userIds 需要删除的用户数据ID
+     * @param id 角色ID
+     * @param ids 需要删除的用户数据ID
      * @return 结果
      */
-    public int deleteUserRoleInfos(@Param("roleId") Long roleId, @Param("userIds") Long[] userIds);
+    public int deleteUserRoleInfos(@Param("id") Long id, @Param("ids") Long[] ids);
 }

+ 4 - 4
boman-modules/boman-system/src/main/java/com/boman/system/service/ISysConfigService.java

@@ -14,10 +14,10 @@ public interface ISysConfigService
     /**
      * 查询参数配置信息
      * 
-     * @param configId 参数配置ID
+     * @param id 参数配置ID
      * @return 参数配置信息
      */
-    public SysConfig selectConfigById(Long configId);
+    public SysConfig selectConfigById(Long id);
 
     /**
      * 根据键名查询参数配置信息
@@ -54,10 +54,10 @@ public interface ISysConfigService
     /**
      * 批量删除参数信息
      * 
-     * @param configIds 需要删除的参数ID
+     * @param ids 需要删除的参数ID
      * @return 结果
      */
-    public int deleteConfigByIds(Long[] configIds);
+    public int deleteConfigByIds(Long[] ids);
 
     /**
      * 清空缓存数据

+ 10 - 10
boman-modules/boman-system/src/main/java/com/boman/system/service/ISysDeptService.java

@@ -47,34 +47,34 @@ public interface ISysDeptService
     /**
      * 根据部门ID查询信息
      * 
-     * @param deptId 部门ID
+     * @param id 部门ID
      * @return 部门信息
      */
-    public SysDept selectDeptById(Long deptId);
+    public SysDept selectDeptById(Long id);
 
     /**
      * 根据ID查询所有子部门(正常状态)
      * 
-     * @param deptId 部门ID
+     * @param id 部门ID
      * @return 子部门数
      */
-    public int selectNormalChildrenDeptById(Long deptId);
+    public int selectNormalChildrenDeptById(Long id);
 
     /**
      * 是否存在部门子节点
      * 
-     * @param deptId 部门ID
+     * @param id 部门ID
      * @return 结果
      */
-    public boolean hasChildByDeptId(Long deptId);
+    public boolean hasChildById(Long id);
 
     /**
      * 查询部门是否存在用户
      * 
-     * @param deptId 部门ID
+     * @param id 部门ID
      * @return 结果 true 存在 false 不存在
      */
-    public boolean checkDeptExistUser(Long deptId);
+    public boolean checkDeptExistUser(Long id);
 
     /**
      * 校验部门名称是否唯一
@@ -103,8 +103,8 @@ public interface ISysDeptService
     /**
      * 删除部门管理信息
      * 
-     * @param deptId 部门ID
+     * @param id 部门ID
      * @return 结果
      */
-    public int deleteDeptById(Long deptId);
+    public int deleteDeptById(Long id);
 }

+ 4 - 4
boman-modules/boman-system/src/main/java/com/boman/system/service/ISysDictDataService.java

@@ -30,18 +30,18 @@ public interface ISysDictDataService
     /**
      * 根据字典数据ID查询信息
      * 
-     * @param dictCode 字典数据ID
+     * @param id 字典数据ID
      * @return 字典数据
      */
-    public SysDictData selectDictDataById(Long dictCode);
+    public SysDictData selectDictDataById(Long id);
 
     /**
      * 批量删除字典数据信息
      * 
-     * @param dictCodes 需要删除的字典数据ID
+     * @param ids 需要删除的字典数据ID
      * @return 结果
      */
-    public int deleteDictDataByIds(Long[] dictCodes);
+    public int deleteDictDataByIds(Long[] ids);
 
     /**
      * 新增保存字典数据信息

+ 4 - 4
boman-modules/boman-system/src/main/java/com/boman/system/service/ISysDictTypeService.java

@@ -37,10 +37,10 @@ public interface ISysDictTypeService
     /**
      * 根据字典类型ID查询信息
      * 
-     * @param dictId 字典类型ID
+     * @param id 字典类型ID
      * @return 字典类型
      */
-    public SysDictType selectDictTypeById(Long dictId);
+    public SysDictType selectDictTypeById(Long id);
 
     /**
      * 根据字典类型查询信息
@@ -53,10 +53,10 @@ public interface ISysDictTypeService
     /**
      * 批量删除字典信息
      * 
-     * @param dictIds 需要删除的字典ID
+     * @param ids 需要删除的字典ID
      * @return 结果
      */
-    public int deleteDictTypeByIds(Long[] dictIds);
+    public int deleteDictTypeByIds(Long[] ids);
 
     /**
      * 清空缓存数据

+ 2 - 2
boman-modules/boman-system/src/main/java/com/boman/system/service/ISysLogininforService.java

@@ -28,10 +28,10 @@ public interface ISysLogininforService
     /**
      * 批量删除系统登录日志
      * 
-     * @param infoIds 需要删除的登录日志ID
+     * @param ids 需要删除的登录日志ID
      * @return
      */
-    public int deleteLogininforByIds(Long[] infoIds);
+    public int deleteLogininforByIds(Long[] ids);
 
     /**
      * 清空系统登录日志

+ 12 - 12
boman-modules/boman-system/src/main/java/com/boman/system/service/ISysMenuService.java

@@ -34,18 +34,18 @@ public interface ISysMenuService
     /**
      * 根据用户ID查询权限
      * 
-     * @param userId 用户ID
+     * @param id 用户ID
      * @return 权限列表
      */
-    public Set<String> selectMenuPermsByUserId(Long userId);
+    public Set<String> selectMenuPermsById(Long id);
 
     /**
      * 根据用户ID查询菜单树信息
      * 
-     * @param userId 用户ID
+     * @param id 用户ID
      * @return 菜单列表
      */
-    public List<SysMenu> selectMenuTreeByUserId(Long userId);
+    public List<SysMenu> selectMenuTreeById(Long id);
 
     /**
      * 根据角色ID查询菜单树信息
@@ -82,26 +82,26 @@ public interface ISysMenuService
     /**
      * 根据菜单ID查询信息
      * 
-     * @param menuId 菜单ID
+     * @param id 菜单ID
      * @return 菜单信息
      */
-    public SysMenu selectMenuById(Long menuId);
+    public SysMenu selectMenuById(Long id);
 
     /**
      * 是否存在菜单子节点
      * 
-     * @param menuId 菜单ID
+     * @param id 菜单ID
      * @return 结果 true 存在 false 不存在
      */
-    public boolean hasChildByMenuId(Long menuId);
+    public boolean hasChildById(Long id);
 
     /**
      * 查询菜单是否存在角色
      * 
-     * @param menuId 菜单ID
+     * @param id 菜单ID
      * @return 结果 true 存在 false 不存在
      */
-    public boolean checkMenuExistRole(Long menuId);
+    public boolean checkMenuExistRole(Long id);
 
     /**
      * 新增保存菜单信息
@@ -122,10 +122,10 @@ public interface ISysMenuService
     /**
      * 删除菜单管理信息
      * 
-     * @param menuId 菜单ID
+     * @param id 菜单ID
      * @return 结果
      */
-    public int deleteMenuById(Long menuId);
+    public int deleteMenuById(Long id);
 
     /**
      * 校验菜单名称是否唯一

+ 6 - 6
boman-modules/boman-system/src/main/java/com/boman/system/service/ISysNoticeService.java

@@ -14,10 +14,10 @@ public interface ISysNoticeService
     /**
      * 查询公告信息
      * 
-     * @param noticeId 公告ID
+     * @param id 公告ID
      * @return 公告信息
      */
-    public SysNotice selectNoticeById(Long noticeId);
+    public SysNotice selectNoticeById(Long id);
 
     /**
      * 查询公告列表
@@ -46,16 +46,16 @@ public interface ISysNoticeService
     /**
      * 删除公告信息
      * 
-     * @param noticeId 公告ID
+     * @param id 公告ID
      * @return 结果
      */
-    public int deleteNoticeById(Long noticeId);
+    public int deleteNoticeById(Long id);
     
     /**
      * 批量删除公告信息
      * 
-     * @param noticeIds 需要删除的公告ID
+     * @param ids 需要删除的公告ID
      * @return 结果
      */
-    public int deleteNoticeByIds(Long[] noticeIds);
+    public int deleteNoticeByIds(Long[] ids);
 }

+ 4 - 4
boman-modules/boman-system/src/main/java/com/boman/system/service/ISysOperLogService.java

@@ -29,18 +29,18 @@ public interface ISysOperLogService
     /**
      * 批量删除系统操作日志
      * 
-     * @param operIds 需要删除的操作日志ID
+     * @param ids 需要删除的操作日志ID
      * @return 结果
      */
-    public int deleteOperLogByIds(Long[] operIds);
+    public int deleteOperLogByIds(Long[] ids);
 
     /**
      * 查询操作日志详细
      * 
-     * @param operId 操作ID
+     * @param id 操作ID
      * @return 操作日志对象
      */
-    public SysOperLog selectOperLogById(Long operId);
+    public SysOperLog selectOperLogById(Long id);
 
     /**
      * 清空操作日志

+ 4 - 4
boman-modules/boman-system/src/main/java/com/boman/system/service/ISysPermissionService.java

@@ -7,16 +7,16 @@ public interface ISysPermissionService
     /**
      * 获取角色数据权限
      * 
-     * @param userId 用户Id
+     * @param id 用户Id
      * @return 角色权限信息
      */
-    public Set<String> getRolePermission(Long userId);
+    public Set<String> getRolePermission(Long id);
 
     /**
      * 获取菜单数据权限
      * 
-     * @param userId 用户Id
+     * @param id 用户Id
      * @return 菜单权限信息
      */
-    public Set<String> getMenuPermission(Long userId);
+    public Set<String> getMenuPermission(Long id);
 }

+ 8 - 8
boman-modules/boman-system/src/main/java/com/boman/system/service/ISysPostService.java

@@ -36,15 +36,15 @@ public interface ISysPostService
 
     /**
      * 根据用户ID获取岗位选择框列表
-     * 
-     * @param userId 用户ID
+     *
+     * @param id 用户ID
      * @return 选中岗位ID列表
      */
-    public List<Integer> selectPostListByUserId(Long userId);
+    public List<Integer> selectPostListById(Long id);
 
     /**
      * 校验岗位名称
-     * 
+     *
      * @param post 岗位信息
      * @return 结果
      */
@@ -52,7 +52,7 @@ public interface ISysPostService
 
     /**
      * 校验岗位编码
-     * 
+     *
      * @param post 岗位信息
      * @return 结果
      */
@@ -60,7 +60,7 @@ public interface ISysPostService
 
     /**
      * 通过岗位ID查询岗位使用数量
-     * 
+     *
      * @param postId 岗位ID
      * @return 结果
      */
@@ -68,7 +68,7 @@ public interface ISysPostService
 
     /**
      * 删除岗位信息
-     * 
+     *
      * @param postId 岗位ID
      * @return 结果
      */
@@ -76,7 +76,7 @@ public interface ISysPostService
 
     /**
      * 批量删除岗位信息
-     * 
+     *
      * @param postIds 需要删除的岗位ID
      * @return 结果
      * @throws Exception 异常

+ 11 - 11
boman-modules/boman-system/src/main/java/com/boman/system/service/ISysRoleService.java

@@ -23,10 +23,10 @@ public interface ISysRoleService
     /**
      * 根据用户ID查询角色
      * 
-     * @param userId 用户ID
+     * @param id 用户ID
      * @return 权限列表
      */
-    public Set<String> selectRolePermissionByUserId(Long userId);
+    public Set<String> selectRolePermissionById(Long id);
 
     /**
      * 查询所有角色
@@ -41,15 +41,15 @@ public interface ISysRoleService
      * @param userId 用户ID
      * @return 选中角色ID列表
      */
-    public List<Integer> selectRoleListByUserId(Long userId);
+    public List<Integer> selectRoleListById(Long userId);
 
     /**
      * 通过角色ID查询角色
      * 
-     * @param roleId 角色ID
+     * @param id 角色ID
      * @return 角色对象信息
      */
-    public SysRole selectRoleById(Long roleId);
+    public SysRole selectRoleById(Long id);
 
     /**
      * 校验角色名称是否唯一
@@ -77,10 +77,10 @@ public interface ISysRoleService
     /**
      * 通过角色ID查询角色使用数量
      * 
-     * @param roleId 角色ID
+     * @param id 角色ID
      * @return 结果
      */
-    public int countUserRoleByRoleId(Long roleId);
+    public int countUserRoleByRoleId(Long id);
 
     /**
      * 新增保存角色信息
@@ -117,16 +117,16 @@ public interface ISysRoleService
     /**
      * 通过角色ID删除角色
      * 
-     * @param roleId 角色ID
+     * @param id 角色ID
      * @return 结果
      */
-    public int deleteRoleById(Long roleId);
+    public int deleteRoleById(Long id);
 
     /**
      * 批量删除角色信息
      * 
-     * @param roleIds 需要删除的角色ID
+     * @param ids 需要删除的角色ID
      * @return 结果
      */
-    public int deleteRoleByIds(Long[] roleIds);
+    public int deleteRoleByIds(Long[] ids);
 }

+ 6 - 6
boman-modules/boman-system/src/main/java/com/boman/system/service/ISysUserService.java

@@ -30,10 +30,10 @@ public interface ISysUserService
     /**
      * 通过用户ID查询用户
      * 
-     * @param userId 用户ID
+     * @param id 用户ID
      * @return 用户对象信息
      */
-    public SysUser selectUserById(Long userId);
+    public SysUser selectUserById(Long id);
 
     /**
      * 根据用户ID查询用户所属角色组
@@ -143,18 +143,18 @@ public interface ISysUserService
     /**
      * 通过用户ID删除用户
      * 
-     * @param userId 用户ID
+     * @param id 用户ID
      * @return 结果
      */
-    public int deleteUserById(Long userId);
+    public int deleteUserById(Long id);
 
     /**
      * 批量删除用户信息
      * 
-     * @param userIds 需要删除的用户ID
+     * @param ids 需要删除的用户ID
      * @return 结果
      */
-    public int deleteUserByIds(Long[] userIds);
+    public int deleteUserByIds(Long[] ids);
 
     /**
      * 导入用户数据

+ 10 - 10
boman-modules/boman-system/src/main/java/com/boman/system/service/impl/SysConfigServiceImpl.java

@@ -45,14 +45,14 @@ public class SysConfigServiceImpl implements ISysConfigService
     /**
      * 查询参数配置信息
      * 
-     * @param configId 参数配置ID
+     * @param id 参数配置ID
      * @return 参数配置信息
      */
     @Override
-    public SysConfig selectConfigById(Long configId)
+    public SysConfig selectConfigById(Long id)
     {
         SysConfig config = new SysConfig();
-        config.setConfigId(configId);
+        config.setId(id);
         return configMapper.selectConfig(config);
     }
 
@@ -130,21 +130,21 @@ public class SysConfigServiceImpl implements ISysConfigService
     /**
      * 批量删除参数信息
      * 
-     * @param configIds 需要删除的参数ID
+     * @param ids 需要删除的参数ID
      * @return 结果
      */
     @Override
-    public int deleteConfigByIds(Long[] configIds)
+    public int deleteConfigByIds(Long[] ids)
     {
-        for (Long configId : configIds)
+        for (Long id : ids)
         {
-            SysConfig config = selectConfigById(configId);
+            SysConfig config = selectConfigById(id);
             if (StringUtils.equals(UserConstants.YES, config.getConfigType()))
             {
                 throw new CustomException(String.format("内置参数【%1$s】不能删除 ", config.getConfigKey()));
             }
         }
-        int count = configMapper.deleteConfigByIds(configIds);
+        int count = configMapper.deleteConfigByIds(ids);
         if (count > 0)
         {
             Collection<String> keys = redisService.keys(Constants.SYS_CONFIG_KEY + "*");
@@ -172,9 +172,9 @@ public class SysConfigServiceImpl implements ISysConfigService
     @Override
     public String checkConfigKeyUnique(SysConfig config)
     {
-        Long configId = StringUtils.isNull(config.getConfigId()) ? -1L : config.getConfigId();
+        Long id = StringUtils.isNull(config.getId()) ? -1L : config.getId();
         SysConfig info = configMapper.checkConfigKeyUnique(config.getConfigKey());
-        if (StringUtils.isNotNull(info) && info.getConfigId().longValue() != configId.longValue())
+        if (StringUtils.isNotNull(info) && info.getId().longValue() != id.longValue())
         {
             return UserConstants.NOT_UNIQUE;
         }

+ 27 - 27
boman-modules/boman-system/src/main/java/com/boman/system/service/impl/SysDeptServiceImpl.java

@@ -57,7 +57,7 @@ public class SysDeptServiceImpl implements ISysDeptService
         List<Long> tempList = new ArrayList<Long>();
         for (SysDept dept : depts)
         {
-            tempList.add(dept.getDeptId());
+            tempList.add(dept.getId());
         }
         for (Iterator<SysDept> iterator = depts.iterator(); iterator.hasNext();)
         {
@@ -99,56 +99,56 @@ public class SysDeptServiceImpl implements ISysDeptService
     public List<Integer> selectDeptListByRoleId(Long roleId)
     {
         SysRole role = roleMapper.selectRoleById(roleId);
-        return deptMapper.selectDeptListByRoleId(roleId, role.isDeptCheckStrictly());
+        return deptMapper.selectDeptListById(roleId, role.isDeptCheckStrictly());
     }
 
     /**
      * 根据部门ID查询信息
      * 
-     * @param deptId 部门ID
+     * @param id 部门ID
      * @return 部门信息
      */
     @Override
-    public SysDept selectDeptById(Long deptId)
+    public SysDept selectDeptById(Long id)
     {
-        return deptMapper.selectDeptById(deptId);
+        return deptMapper.selectDeptById(id);
     }
 
     /**
      * 根据ID查询所有子部门(正常状态)
      * 
-     * @param deptId 部门ID
+     * @param id 部门ID
      * @return 子部门数
      */
     @Override
-    public int selectNormalChildrenDeptById(Long deptId)
+    public int selectNormalChildrenDeptById(Long id)
     {
-        return deptMapper.selectNormalChildrenDeptById(deptId);
+        return deptMapper.selectNormalChildrenDeptById(id);
     }
 
     /**
      * 是否存在子节点
      * 
-     * @param deptId 部门ID
+     * @param id 部门ID
      * @return 结果
      */
     @Override
-    public boolean hasChildByDeptId(Long deptId)
+    public boolean hasChildById(Long id)
     {
-        int result = deptMapper.hasChildByDeptId(deptId);
+        int result = deptMapper.hasChildById(id);
         return result > 0 ? true : false;
     }
 
     /**
      * 查询部门是否存在用户
      * 
-     * @param deptId 部门ID
+     * @param id 部门ID
      * @return 结果 true 存在 false 不存在
      */
     @Override
-    public boolean checkDeptExistUser(Long deptId)
+    public boolean checkDeptExistUser(Long id)
     {
-        int result = deptMapper.checkDeptExistUser(deptId);
+        int result = deptMapper.checkDeptExistUser(id);
         return result > 0 ? true : false;
     }
 
@@ -161,9 +161,9 @@ public class SysDeptServiceImpl implements ISysDeptService
     @Override
     public String checkDeptNameUnique(SysDept dept)
     {
-        Long deptId = StringUtils.isNull(dept.getDeptId()) ? -1L : dept.getDeptId();
+        Long id = StringUtils.isNull(dept.getId()) ? -1L : dept.getId();
         SysDept info = deptMapper.checkDeptNameUnique(dept.getDeptName(), dept.getParentId());
-        if (StringUtils.isNotNull(info) && info.getDeptId().longValue() != deptId.longValue())
+        if (StringUtils.isNotNull(info) && info.getId().longValue() != id.longValue())
         {
             return UserConstants.NOT_UNIQUE;
         }
@@ -199,13 +199,13 @@ public class SysDeptServiceImpl implements ISysDeptService
     public int updateDept(SysDept dept)
     {
         SysDept newParentDept = deptMapper.selectDeptById(dept.getParentId());
-        SysDept oldDept = deptMapper.selectDeptById(dept.getDeptId());
+        SysDept oldDept = deptMapper.selectDeptById(dept.getId());
         if (StringUtils.isNotNull(newParentDept) && StringUtils.isNotNull(oldDept))
         {
-            String newAncestors = newParentDept.getAncestors() + "," + newParentDept.getDeptId();
+            String newAncestors = newParentDept.getAncestors() + "," + newParentDept.getId();
             String oldAncestors = oldDept.getAncestors();
             dept.setAncestors(newAncestors);
-            updateDeptChildren(dept.getDeptId(), newAncestors, oldAncestors);
+            updateDeptChildren(dept.getId(), newAncestors, oldAncestors);
         }
         int result = deptMapper.updateDept(dept);
         if (UserConstants.DEPT_NORMAL.equals(dept.getStatus()))
@@ -224,7 +224,7 @@ public class SysDeptServiceImpl implements ISysDeptService
     private void updateParentDeptStatus(SysDept dept)
     {
         String updateBy = dept.getUpdateBy();
-        dept = deptMapper.selectDeptById(dept.getDeptId());
+        dept = deptMapper.selectDeptById(dept.getId());
         dept.setUpdateBy(updateBy);
         deptMapper.updateDeptStatus(dept);
     }
@@ -232,13 +232,13 @@ public class SysDeptServiceImpl implements ISysDeptService
     /**
      * 修改子元素关系
      * 
-     * @param deptId 被修改的部门ID
+     * @param id 被修改的部门ID
      * @param newAncestors 新的父ID集合
      * @param oldAncestors 旧的父ID集合
      */
-    public void updateDeptChildren(Long deptId, String newAncestors, String oldAncestors)
+    public void updateDeptChildren(Long id, String newAncestors, String oldAncestors)
     {
-        List<SysDept> children = deptMapper.selectChildrenDeptById(deptId);
+        List<SysDept> children = deptMapper.selectChildrenDeptById(id);
         for (SysDept child : children)
         {
             child.setAncestors(child.getAncestors().replace(oldAncestors, newAncestors));
@@ -252,13 +252,13 @@ public class SysDeptServiceImpl implements ISysDeptService
     /**
      * 删除部门管理信息
      * 
-     * @param deptId 部门ID
+     * @param id 部门ID
      * @return 结果
      */
     @Override
-    public int deleteDeptById(Long deptId)
+    public int deleteDeptById(Long id)
     {
-        return deptMapper.deleteDeptById(deptId);
+        return deptMapper.deleteDeptById(id);
     }
 
     /**
@@ -288,7 +288,7 @@ public class SysDeptServiceImpl implements ISysDeptService
         while (it.hasNext())
         {
             SysDept n = (SysDept) it.next();
-            if (StringUtils.isNotNull(n.getParentId()) && n.getParentId().longValue() == t.getDeptId().longValue())
+            if (StringUtils.isNotNull(n.getParentId()) && n.getParentId().longValue() == t.getId().longValue())
             {
                 tlist.add(n);
             }

+ 6 - 6
boman-modules/boman-system/src/main/java/com/boman/system/service/impl/SysDictDataServiceImpl.java

@@ -47,25 +47,25 @@ public class SysDictDataServiceImpl implements ISysDictDataService
     /**
      * 根据字典数据ID查询信息
      * 
-     * @param dictCode 字典数据ID
+     * @param id 字典数据ID
      * @return 字典数据
      */
     @Override
-    public SysDictData selectDictDataById(Long dictCode)
+    public SysDictData selectDictDataById(Long id)
     {
-        return dictDataMapper.selectDictDataById(dictCode);
+        return dictDataMapper.selectDictDataById(id);
     }
 
     /**
      * 批量删除字典数据信息
      * 
-     * @param dictCodes 需要删除的字典数据ID
+     * @param ids 需要删除的字典数据ID
      * @return 结果
      */
     @Override
-    public int deleteDictDataByIds(Long[] dictCodes)
+    public int deleteDictDataByIds(Long[] ids)
     {
-        int row = dictDataMapper.deleteDictDataByIds(dictCodes);
+        int row = dictDataMapper.deleteDictDataByIds(ids);
         if (row > 0)
         {
             DictUtils.clearDictCache();

+ 11 - 11
boman-modules/boman-system/src/main/java/com/boman/system/service/impl/SysDictTypeServiceImpl.java

@@ -92,13 +92,13 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
     /**
      * 根据字典类型ID查询信息
      * 
-     * @param dictId 字典类型ID
+     * @param id 字典类型ID
      * @return 字典类型
      */
     @Override
-    public SysDictType selectDictTypeById(Long dictId)
+    public SysDictType selectDictTypeById(Long id)
     {
-        return dictTypeMapper.selectDictTypeById(dictId);
+        return dictTypeMapper.selectDictTypeById(id);
     }
 
     /**
@@ -116,21 +116,21 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
     /**
      * 批量删除字典类型信息
      * 
-     * @param dictIds 需要删除的字典ID
+     * @param ids 需要删除的字典ID
      * @return 结果
      */
     @Override
-    public int deleteDictTypeByIds(Long[] dictIds)
+    public int deleteDictTypeByIds(Long[] ids)
     {
-        for (Long dictId : dictIds)
+        for (Long id : ids)
         {
-            SysDictType dictType = selectDictTypeById(dictId);
+            SysDictType dictType = selectDictTypeById(id);
             if (dictDataMapper.countDictDataByType(dictType.getDictType()) > 0)
             {
                 throw new CustomException(String.format("%1$s已分配,不能删除", dictType.getDictName()));
             }
         }
-        int count = dictTypeMapper.deleteDictTypeByIds(dictIds);
+        int count = dictTypeMapper.deleteDictTypeByIds(ids);
         if (count > 0)
         {
             DictUtils.clearDictCache();
@@ -174,7 +174,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
     @Transactional
     public int updateDictType(SysDictType dictType)
     {
-        SysDictType oldDict = dictTypeMapper.selectDictTypeById(dictType.getDictId());
+        SysDictType oldDict = dictTypeMapper.selectDictTypeById(dictType.getId());
         dictDataMapper.updateDictDataType(oldDict.getDictType(), dictType.getDictType());
         int row = dictTypeMapper.updateDictType(dictType);
         if (row > 0)
@@ -193,9 +193,9 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
     @Override
     public String checkDictTypeUnique(SysDictType dict)
     {
-        Long dictId = StringUtils.isNull(dict.getDictId()) ? -1L : dict.getDictId();
+        Long id = StringUtils.isNull(dict.getId()) ? -1L : dict.getId();
         SysDictType dictType = dictTypeMapper.checkDictTypeUnique(dict.getDictType());
-        if (StringUtils.isNotNull(dictType) && dictType.getDictId().longValue() != dictId.longValue())
+        if (StringUtils.isNotNull(dictType) && dictType.getId().longValue() != id.longValue())
         {
             return UserConstants.NOT_UNIQUE;
         }

+ 3 - 3
boman-modules/boman-system/src/main/java/com/boman/system/service/impl/SysLogininforServiceImpl.java

@@ -45,13 +45,13 @@ public class SysLogininforServiceImpl implements ISysLogininforService
     /**
      * 批量删除系统登录日志
      * 
-     * @param infoIds 需要删除的登录日志ID
+     * @param ids 需要删除的登录日志ID
      * @return
      */
     @Override
-    public int deleteLogininforByIds(Long[] infoIds)
+    public int deleteLogininforByIds(Long[] ids)
     {
-        return logininforMapper.deleteLogininforByIds(infoIds);
+        return logininforMapper.deleteLogininforByIds(ids);
     }
 
     /**

+ 23 - 23
boman-modules/boman-system/src/main/java/com/boman/system/service/impl/SysMenuServiceImpl.java

@@ -81,13 +81,13 @@ public class SysMenuServiceImpl implements ISysMenuService
     /**
      * 根据用户ID查询权限
      * 
-     * @param userId 用户ID
+     * @param id 用户ID
      * @return 权限列表
      */
     @Override
-    public Set<String> selectMenuPermsByUserId(Long userId)
+    public Set<String> selectMenuPermsById(Long id)
     {
-        List<String> perms = menuMapper.selectMenuPermsByUserId(userId);
+        List<String> perms = menuMapper.selectMenuPermsById(id);
         Set<String> permsSet = new HashSet<>();
         for (String perm : perms)
         {
@@ -102,20 +102,20 @@ public class SysMenuServiceImpl implements ISysMenuService
     /**
      * 根据用户ID查询菜单
      * 
-     * @param userId 用户名称
+     * @param id 用户名称
      * @return 菜单列表
      */
     @Override
-    public List<SysMenu> selectMenuTreeByUserId(Long userId)
+    public List<SysMenu> selectMenuTreeById(Long id)
     {
         List<SysMenu> menus = null;
-        if (SecurityUtils.isAdmin(userId))
+        if (SecurityUtils.isAdmin(id))
         {
             menus = menuMapper.selectMenuTreeAll();
         }
         else
         {
-            menus = menuMapper.selectMenuTreeByUserId(userId);
+            menus = menuMapper.selectMenuTreeById(id);
         }
         return getChildPerms(menus, 0);
     }
@@ -187,7 +187,7 @@ public class SysMenuServiceImpl implements ISysMenuService
         List<Long> tempList = new ArrayList<Long>();
         for (SysMenu dept : menus)
         {
-            tempList.add(dept.getMenuId());
+            tempList.add(dept.getId());
         }
         for (Iterator<SysMenu> iterator = menus.iterator(); iterator.hasNext();)
         {
@@ -222,38 +222,38 @@ public class SysMenuServiceImpl implements ISysMenuService
     /**
      * 根据菜单ID查询信息
      * 
-     * @param menuId 菜单ID
+     * @param id 菜单ID
      * @return 菜单信息
      */
     @Override
-    public SysMenu selectMenuById(Long menuId)
+    public SysMenu selectMenuById(Long id)
     {
-        return menuMapper.selectMenuById(menuId);
+        return menuMapper.selectMenuById(id);
     }
 
     /**
      * 是否存在菜单子节点
      * 
-     * @param menuId 菜单ID
+     * @param id 菜单ID
      * @return 结果
      */
     @Override
-    public boolean hasChildByMenuId(Long menuId)
+    public boolean hasChildById(Long id)
     {
-        int result = menuMapper.hasChildByMenuId(menuId);
+        int result = menuMapper.hasChildById(id);
         return result > 0 ? true : false;
     }
 
     /**
      * 查询菜单使用数量
      * 
-     * @param menuId 菜单ID
+     * @param id 菜单ID
      * @return 结果
      */
     @Override
-    public boolean checkMenuExistRole(Long menuId)
+    public boolean checkMenuExistRole(Long id)
     {
-        int result = roleMenuMapper.checkMenuExistRole(menuId);
+        int result = roleMenuMapper.checkMenuExistRole(id);
         return result > 0 ? true : false;
     }
 
@@ -284,13 +284,13 @@ public class SysMenuServiceImpl implements ISysMenuService
     /**
      * 删除菜单管理信息
      * 
-     * @param menuId 菜单ID
+     * @param id 菜单ID
      * @return 结果
      */
     @Override
-    public int deleteMenuById(Long menuId)
+    public int deleteMenuById(Long id)
     {
-        return menuMapper.deleteMenuById(menuId);
+        return menuMapper.deleteMenuById(id);
     }
 
     /**
@@ -302,9 +302,9 @@ public class SysMenuServiceImpl implements ISysMenuService
     @Override
     public String checkMenuNameUnique(SysMenu menu)
     {
-        Long menuId = StringUtils.isNull(menu.getMenuId()) ? -1L : menu.getMenuId();
+        Long id = StringUtils.isNull(menu.getId()) ? -1L : menu.getId();
         SysMenu info = menuMapper.checkMenuNameUnique(menu.getMenuName(), menu.getParentId());
-        if (StringUtils.isNotNull(info) && info.getMenuId().longValue() != menuId.longValue())
+        if (StringUtils.isNotNull(info) && info.getId().longValue() != id.longValue())
         {
             return UserConstants.NOT_UNIQUE;
         }
@@ -447,7 +447,7 @@ public class SysMenuServiceImpl implements ISysMenuService
         while (it.hasNext())
         {
             SysMenu n = (SysMenu) it.next();
-            if (n.getParentId().longValue() == t.getMenuId().longValue())
+            if (n.getParentId().longValue() == t.getId().longValue())
             {
                 tlist.add(n);
             }

+ 9 - 9
boman-modules/boman-system/src/main/java/com/boman/system/service/impl/SysNoticeServiceImpl.java

@@ -23,13 +23,13 @@ public class SysNoticeServiceImpl implements ISysNoticeService
     /**
      * 查询公告信息
      * 
-     * @param noticeId 公告ID
+     * @param id 公告ID
      * @return 公告信息
      */
     @Override
-    public SysNotice selectNoticeById(Long noticeId)
+    public SysNotice selectNoticeById(Long id)
     {
-        return noticeMapper.selectNoticeById(noticeId);
+        return noticeMapper.selectNoticeById(id);
     }
 
     /**
@@ -71,24 +71,24 @@ public class SysNoticeServiceImpl implements ISysNoticeService
     /**
      * 删除公告对象
      * 
-     * @param noticeId 公告ID
+     * @param id 公告ID
      * @return 结果
      */
     @Override
-    public int deleteNoticeById(Long noticeId)
+    public int deleteNoticeById(Long id)
     {
-        return noticeMapper.deleteNoticeById(noticeId);
+        return noticeMapper.deleteNoticeById(id);
     }
 
     /**
      * 批量删除公告信息
      * 
-     * @param noticeIds 需要删除的公告ID
+     * @param ids 需要删除的公告ID
      * @return 结果
      */
     @Override
-    public int deleteNoticeByIds(Long[] noticeIds)
+    public int deleteNoticeByIds(Long[] ids)
     {
-        return noticeMapper.deleteNoticeByIds(noticeIds);
+        return noticeMapper.deleteNoticeByIds(ids);
     }
 }

+ 6 - 6
boman-modules/boman-system/src/main/java/com/boman/system/service/impl/SysOperLogServiceImpl.java

@@ -45,25 +45,25 @@ public class SysOperLogServiceImpl implements ISysOperLogService
     /**
      * 批量删除系统操作日志
      * 
-     * @param operIds 需要删除的操作日志ID
+     * @param ids 需要删除的操作日志ID
      * @return 结果
      */
     @Override
-    public int deleteOperLogByIds(Long[] operIds)
+    public int deleteOperLogByIds(Long[] ids)
     {
-        return operLogMapper.deleteOperLogByIds(operIds);
+        return operLogMapper.deleteOperLogByIds(ids);
     }
 
     /**
      * 查询操作日志详细
      * 
-     * @param operId 操作ID
+     * @param id 操作ID
      * @return 操作日志对象
      */
     @Override
-    public SysOperLog selectOperLogById(Long operId)
+    public SysOperLog selectOperLogById(Long id)
     {
-        return operLogMapper.selectOperLogById(operId);
+        return operLogMapper.selectOperLogById(id);
     }
 
     /**

+ 8 - 8
boman-modules/boman-system/src/main/java/com/boman/system/service/impl/SysPermissionServiceImpl.java

@@ -22,21 +22,21 @@ public class SysPermissionServiceImpl implements ISysPermissionService
     /**
      * 获取角色数据权限
      * 
-     * @param userId 用户Id
+     * @param id 用户Id
      * @return 角色权限信息
      */
     @Override
-    public Set<String> getRolePermission(Long userId)
+    public Set<String> getRolePermission(Long id)
     {
         Set<String> roles = new HashSet<String>();
         // 管理员拥有所有权限
-        if (SysUser.isAdmin(userId))
+        if (SysUser.isAdmin(id))
         {
             roles.add("admin");
         }
         else
         {
-            roles.addAll(roleService.selectRolePermissionByUserId(userId));
+            roles.addAll(roleService.selectRolePermissionById(id));
         }
         return roles;
     }
@@ -44,21 +44,21 @@ public class SysPermissionServiceImpl implements ISysPermissionService
     /**
      * 获取菜单数据权限
      * 
-     * @param userId 用户Id
+     * @param id 用户Id
      * @return 菜单权限信息
      */
     @Override
-    public Set<String> getMenuPermission(Long userId)
+    public Set<String> getMenuPermission(Long id)
     {
         Set<String> perms = new HashSet<String>();
         // 管理员拥有所有权限
-        if (SysUser.isAdmin(userId))
+        if (SysUser.isAdmin(id))
         {
             perms.add("*:*:*");
         }
         else
         {
-            perms.addAll(menuService.selectMenuPermsByUserId(userId));
+            perms.addAll(menuService.selectMenuPermsById(id));
         }
         return perms;
     }

+ 22 - 22
boman-modules/boman-system/src/main/java/com/boman/system/service/impl/SysPostServiceImpl.java

@@ -53,25 +53,25 @@ public class SysPostServiceImpl implements ISysPostService
     /**
      * 通过岗位ID查询岗位信息
      * 
-     * @param postId 岗位ID
+     * @param id 岗位ID
      * @return 角色对象信息
      */
     @Override
-    public SysPost selectPostById(Long postId)
+    public SysPost selectPostById(Long id)
     {
-        return postMapper.selectPostById(postId);
+        return postMapper.selectPostById(id);
     }
 
     /**
      * 根据用户ID获取岗位选择框列表
      * 
-     * @param userId 用户ID
+     * @param id 用户ID
      * @return 选中岗位ID列表
      */
     @Override
-    public List<Integer> selectPostListByUserId(Long userId)
+    public List<Integer> selectPostListById(Long id)
     {
-        return postMapper.selectPostListByUserId(userId);
+        return postMapper.selectPostListById(id);
     }
 
     /**
@@ -83,9 +83,9 @@ public class SysPostServiceImpl implements ISysPostService
     @Override
     public String checkPostNameUnique(SysPost post)
     {
-        Long postId = StringUtils.isNull(post.getPostId()) ? -1L : post.getPostId();
+        Long id = StringUtils.isNull(post.getId()) ? -1L : post.getId();
         SysPost info = postMapper.checkPostNameUnique(post.getPostName());
-        if (StringUtils.isNotNull(info) && info.getPostId().longValue() != postId.longValue())
+        if (StringUtils.isNotNull(info) && info.getId().longValue() != id.longValue())
         {
             return UserConstants.NOT_UNIQUE;
         }
@@ -101,9 +101,9 @@ public class SysPostServiceImpl implements ISysPostService
     @Override
     public String checkPostCodeUnique(SysPost post)
     {
-        Long postId = StringUtils.isNull(post.getPostId()) ? -1L : post.getPostId();
+        Long id = StringUtils.isNull(post.getId()) ? -1L : post.getId();
         SysPost info = postMapper.checkPostCodeUnique(post.getPostCode());
-        if (StringUtils.isNotNull(info) && info.getPostId().longValue() != postId.longValue())
+        if (StringUtils.isNotNull(info) && info.getId().longValue() != id.longValue())
         {
             return UserConstants.NOT_UNIQUE;
         }
@@ -113,46 +113,46 @@ public class SysPostServiceImpl implements ISysPostService
     /**
      * 通过岗位ID查询岗位使用数量
      * 
-     * @param postId 岗位ID
+     * @param id 岗位ID
      * @return 结果
      */
     @Override
-    public int countUserPostById(Long postId)
+    public int countUserPostById(Long id)
     {
-        return userPostMapper.countUserPostById(postId);
+        return userPostMapper.countUserPostById(id);
     }
 
     /**
      * 删除岗位信息
      * 
-     * @param postId 岗位ID
+     * @param id 岗位ID
      * @return 结果
      */
     @Override
-    public int deletePostById(Long postId)
+    public int deletePostById(Long id)
     {
-        return postMapper.deletePostById(postId);
+        return postMapper.deletePostById(id);
     }
 
     /**
      * 批量删除岗位信息
      * 
-     * @param postIds 需要删除的岗位ID
+     * @param ids 需要删除的岗位ID
      * @return 结果
      * @throws Exception 异常
      */
     @Override
-    public int deletePostByIds(Long[] postIds)
+    public int deletePostByIds(Long[] ids)
     {
-        for (Long postId : postIds)
+        for (Long id : ids)
         {
-            SysPost post = selectPostById(postId);
-            if (countUserPostById(postId) > 0)
+            SysPost post = selectPostById(id);
+            if (countUserPostById(id) > 0)
             {
                 throw new CustomException(String.format("%1$s已分配,不能删除", post.getPostName()));
             }
         }
-        return postMapper.deletePostByIds(postIds);
+        return postMapper.deletePostByIds(ids);
     }
 
     /**

+ 32 - 32
boman-modules/boman-system/src/main/java/com/boman/system/service/impl/SysRoleServiceImpl.java

@@ -58,13 +58,13 @@ public class SysRoleServiceImpl implements ISysRoleService
     /**
      * 根据用户ID查询权限
      * 
-     * @param userId 用户ID
+     * @param id 用户ID
      * @return 权限列表
      */
     @Override
-    public Set<String> selectRolePermissionByUserId(Long userId)
+    public Set<String> selectRolePermissionById(Long id)
     {
-        List<SysRole> perms = roleMapper.selectRolePermissionByUserId(userId);
+        List<SysRole> perms = roleMapper.selectRolePermissionById(id);
         Set<String> permsSet = new HashSet<>();
         for (SysRole perm : perms)
         {
@@ -90,25 +90,25 @@ public class SysRoleServiceImpl implements ISysRoleService
     /**
      * 根据用户ID获取角色选择框列表
      * 
-     * @param userId 用户ID
+     * @param id 用户ID
      * @return 选中角色ID列表
      */
     @Override
-    public List<Integer> selectRoleListByUserId(Long userId)
+    public List<Integer> selectRoleListById(Long id)
     {
-        return roleMapper.selectRoleListByUserId(userId);
+        return roleMapper.selectRoleListById(id);
     }
 
     /**
      * 通过角色ID查询角色
      * 
-     * @param roleId 角色ID
+     * @param id 角色ID
      * @return 角色对象信息
      */
     @Override
-    public SysRole selectRoleById(Long roleId)
+    public SysRole selectRoleById(Long id)
     {
-        return roleMapper.selectRoleById(roleId);
+        return roleMapper.selectRoleById(id);
     }
 
     /**
@@ -120,9 +120,9 @@ public class SysRoleServiceImpl implements ISysRoleService
     @Override
     public String checkRoleNameUnique(SysRole role)
     {
-        Long roleId = StringUtils.isNull(role.getRoleId()) ? -1L : role.getRoleId();
+        Long id = StringUtils.isNull(role.getId()) ? -1L : role.getId();
         SysRole info = roleMapper.checkRoleNameUnique(role.getRoleName());
-        if (StringUtils.isNotNull(info) && info.getRoleId().longValue() != roleId.longValue())
+        if (StringUtils.isNotNull(info) && info.getId().longValue() != id.longValue())
         {
             return UserConstants.NOT_UNIQUE;
         }
@@ -138,9 +138,9 @@ public class SysRoleServiceImpl implements ISysRoleService
     @Override
     public String checkRoleKeyUnique(SysRole role)
     {
-        Long roleId = StringUtils.isNull(role.getRoleId()) ? -1L : role.getRoleId();
+        Long id = StringUtils.isNull(role.getId()) ? -1L : role.getId();
         SysRole info = roleMapper.checkRoleKeyUnique(role.getRoleKey());
-        if (StringUtils.isNotNull(info) && info.getRoleId().longValue() != roleId.longValue())
+        if (StringUtils.isNotNull(info) && info.getId().longValue() != id.longValue())
         {
             return UserConstants.NOT_UNIQUE;
         }
@@ -155,7 +155,7 @@ public class SysRoleServiceImpl implements ISysRoleService
     @Override
     public void checkRoleAllowed(SysRole role)
     {
-        if (StringUtils.isNotNull(role.getRoleId()) && role.isAdmin())
+        if (StringUtils.isNotNull(role.getId()) && role.isAdmin())
         {
             throw new CustomException("不允许操作超级管理员角色");
         }
@@ -201,7 +201,7 @@ public class SysRoleServiceImpl implements ISysRoleService
         // 修改角色信息
         roleMapper.updateRole(role);
         // 删除角色与菜单关联
-        roleMenuMapper.deleteRoleMenuByRoleId(role.getRoleId());
+        roleMenuMapper.deleteRoleMenuByRoleId(role.getId());
         return insertRoleMenu(role);
     }
 
@@ -230,7 +230,7 @@ public class SysRoleServiceImpl implements ISysRoleService
         // 修改角色信息
         roleMapper.updateRole(role);
         // 删除角色与部门关联
-        roleDeptMapper.deleteRoleDeptByRoleId(role.getRoleId());
+        roleDeptMapper.deleteRoleDeptByRoleId(role.getId());
         // 新增角色和部门信息(数据权限)
         return insertRoleDept(role);
     }
@@ -248,7 +248,7 @@ public class SysRoleServiceImpl implements ISysRoleService
         for (Long menuId : role.getMenuIds())
         {
             SysRoleMenu rm = new SysRoleMenu();
-            rm.setRoleId(role.getRoleId());
+            rm.setRoleId(role.getId());
             rm.setMenuId(menuId);
             list.add(rm);
         }
@@ -272,7 +272,7 @@ public class SysRoleServiceImpl implements ISysRoleService
         for (Long deptId : role.getDeptIds())
         {
             SysRoleDept rd = new SysRoleDept();
-            rd.setRoleId(role.getRoleId());
+            rd.setRoleId(role.getId());
             rd.setDeptId(deptId);
             list.add(rd);
         }
@@ -286,43 +286,43 @@ public class SysRoleServiceImpl implements ISysRoleService
     /**
      * 通过角色ID删除角色
      * 
-     * @param roleId 角色ID
+     * @param id 角色ID
      * @return 结果
      */
     @Override
     @Transactional
-    public int deleteRoleById(Long roleId)
+    public int deleteRoleById(Long id)
     {
         // 删除角色与菜单关联
-        roleMenuMapper.deleteRoleMenuByRoleId(roleId);
+        roleMenuMapper.deleteRoleMenuByRoleId(id);
         // 删除角色与部门关联
-        roleDeptMapper.deleteRoleDeptByRoleId(roleId);
-        return roleMapper.deleteRoleById(roleId);
+        roleDeptMapper.deleteRoleDeptByRoleId(id);
+        return roleMapper.deleteRoleById(id);
     }
 
     /**
      * 批量删除角色信息
      * 
-     * @param roleIds 需要删除的角色ID
+     * @param ids 需要删除的角色ID
      * @return 结果
      */
     @Override
     @Transactional
-    public int deleteRoleByIds(Long[] roleIds)
+    public int deleteRoleByIds(Long[] ids)
     {
-        for (Long roleId : roleIds)
+        for (Long id : ids)
         {
-            checkRoleAllowed(new SysRole(roleId));
-            SysRole role = selectRoleById(roleId);
-            if (countUserRoleByRoleId(roleId) > 0)
+            checkRoleAllowed(new SysRole(id));
+            SysRole role = selectRoleById(id);
+            if (countUserRoleByRoleId(id) > 0)
             {
                 throw new CustomException(String.format("%1$s已分配,不能删除", role.getRoleName()));
             }
         }
         // 删除角色与菜单关联
-        roleMenuMapper.deleteRoleMenu(roleIds);
+        roleMenuMapper.deleteRoleMenu(ids);
         // 删除角色与部门关联
-        roleDeptMapper.deleteRoleDept(roleIds);
-        return roleMapper.deleteRoleByIds(roleIds);
+        roleDeptMapper.deleteRoleDept(ids);
+        return roleMapper.deleteRoleByIds(ids);
     }
 }

+ 25 - 25
boman-modules/boman-system/src/main/java/com/boman/system/service/impl/SysUserServiceImpl.java

@@ -81,13 +81,13 @@ public class SysUserServiceImpl implements ISysUserService
     /**
      * 通过用户ID查询用户
      * 
-     * @param userId 用户ID
+     * @param id 用户ID
      * @return 用户对象信息
      */
     @Override
-    public SysUser selectUserById(Long userId)
+    public SysUser selectUserById(Long id)
     {
-        return userMapper.selectUserById(userId);
+        return userMapper.selectUserById(id);
     }
 
     /**
@@ -160,9 +160,9 @@ public class SysUserServiceImpl implements ISysUserService
     @Override
     public String checkPhoneUnique(SysUser user)
     {
-        Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
+        Long id = StringUtils.isNull(user.getId()) ? -1L : user.getId();
         SysUser info = userMapper.checkPhoneUnique(user.getPhonenumber());
-        if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue())
+        if (StringUtils.isNotNull(info) && info.getId().longValue() != id.longValue())
         {
             return UserConstants.NOT_UNIQUE;
         }
@@ -178,9 +178,9 @@ public class SysUserServiceImpl implements ISysUserService
     @Override
     public String checkEmailUnique(SysUser user)
     {
-        Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
+        Long id = StringUtils.isNull(user.getId()) ? -1L : user.getId();
         SysUser info = userMapper.checkEmailUnique(user.getEmail());
-        if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue())
+        if (StringUtils.isNotNull(info) && info.getId().longValue() != id.longValue())
         {
             return UserConstants.NOT_UNIQUE;
         }
@@ -195,7 +195,7 @@ public class SysUserServiceImpl implements ISysUserService
     @Override
     public void checkUserAllowed(SysUser user)
     {
-        if (StringUtils.isNotNull(user.getUserId()) && user.isAdmin())
+        if (StringUtils.isNotNull(user.getId()) && user.isAdmin())
         {
             throw new CustomException("不允许操作超级管理员用户");
         }
@@ -230,13 +230,13 @@ public class SysUserServiceImpl implements ISysUserService
     @Transactional
     public int updateUser(SysUser user)
     {
-        Long userId = user.getUserId();
+        Long id = user.getId();
         // 删除用户与角色关联
-        userRoleMapper.deleteUserRoleByUserId(userId);
+        userRoleMapper.deleteUserRoleByUserId(id);
         // 新增用户与角色管理
         insertUserRole(user);
         // 删除用户与岗位关联
-        userPostMapper.deleteUserPostByUserId(userId);
+        userPostMapper.deleteUserPostByUserId(id);
         // 新增用户与岗位管理
         insertUserPost(user);
         return userMapper.updateUser(user);
@@ -319,7 +319,7 @@ public class SysUserServiceImpl implements ISysUserService
             for (Long roleId : roles)
             {
                 SysUserRole ur = new SysUserRole();
-                ur.setUserId(user.getUserId());
+                ur.setUserId(user.getId());
                 ur.setRoleId(roleId);
                 list.add(ur);
             }
@@ -345,7 +345,7 @@ public class SysUserServiceImpl implements ISysUserService
             for (Long postId : posts)
             {
                 SysUserPost up = new SysUserPost();
-                up.setUserId(user.getUserId());
+                up.setUserId(user.getId());
                 up.setPostId(postId);
                 list.add(up);
             }
@@ -359,39 +359,39 @@ public class SysUserServiceImpl implements ISysUserService
     /**
      * 通过用户ID删除用户
      * 
-     * @param userId 用户ID
+     * @param id 用户ID
      * @return 结果
      */
     @Override
     @Transactional
-    public int deleteUserById(Long userId)
+    public int deleteUserById(Long id)
     {
         // 删除用户与角色关联
-        userRoleMapper.deleteUserRoleByUserId(userId);
+        userRoleMapper.deleteUserRoleByUserId(id);
         // 删除用户与岗位表
-        userPostMapper.deleteUserPostByUserId(userId);
-        return userMapper.deleteUserById(userId);
+        userPostMapper.deleteUserPostByUserId(id);
+        return userMapper.deleteUserById(id);
     }
 
     /**
      * 批量删除用户信息
      * 
-     * @param userIds 需要删除的用户ID
+     * @param ids 需要删除的用户ID
      * @return 结果
      */
     @Override
     @Transactional
-    public int deleteUserByIds(Long[] userIds)
+    public int deleteUserByIds(Long[] ids)
     {
-        for (Long userId : userIds)
+        for (Long id : ids)
         {
-            checkUserAllowed(new SysUser(userId));
+            checkUserAllowed(new SysUser(id));
         }
         // 删除用户与角色关联
-        userRoleMapper.deleteUserRole(userIds);
+        userRoleMapper.deleteUserRole(ids);
         // 删除用户与岗位关联
-        userPostMapper.deleteUserPost(userIds);
-        return userMapper.deleteUserByIds(userIds);
+        userPostMapper.deleteUserPost(ids);
+        return userMapper.deleteUserByIds(ids);
     }
 
     /**

+ 9 - 9
boman-modules/boman-system/src/main/resources/mapper/system/SysConfigMapper.xml

@@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.boman.system.mapper.SysConfigMapper">
     
     <resultMap type="SysConfig" id="SysConfigResult">
-    	<id     property="configId"      column="config_id"      />
+    	<id     property="id"      column="id"      />
         <result property="configName"    column="config_name"    />
         <result property="configKey"     column="config_key"     />
         <result property="configValue"   column="config_value"   />
@@ -17,15 +17,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
     
     <sql id="selectConfigVo">
-        select config_id, config_name, config_key, config_value, config_type, create_by, create_time, update_by, update_time, remark 
+        select id, config_name, config_key, config_value, config_type, create_by, create_time, update_by, update_time, remark 
 		from sys_config
     </sql>
     
     <!-- 查询条件 -->
 	<sql id="sqlwhereSearch">
 		<where>
-			<if test="configId !=null">
-				and config_id = #{configId}
+			<if test="id !=null">
+				and id = #{id}
 			</if>
 			<if test="configKey !=null and configKey != ''">
 				and config_key = #{configKey}
@@ -115,17 +115,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remark != null">remark = #{remark},</if>
  			update_time = sysdate()
         </set>
-        where config_id = #{configId}
+        where id = #{id}
     </update>
 	
     <delete id="deleteConfigById" parameterType="Long">
-        delete from sys_config where config_id = #{configId}
+        delete from sys_config where id = #{id}
     </delete>
     
     <delete id="deleteConfigByIds" parameterType="Long">
-        delete from sys_config where config_id in 
-        <foreach item="configId" collection="array" open="(" separator="," close=")">
-        	#{configId}
+        delete from sys_config where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+        	#{id}
         </foreach>
     </delete>
     

+ 22 - 22
boman-modules/boman-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.boman.system.mapper.SysDeptMapper">
 
 	<resultMap type="SysDept" id="SysDeptResult">
-		<id     property="deptId"     column="dept_id"     />
+		<id     property="id"     column="id"     />
 		<result property="parentId"   column="parent_id"   />
 		<result property="ancestors"  column="ancestors"   />
 		<result property="deptName"   column="dept_name"   />
@@ -23,7 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</resultMap>
 	
 	<sql id="selectDeptVo">
-        select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time 
+        select d.id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time 
         from sys_dept d
     </sql>
     
@@ -44,37 +44,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		order by d.parent_id, d.order_num
     </select>
     
-    <select id="selectDeptListByRoleId" resultType="Integer">
-		select d.dept_id
+    <select id="selectDeptListById" resultType="java.lang.Integer">
+		select d.id
 		from sys_dept d
-            left join sys_role_dept rd on d.dept_id = rd.dept_id
-        where rd.role_id = #{roleId}
+            left join sys_role_dept rd on d.id = rd.role_id
+        where rd.role_id = #{id}
             <if test="deptCheckStrictly">
-              and d.dept_id not in (select d.parent_id from sys_dept d inner join sys_role_dept rd on d.dept_id = rd.dept_id and rd.role_id = #{roleId})
+              and d.id not in (select d.parent_id from sys_dept d inner join sys_role_dept rd on d.id = rd.role_id and rd.role_id = #{id})
             </if>
 		order by d.parent_id, d.order_num
 	</select>
     
     <select id="selectDeptById" parameterType="Long" resultMap="SysDeptResult">
 		<include refid="selectDeptVo"/>
-		where dept_id = #{deptId}
+		where id = #{id}
 	</select>
     
     <select id="checkDeptExistUser" parameterType="Long" resultType="int">
-		select count(1) from sys_user where dept_id = #{deptId} and del_flag = '0'
+		select count(1) from sys_user where id = #{id} and del_flag = '0'
 	</select>
 	
-	<select id="hasChildByDeptId" parameterType="Long" resultType="int">
+	<select id="hasChildById" parameterType="Long" resultType="int">
 		select count(1) from sys_dept
-		where del_flag = '0' and parent_id = #{deptId}
+		where del_flag = '0' and parent_id = #{id}
 	</select>
 	
 	<select id="selectChildrenDeptById" parameterType="Long" resultMap="SysDeptResult">
-		select * from sys_dept where find_in_set(#{deptId}, ancestors)
+		select * from sys_dept where find_in_set(#{id}, ancestors)
 	</select>
 	
 	<select id="selectNormalChildrenDeptById" parameterType="Long" resultType="java.lang.Integer">
-		select count(*) from sys_dept where status = 0 and del_flag = '0' and find_in_set(#{deptId}, ancestors)
+		select count(*) from sys_dept where status = 0 and del_flag = '0' and find_in_set(#{id}, ancestors)
 	</select>
 	
 	<select id="checkDeptNameUnique" resultMap="SysDeptResult">
@@ -84,7 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <insert id="insertDept" parameterType="SysDept">
  		insert into sys_dept(
- 			<if test="deptId != null and deptId != 0">dept_id,</if>
+ 			<if test="id != null and id != 0">id,</if>
  			<if test="parentId != null and parentId != 0">parent_id,</if>
  			<if test="deptName != null and deptName != ''">dept_name,</if>
  			<if test="ancestors != null and ancestors != ''">ancestors,</if>
@@ -96,7 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="createBy != null and createBy != ''">create_by,</if>
  			create_time
  		)values(
- 			<if test="deptId != null and deptId != 0">#{deptId},</if>
+ 			<if test="id != null and id != 0">#{id},</if>
  			<if test="parentId != null and parentId != 0">#{parentId},</if>
  			<if test="deptName != null and deptName != ''">#{deptName},</if>
  			<if test="ancestors != null and ancestors != ''">#{ancestors},</if>
@@ -124,19 +124,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
  			update_time = sysdate()
  		</set>
- 		where dept_id = #{deptId}
+ 		where id = #{id}
 	</update>
 	
 	<update id="updateDeptChildren" parameterType="java.util.List">
 	    update sys_dept set ancestors =
 	    <foreach collection="depts" item="item" index="index"
-	        separator=" " open="case dept_id" close="end">
-	        when #{item.deptId} then #{item.ancestors}
+	        separator=" " open="case id" close="end">
+	        when #{item.id} then #{item.ancestors}
 	    </foreach>
-	    where dept_id in
+	    where id in
 	    <foreach collection="depts" item="item" index="index"
 	        separator="," open="(" close=")">
-	        #{item.deptId}
+	        #{item.id}
 	    </foreach>
 	</update>
 	 
@@ -147,11 +147,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  	        <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
  	        update_time = sysdate()
         </set>
- 	    where dept_id in (${ancestors})
+ 	    where id in (${ancestors})
 	</update>
 	
 	<delete id="deleteDeptById" parameterType="Long">
-		update sys_dept set del_flag = '2' where dept_id = #{deptId}
+		update sys_dept set del_flag = '2' where id = #{id}
 	</delete>
 
 </mapper> 

+ 10 - 10
boman-modules/boman-system/src/main/resources/mapper/system/SysDictDataMapper.xml

@@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.boman.system.mapper.SysDictDataMapper">
 	
 	<resultMap type="SysDictData" id="SysDictDataResult">
-		<id     property="dictCode"   column="dict_code"   />
+		<id     property="id"   column="id"   />
 		<result property="dictSort"   column="dict_sort"   />
 		<result property="dictLabel"  column="dict_label"  />
 		<result property="dictValue"  column="dict_value"  />
@@ -21,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</resultMap>
 	
 	<sql id="selectDictDataVo">
-        select dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, remark 
+        select id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, remark 
 		from sys_dict_data
     </sql>
 
@@ -46,28 +46,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		where status = '0' and dict_type = #{dictType} order by dict_sort asc
 	</select>
 	
-	<select id="selectDictLabel" resultType="String">
+	<select id="selectDictLabel" resultType="java.lang.String">
 		select dict_label from sys_dict_data
 		where dict_type = #{dictType} and dict_value = #{dictValue}
 	</select>
 	
 	<select id="selectDictDataById" parameterType="Long" resultMap="SysDictDataResult">
 		<include refid="selectDictDataVo"/>
-		where dict_code = #{dictCode}
+		where id = #{id}
 	</select>
 	
-	<select id="countDictDataByType" resultType="Integer">
+	<select id="countDictDataByType" resultType="java.lang.Integer">
 	    select count(1) from sys_dict_data where dict_type=#{dictType}  
 	</select>
 	
 	<delete id="deleteDictDataById" parameterType="Long">
- 		delete from sys_dict_data where dict_code = #{dictCode}
+ 		delete from sys_dict_data where id = #{id}
  	</delete>
  	
  	<delete id="deleteDictDataByIds" parameterType="Long">
- 		delete from sys_dict_data where dict_code in
- 		<foreach collection="array" item="dictCode" open="(" separator="," close=")">
- 			#{dictCode}
+ 		delete from sys_dict_data where id in
+ 		<foreach collection="array" item="id" open="(" separator="," close=")">
+ 			#{id}
         </foreach> 
  	</delete>
 	
@@ -86,7 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
  			update_time = sysdate()
  		</set>
- 		where dict_code = #{dictCode}
+ 		where id = #{id}
 	</update>
 	
 	<update id="updateDictDataType" parameterType="String">

+ 8 - 8
boman-modules/boman-system/src/main/resources/mapper/system/SysDictTypeMapper.xml

@@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.boman.system.mapper.SysDictTypeMapper">
 
 	<resultMap type="SysDictType" id="SysDictTypeResult">
-		<id     property="dictId"     column="dict_id"     />
+		<id     property="id"     column="id"     />
 		<result property="dictName"   column="dict_name"   />
 		<result property="dictType"   column="dict_type"   />
 		<result property="status"     column="status"      />
@@ -16,7 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</resultMap>
 	
 	<sql id="selectDictTypeVo">
-        select dict_id, dict_name, dict_type, status, create_by, create_time, remark 
+        select id, dict_name, dict_type, status, create_by, create_time, remark 
 		from sys_dict_type
     </sql>
 
@@ -47,7 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	
 	<select id="selectDictTypeById" parameterType="Long" resultMap="SysDictTypeResult">
 		<include refid="selectDictTypeVo"/>
-		where dict_id = #{dictId}
+		where id = #{id}
 	</select>
 	
 	<select id="selectDictTypeByType" parameterType="String" resultMap="SysDictTypeResult">
@@ -61,13 +61,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 	
 	<delete id="deleteDictTypeById" parameterType="Long">
- 		delete from sys_dict_type where dict_id = #{dictId}
+ 		delete from sys_dict_type where id = #{id}
  	</delete>
  	
  	<delete id="deleteDictTypeByIds" parameterType="Long">
- 		delete from sys_dict_type where dict_id in
- 		<foreach collection="array" item="dictId" open="(" separator="," close=")">
- 			#{dictId}
+ 		delete from sys_dict_type where id in
+ 		<foreach collection="array" item="id" open="(" separator="," close=")">
+ 			#{id}
         </foreach> 
  	</delete>
 
@@ -81,7 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
  			update_time = sysdate()
  		</set>
- 		where dict_id = #{dictId}
+ 		where id = #{id}
 	</update>
  	
  	<insert id="insertDictType" parameterType="SysDictType">

+ 6 - 6
boman-modules/boman-system/src/main/resources/mapper/system/SysLogininforMapper.xml

@@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.boman.system.mapper.SysLogininforMapper">
 
 	<resultMap type="SysLogininfor" id="SysLogininforResult">
-		<id     property="infoId"        column="info_id"           />
+		<id     property="id"        column="id"           />
 		<result property="userName"      column="user_name"         />
 		<result property="status"        column="status"            />
 		<result property="ipaddr"        column="ipaddr"            />
@@ -19,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</insert>
 	
 	<select id="selectLogininforList" parameterType="SysLogininfor" resultMap="SysLogininforResult">
-		select info_id, user_name, ipaddr, status, msg, access_time from sys_logininfor
+		select id, user_name, ipaddr, status, msg, access_time from sys_logininfor
 		<where>
 			<if test="ipaddr != null and ipaddr != ''">
 				AND ipaddr like concat('%', #{ipaddr}, '%')
@@ -37,13 +37,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 				and date_format(access_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
 			</if>
 		</where>
-		order by info_id desc
+		order by id desc
 	</select>
 	
 	<delete id="deleteLogininforByIds" parameterType="Long">
- 		delete from sys_logininfor where info_id in
- 		<foreach collection="array" item="infoId" open="(" separator="," close=")">
- 			#{infoId}
+ 		delete from sys_logininfor where id in
+ 		<foreach collection="array" item="id" open="(" separator="," close=")">
+ 			#{id}
         </foreach> 
  	</delete>
     

+ 29 - 29
boman-modules/boman-system/src/main/resources/mapper/system/SysMenuMapper.xml

@@ -5,7 +5,7 @@
 <mapper namespace="com.boman.system.mapper.SysMenuMapper">
 
 	<resultMap type="SysMenu" id="SysMenuResult">
-		<id     property="menuId"         column="menu_id"        />
+		<id     property="id"         column="id"        />
 		<result property="menuName"       column="menu_name"      />
 		<result property="parentName"     column="parent_name"    />
 		<result property="parentId"       column="parent_id"      />
@@ -27,7 +27,7 @@
 	</resultMap>
 
 	<sql id="selectMenuVo">
-        select menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, ifnull(perms,'') as perms, icon, create_time 
+        select id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, ifnull(perms,'') as perms, icon, create_time 
 		from sys_menu
     </sql>
     
@@ -48,17 +48,17 @@
 	</select>
 	
 	<select id="selectMenuTreeAll" resultMap="SysMenuResult">
-		select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
+		select distinct m.id, m.parent_id, m.menu_name, m.path, m.component, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
 		from sys_menu m where m.menu_type in ('M', 'C') and m.status = 0
 		order by m.parent_id, m.order_num
 	</select>
 	
 	<select id="selectMenuListByUserId" parameterType="SysMenu" resultMap="SysMenuResult">
-		select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
+		select distinct m.id, m.parent_id, m.menu_name, m.path, m.component, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
 		from sys_menu m
-		left join sys_role_menu rm on m.menu_id = rm.menu_id
+		left join sys_role_menu rm on m.id = rm.menu_id
 		left join sys_user_role ur on rm.role_id = ur.role_id
-		left join sys_role ro on ur.role_id = ro.role_id
+		left join sys_role ro on ur.role_id = ro.id
 		where ur.user_id = #{params.userId}
 		<if test="menuName != null and menuName != ''">
             AND menu_name like concat('%', #{menuName}, '%')
@@ -72,51 +72,51 @@
 		order by m.parent_id, m.order_num
 	</select>
     
-    <select id="selectMenuTreeByUserId" parameterType="Long" resultMap="SysMenuResult">
-		select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
+    <select id="selectMenuTreeById" parameterType="Long" resultMap="SysMenuResult">
+		select distinct m.id, m.parent_id, m.menu_name, m.path, m.component, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
 		from sys_menu m
-			 left join sys_role_menu rm on m.menu_id = rm.menu_id
+			 left join sys_role_menu rm on m.id = rm.menu_id
 			 left join sys_user_role ur on rm.role_id = ur.role_id
-			 left join sys_role ro on ur.role_id = ro.role_id
-			 left join sys_user u on ur.user_id = u.user_id
-		where u.user_id = #{userId} and m.menu_type in ('M', 'C') and m.status = 0  AND ro.status = 0
+			 left join sys_role ro on ur.role_id = ro.id
+			 left join sys_user u on ur.user_id = u.id
+		where u.id = #id} and m.menu_type in ('M', 'C') and m.status = 0  AND ro.status = 0
 		order by m.parent_id, m.order_num
 	</select>
 	
-	<select id="selectMenuListByRoleId" resultType="Integer">
-		select m.menu_id
+	<select id="selectMenuListByRoleId" resultType="java.lang.Integer">
+		select m.id
 		from sys_menu m
-            left join sys_role_menu rm on m.menu_id = rm.menu_id
+            left join sys_role_menu rm on m.id = rm.menu_id
         where rm.role_id = #{roleId}
             <if test="menuCheckStrictly">
-              and m.menu_id not in (select m.parent_id from sys_menu m inner join sys_role_menu rm on m.menu_id = rm.menu_id and rm.role_id = #{roleId})
+              and m.id not in (select m.parent_id from sys_menu m inner join sys_role_menu rm on m.id = rm.menu_id and rm.role_id = #{roleId})
             </if>
 		order by m.parent_id, m.order_num
 	</select>
 	
-	<select id="selectMenuPerms" resultType="String">
+	<select id="selectMenuPerms" resultType="java.lang.String">
 		select distinct m.perms
 		from sys_menu m
-			 left join sys_role_menu rm on m.menu_id = rm.menu_id
+			 left join sys_role_menu rm on m.id = rm.menu_id
 			 left join sys_user_role ur on rm.role_id = ur.role_id
 	</select>
 
-	<select id="selectMenuPermsByUserId" parameterType="Long" resultType="String">
+	<select id="selectMenuPermsById" parameterType="Long" resultType="java.lang.String">
 		select distinct m.perms
 		from sys_menu m
-			 left join sys_role_menu rm on m.menu_id = rm.menu_id
+			 left join sys_role_menu rm on m.id = rm.menu_id
 			 left join sys_user_role ur on rm.role_id = ur.role_id
-			 left join sys_role r on r.role_id = ur.role_id
-		where m.status = '0' and r.status = '0' and ur.user_id = #{userId}
+			 left join sys_role r on r.id = ur.role_id
+		where m.status = '0' and r.status = '0' and ur.user_id = #{id}
 	</select>
 	
 	<select id="selectMenuById" parameterType="Long" resultMap="SysMenuResult">
 		<include refid="selectMenuVo"/>
-		where menu_id = #{menuId}
+		where id = #{id}
 	</select>
 	
-	<select id="hasChildByMenuId" resultType="Integer">
-	    select count(1) from sys_menu where parent_id = #{menuId}  
+	<select id="hasChildById" resultType="java.lang.Integer">
+	    select count(1) from sys_menu where parent_id = #{id}  
 	</select>
 	
 	<select id="checkMenuNameUnique" parameterType="SysMenu" resultMap="SysMenuResult">
@@ -143,12 +143,12 @@
 			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
 			update_time = sysdate()
 		</set>
-		where menu_id = #{menuId}
+		where id = #{id}
 	</update>
 
 	<insert id="insertMenu" parameterType="SysMenu">
 		insert into sys_menu(
-		<if test="menuId != null and menuId != 0">menu_id,</if>
+		<if test="id != null and id != 0">id,</if>
 		<if test="parentId != null and parentId != 0">parent_id,</if>
 		<if test="menuName != null and menuName != ''">menu_name,</if>
 		<if test="orderNum != null and orderNum != ''">order_num,</if>
@@ -165,7 +165,7 @@
 		<if test="createBy != null and createBy != ''">create_by,</if>
 		create_time
 		)values(
-		<if test="menuId != null and menuId != 0">#{menuId},</if>
+		<if test="id != null and id != 0">#{id},</if>
 		<if test="parentId != null and parentId != 0">#{parentId},</if>
 		<if test="menuName != null and menuName != ''">#{menuName},</if>
 		<if test="orderNum != null and orderNum != ''">#{orderNum},</if>
@@ -185,7 +185,7 @@
 	</insert>
 	
 	<delete id="deleteMenuById" parameterType="Long">
-	    delete from sys_menu where menu_id = #{menuId}
+	    delete from sys_menu where id = #{id}
 	</delete>
 
 </mapper> 

+ 8 - 8
boman-modules/boman-system/src/main/resources/mapper/system/SysNoticeMapper.xml

@@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.boman.system.mapper.SysNoticeMapper">
     
     <resultMap type="SysNotice" id="SysNoticeResult">
-        <result property="noticeId"       column="notice_id"       />
+        <result property="id"       column="id"       />
         <result property="noticeTitle"    column="notice_title"    />
         <result property="noticeType"     column="notice_type"     />
         <result property="noticeContent"  column="notice_content"  />
@@ -18,13 +18,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
     
     <sql id="selectNoticeVo">
-        select notice_id, notice_title, notice_type, cast(notice_content as char) as notice_content, status, create_by, create_time, update_by, update_time, remark 
+        select id, notice_title, notice_type, cast(notice_content as char) as notice_content, status, create_by, create_time, update_by, update_time, remark 
 		from sys_notice
     </sql>
     
     <select id="selectNoticeById" parameterType="Long" resultMap="SysNoticeResult">
         <include refid="selectNoticeVo"/>
-        where notice_id = #{noticeId}
+        where id = #{id}
     </select>
     
     <select id="selectNoticeList" parameterType="SysNotice" resultMap="SysNoticeResult">
@@ -72,17 +72,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
  			update_time = sysdate()
         </set>
-        where notice_id = #{noticeId}
+        where id = #{id}
     </update>
 	
     <delete id="deleteNoticeById" parameterType="Long">
-        delete from sys_notice where notice_id = #{noticeId}
+        delete from sys_notice where id = #{id}
     </delete>
     
     <delete id="deleteNoticeByIds" parameterType="Long">
-        delete from sys_notice where notice_id in 
-        <foreach item="noticeId" collection="array" open="(" separator="," close=")">
-            #{noticeId}
+        delete from sys_notice where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
         </foreach>
     </delete>
     

+ 7 - 7
boman-modules/boman-system/src/main/resources/mapper/system/SysOperLogMapper.xml

@@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.boman.system.mapper.SysOperLogMapper">
 
 	<resultMap type="SysOperLog" id="SysOperLogResult">
-		<id     property="operId"         column="oper_id"        />
+		<id     property="id"         column="id"        />
 		<result property="title"          column="title"          />
 		<result property="businessType"   column="business_type"  />
 		<result property="method"         column="method"         />
@@ -23,7 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</resultMap>
 
 	<sql id="selectOperLogVo">
-        select oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_param, json_result, status, error_msg, oper_time
+        select id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_param, json_result, status, error_msg, oper_time
         from sys_oper_log
     </sql>
     
@@ -60,19 +60,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 				and date_format(oper_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
 			</if>
 		</where>
-		order by oper_id desc
+		order by id desc
 	</select>
 	
 	<delete id="deleteOperLogByIds" parameterType="Long">
- 		delete from sys_oper_log where oper_id in
- 		<foreach collection="array" item="operId" open="(" separator="," close=")">
- 			#{operId}
+ 		delete from sys_oper_log where id in
+ 		<foreach collection="array" item="id" open="(" separator="," close=")">
+ 			#{id}
         </foreach> 
  	</delete>
  	
  	<select id="selectOperLogById" parameterType="Long" resultMap="SysOperLogResult">
 		<include refid="selectOperLogVo"/>
-		where oper_id = #{operId}
+		where id = #{id}
 	</select>
 	
 	<update id="cleanOperLog">

+ 22 - 22
boman-modules/boman-system/src/main/resources/mapper/system/SysPostMapper.xml

@@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.boman.system.mapper.SysPostMapper">
 
 	<resultMap type="SysPost" id="SysPostResult">
-		<id     property="postId"        column="post_id"       />
+		<id     property="id"        column="id"       />
 		<result property="postCode"      column="post_code"     />
 		<result property="postName"      column="post_name"     />
 		<result property="postSort"      column="post_sort"     />
@@ -18,7 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</resultMap>
 	
 	<sql id="selectPostVo">
-        select post_id, post_code, post_name, post_sort, status, create_by, create_time, remark 
+        select id, post_code, post_name, post_sort, status, create_by, create_time, remark 
 		from sys_post
     </sql>
 	
@@ -43,22 +43,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	
 	<select id="selectPostById" parameterType="Long" resultMap="SysPostResult">
 		<include refid="selectPostVo"/>
-		where post_id = #{postId}
+		where id = #{id}
 	</select>
 	
-	<select id="selectPostListByUserId" parameterType="Long" resultType="Integer">
-		select p.post_id
+	<select id="selectPostListById" parameterType="Long" resultType="java.lang.Integer">
+		select p.id
         from sys_post p
-	        left join sys_user_post up on up.post_id = p.post_id
-	        left join sys_user u on u.user_id = up.user_id
-	    where u.user_id = #{userId}
+	        left join sys_user_post up on up.post_id = p.id
+	        left join sys_user u on u.id = up.user_id
+	    where u.id = #{id}
 	</select>
 	
 	<select id="selectPostsByUserName" parameterType="String" resultMap="SysPostResult">
-		select p.post_id, p.post_name, p.post_code
+		select p.id, p.post_name, p.post_code
 		from sys_post p
-			 left join sys_user_post up on up.post_id = p.post_id
-			 left join sys_user u on u.user_id = up.user_id
+			 left join sys_user_post up on up.post_id = p.id
+			 left join sys_user u on u.id = up.user_id
 		where u.user_name = #{userName}
 	</select>
 	
@@ -83,12 +83,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
  			update_time = sysdate()
  		</set>
- 		where post_id = #{postId}
+ 		where id = #{id}
 	</update>
  	
- 	<insert id="insertPost" parameterType="SysPost" useGeneratedKeys="true" keyProperty="postId">
+ 	<insert id="insertPost" parameterType="SysPost" useGeneratedKeys="true" keyProperty="id">
  		insert into sys_post(
- 			<if test="postId != null and postId != 0">post_id,</if>
+ 			<if test="id != null and id != 0">id,</if>
  			<if test="postCode != null and postCode != ''">post_code,</if>
  			<if test="postName != null and postName != ''">post_name,</if>
  			<if test="postSort != null and postSort != ''">post_sort,</if>
@@ -97,7 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="createBy != null and createBy != ''">create_by,</if>
  			create_time
  		)values(
- 			<if test="postId != null and postId != 0">#{postId},</if>
+ 			<if test="id != null and id != 0">#{id},</if>
  			<if test="postCode != null and postCode != ''">#{postCode},</if>
  			<if test="postName != null and postName != ''">#{postName},</if>
  			<if test="postSort != null and postSort != ''">#{postSort},</if>
@@ -108,9 +108,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  		)
 	</insert>
 
-	<insert id="insert" parameterType="SysPost" useGeneratedKeys="true" keyProperty="postId">
+	<insert id="insert" parameterType="SysPost" useGeneratedKeys="true" keyProperty="id">
 		insert into sys_post(
-		<if test="postId != null and postId != 0">post_id,</if>
+		<if test="id != null and id != 0">id,</if>
 		<if test="postCode != null and postCode != ''">post_code,</if>
 		<if test="postName != null and postName != ''">post_name,</if>
 		<if test="postSort != null and postSort != ''">post_sort,</if>
@@ -119,7 +119,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="createBy != null and createBy != ''">create_by,</if>
 		create_time
 		)values(
-		<if test="postId != null and postId != 0">#{postId},</if>
+		<if test="id != null and id != 0">#{id},</if>
 		<if test="postCode != null and postCode != ''">#{postCode},</if>
 		<if test="postName != null and postName != ''">#{postName},</if>
 		<if test="postSort != null and postSort != ''">#{postSort},</if>
@@ -131,13 +131,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</insert>
 	
 	<delete id="deletePostById" parameterType="Long">
-		delete from sys_post where post_id = #{postId}
+		delete from sys_post where id = #{id}
 	</delete>
 	
 	<delete id="deletePostByIds" parameterType="Long">
- 		delete from sys_post where post_id in
- 		<foreach collection="array" item="postId" open="(" separator="," close=")">
- 			#{postId}
+ 		delete from sys_post where id in
+ 		<foreach collection="array" item="id" open="(" separator="," close=")">
+ 			#{id}
         </foreach> 
  	</delete>
 

+ 22 - 22
boman-modules/boman-system/src/main/resources/mapper/system/SysRoleMapper.xml

@@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.boman.system.mapper.SysRoleMapper">
 
 	<resultMap type="SysRole" id="SysRoleResult">
-		<id     property="roleId"             column="role_id"               />
+		<id     property="id"             column="id"               />
 		<result property="roleName"           column="role_name"             />
 		<result property="roleKey"            column="role_key"              />
 		<result property="roleSort"           column="role_sort"             />
@@ -22,12 +22,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</resultMap>
 	
 	<sql id="selectRoleVo">
-	    select distinct r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.menu_check_strictly, r.dept_check_strictly,
+	    select distinct r.id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.menu_check_strictly, r.dept_check_strictly,
             r.status, r.del_flag, r.create_time, r.remark 
         from sys_role r
-	        left join sys_user_role ur on ur.role_id = r.role_id
-	        left join sys_user u on u.user_id = ur.user_id
-	        left join sys_dept d on u.dept_id = d.dept_id
+	        left join sys_user_role ur on ur.role_id = r.id
+	        left join sys_user u on u.id = ur.user_id
+	        left join sys_dept d on u.dept_id = d.id
     </sql>
     
     <select id="selectRoleList" parameterType="SysRole" resultMap="SysRoleResult">
@@ -53,26 +53,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		order by r.role_sort
 	</select>
     
-	<select id="selectRolePermissionByUserId" parameterType="Long" resultMap="SysRoleResult">
+	<select id="selectRolePermissionById" parameterType="Long" resultMap="SysRoleResult">
 		<include refid="selectRoleVo"/>
-		WHERE r.del_flag = '0' and ur.user_id = #{userId}
+		WHERE r.del_flag = '0' and ur.user_id = #{id}
 	</select>
 	
 	<select id="selectRoleAll" resultMap="SysRoleResult">
 		<include refid="selectRoleVo"/>
 	</select>
 	
-	<select id="selectRoleListByUserId" parameterType="Long" resultType="Integer">
-		select r.role_id
+	<select id="selectRoleListById" parameterType="Long" resultType="java.lang.Integer">
+		select r.id
         from sys_role r
-	        left join sys_user_role ur on ur.role_id = r.role_id
-	        left join sys_user u on u.user_id = ur.user_id
-	    where u.user_id = #{userId}
+	        left join sys_user_role ur on ur.role_id = r.id
+	        left join sys_user u on u.id = ur.user_id
+	    where u.id = #{id}
 	</select>
 	
 	<select id="selectRoleById" parameterType="Long" resultMap="SysRoleResult">
 		<include refid="selectRoleVo"/>
-		where r.role_id = #{roleId}
+		where r.id = #{id}
 	</select>
 	
 	<select id="selectRolesByUserName" parameterType="String" resultMap="SysRoleResult">
@@ -90,9 +90,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		 where r.role_key=#{roleKey} limit 1
 	</select>
 	
- 	<insert id="insertRole" parameterType="SysRole" useGeneratedKeys="true" keyProperty="roleId">
+ 	<insert id="insertRole" parameterType="SysRole" useGeneratedKeys="true" keyProperty="id">
  		insert into sys_role(
- 			<if test="roleId != null and roleId != 0">role_id,</if>
+ 			<if test="id != null and id != 0">id,</if>
  			<if test="roleName != null and roleName != ''">role_name,</if>
  			<if test="roleKey != null and roleKey != ''">role_key,</if>
  			<if test="roleSort != null and roleSort != ''">role_sort,</if>
@@ -104,7 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="createBy != null and createBy != ''">create_by,</if>
  			create_time
  		)values(
- 			<if test="roleId != null and roleId != 0">#{roleId},</if>
+ 			<if test="id != null and id != 0">#{id},</if>
  			<if test="roleName != null and roleName != ''">#{roleName},</if>
  			<if test="roleKey != null and roleKey != ''">#{roleKey},</if>
  			<if test="roleSort != null and roleSort != ''">#{roleSort},</if>
@@ -132,21 +132,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
  			update_time = sysdate()
  		</set>
- 		where role_id = #{roleId}
+ 		where id = #{id}
 	</update>
 	
 	<update id="updateRoleStatus" parameterType="SysRole">
- 		update sys_user set status = #{status} where user_id = #{userId}
+ 		update sys_user set status = #{status} where id = #{id}
 	</update>
 	
 	<delete id="deleteRoleById" parameterType="Long">
- 		delete from sys_role where role_id = #{roleId}
+ 		delete from sys_role where id = #{id}
  	</delete>
  	
  	<delete id="deleteRoleByIds" parameterType="Long">
- 	    update sys_role set del_flag = '2' where role_id in
- 		<foreach collection="array" item="roleId" open="(" separator="," close=")">
- 			#{roleId}
+ 	    update sys_role set del_flag = '2' where id in
+ 		<foreach collection="array" item="id" open="(" separator="," close=")">
+ 			#{id}
         </foreach> 
  	</delete>
  	

+ 1 - 1
boman-modules/boman-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml

@@ -9,7 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="menuId"     column="menu_id"      />
 	</resultMap>
 	
-	<select id="checkMenuExistRole" resultType="Integer">
+	<select id="checkMenuExistRole" resultType="java.lang.Integer">
 	    select count(1) from sys_role_menu where menu_id = #{menuId}
 	</select>
 

+ 22 - 24
boman-modules/boman-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.boman.system.mapper.SysUserMapper">
 
 	<resultMap type="SysUser" id="SysUserResult">
-		<id     property="userId"       column="user_id"      />
+		<id     property="id"       column="id"      />
 		<result property="deptId"       column="dept_id"      />
 		<result property="userName"     column="user_name"    />
 		<result property="nickName"     column="nick_name"    />
@@ -28,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</resultMap>
 	
 	<resultMap id="deptResult" type="SysDept">
-		<id     property="deptId"   column="dept_id"     />
+		<id     property="id"   column="id"     />
 		<result property="parentId" column="parent_id"   />
 		<result property="deptName" column="dept_name"   />
 		<result property="orderNum" column="order_num"   />
@@ -37,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</resultMap>
 	
 	<resultMap id="RoleResult" type="SysRole">
-		<id     property="roleId"       column="role_id"        />
+		<id     property="id"       column="id"        />
 		<result property="roleName"     column="role_name"      />
 		<result property="roleKey"      column="role_key"       />
 		<result property="roleSort"     column="role_sort"      />
@@ -46,18 +46,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</resultMap>
 	
 	<sql id="selectUserVo">
-        select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, 
-        d.dept_id, d.parent_id, d.dept_name, d.order_num, d.leader, d.status as dept_status,
-        r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
+        select u.id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, 
+        d.id, d.parent_id, d.dept_name, d.order_num, d.leader, d.status as dept_status,
+        r.id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
         from sys_user u
-		    left join sys_dept d on u.dept_id = d.dept_id
-		    left join sys_user_role ur on u.user_id = ur.user_id
-		    left join sys_role r on r.role_id = ur.role_id
+		    left join sys_dept d on u.dept_id = d.id
+		    left join sys_user_role ur on u.id = ur.user_id
+		    left join sys_role r on r.id = ur.role_id
     </sql>
     
     <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
-		select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
-		left join sys_dept d on u.dept_id = d.dept_id
+		select u.id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
+		left join sys_dept d on u.dept_id = d.id
 		where u.del_flag = '0'
 		<if test="userName != null and userName != ''">
 			AND u.user_name like concat('%', #{userName}, '%')
@@ -75,7 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			AND date_format(u.create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
 		</if>
 		<if test="deptId != null and deptId != 0">
-			AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, ancestors) ))
+			AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.id FROM sys_dept t WHERE find_in_set(#{deptId}, ancestors) ))
 		</if>
 		<!-- 数据范围过滤 -->
 		${params.dataScope}
@@ -88,7 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	
 	<select id="selectUserById" parameterType="Long" resultMap="SysUserResult">
 		<include refid="selectUserVo"/>
-		where u.user_id = #{userId}
+		where u.id = #{id}
 	</select>
 	
 	<select id="checkUserNameUnique" parameterType="String" resultType="int">
@@ -96,16 +96,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 	
 	<select id="checkPhoneUnique" parameterType="String" resultMap="SysUserResult">
-		select user_id, phonenumber from sys_user where phonenumber = #{phonenumber} limit 1
+		select id, phonenumber from sys_user where phonenumber = #{phonenumber} limit 1
 	</select>
 	
 	<select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult">
-		select user_id, email from sys_user where email = #{email} limit 1
+		select id, email from sys_user where email = #{email} limit 1
 	</select>
 	
-	<insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">
+	<insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="id">
  		insert into sys_user(
- 			<if test="userId != null and userId != 0">user_id,</if>
  			<if test="deptId != null and deptId != 0">dept_id,</if>
  			<if test="userName != null and userName != ''">user_name,</if>
  			<if test="nickName != null and nickName != ''">nick_name,</if>
@@ -119,7 +118,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="remark != null and remark != ''">remark,</if>
  			create_time
  		)values(
- 			<if test="userId != null and userId != ''">#{userId},</if>
  			<if test="deptId != null and deptId != ''">#{deptId},</if>
  			<if test="userName != null and userName != ''">#{userName},</if>
  			<if test="nickName != null and nickName != ''">#{nickName},</if>
@@ -153,11 +151,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="remark != null">remark = #{remark},</if>
  			update_time = sysdate()
  		</set>
- 		where user_id = #{userId}
+ 		where id = #{id}
 	</update>
 	
 	<update id="updateUserStatus" parameterType="SysUser">
- 		update sys_user set status = #{status} where user_id = #{userId}
+ 		update sys_user set status = #{status} where id = #{id}
 	</update>
 	
 	<update id="updateUserAvatar" parameterType="SysUser">
@@ -169,13 +167,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</update>
 	
 	<delete id="deleteUserById" parameterType="Long">
- 		delete from sys_user where user_id = #{userId}
+ 		delete from sys_user where id = #{id}
  	</delete>
  	
  	<delete id="deleteUserByIds" parameterType="Long">
- 		update sys_user set del_flag = '2' where user_id in
- 		<foreach collection="array" item="userId" open="(" separator="," close=")">
- 			#{userId}
+ 		update sys_user set del_flag = '2' where id in
+ 		<foreach collection="array" item="id" open="(" separator="," close=")">
+ 			#{id}
         </foreach> 
  	</delete>
 	

+ 1 - 1
boman-modules/boman-system/src/main/resources/mapper/system/SysUserPostMapper.xml

@@ -13,7 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		delete from sys_user_post where user_id=#{userId}
 	</delete>
 	
-	<select id="countUserPostById" resultType="Integer">
+	<select id="countUserPostById" resultType="java.lang.Integer">
 	    select count(1) from sys_user_post where post_id=#{postId}  
 	</select>
 	

+ 10 - 10
boman-modules/boman-system/src/main/resources/mapper/system/SysUserRoleMapper.xml

@@ -12,32 +12,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<delete id="deleteUserRoleByUserId" parameterType="Long">
 		delete from sys_user_role where user_id=#{userId}
 	</delete>
-	
-	<select id="countUserRoleByRoleId" resultType="Integer">
-	    select count(1) from sys_user_role where role_id=#{roleId}  
+
+	<select id="countUserRoleByRoleId" resultType="java.lang.Integer">
+	    select count(1) from sys_user_role where role_id=#{roleId}
 	</select>
-	
+
 	<delete id="deleteUserRole" parameterType="Long">
  		delete from sys_user_role where user_id in
  		<foreach collection="array" item="userId" open="(" separator="," close=")">
  			#{userId}
-        </foreach> 
+        </foreach>
  	</delete>
-	
+
 	<insert id="batchUserRole">
 		insert into sys_user_role(user_id, role_id) values
 		<foreach item="item" index="index" collection="list" separator=",">
 			(#{item.userId},#{item.roleId})
 		</foreach>
 	</insert>
-	
+
 	<delete id="deleteUserRoleInfo" parameterType="SysUserRole">
 		delete from sys_user_role where user_id=#{userId} and role_id=#{roleId}
 	</delete>
-	
+
 	<delete id="deleteUserRoleInfos">
-	    delete from sys_user_role where role_id=#{roleId} and user_id in
- 	    <foreach collection="userIds" item="userId" open="(" separator="," close=")">
+	    delete from sys_user_role where role_id=#{id} and user_id in
+ 	    <foreach collection="ids" item="userId" open="(" separator="," close=")">
  	        #{userId}
             </foreach> 
 	</delete>

Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä