feat:角色增删改

project-interface/src/main/java/com/dituhui/pea/common/Result.java

@@ -16,6 +16,8 @@
 
 
 package com.dituhui.pea.common;
 package com.dituhui.pea.common;
 
 
+import com.dituhui.pea.enums.StatusCodeEnum;
+
 /**
 /**
  * @author TrevorLink
  * @author TrevorLink
  */
  */
@@ -52,6 +54,14 @@ public class Result<T> {
         return new Result<>(errorResult.getCode(), errorResult.getMessage(), null);
         return new Result<>(errorResult.getCode(), errorResult.getMessage(), null);
     }
     }
 
 
+    public static <T> Result<T> failed(T result) {
+        return new Result<>(ResultEnum.COMMON_FAILED.getCode(), ResultEnum.COMMON_FAILED.getMessage(), result);
+    }
+
+    public static <T> Result<T> failed(StatusCodeEnum resultEnum, T result) {
+        return new Result<>(resultEnum.getCode(), resultEnum.getDesc(), result);
+    }
+
     public Result() {
     public Result() {
     }
     }
 
 

project-interface/src/main/java/com/dituhui/pea/pojo/RoleInfo.java

@@ -32,9 +32,14 @@ public class RoleInfo {
     private String groupId;
     private String groupId;
 
 
     /**
     /**
+     * 备注
+     */
+    private String notes;
+
+    /**
      * 角色自定义条件
      * 角色自定义条件
      */
      */
-    @NotBlank(message = "角色条件不能为空!")
+    // @NotBlank(message = "角色条件不能为空!")
     private String extra;
     private String extra;
 
 
     /**
     /**
@@ -50,4 +55,12 @@ public class RoleInfo {
     private Date updatedTime;
     private Date updatedTime;
 
 
     private List<RoleResourceInfo> resourceInfos;
     private List<RoleResourceInfo> resourceInfos;
+    /**
+     * 创建人
+     */
+    private String createdBy;
+    /**
+     * 更新人
+     */
+    private String updatedBy;
 }
 }

project-interface/src/main/java/com/dituhui/pea/user/IRole.java

@@ -27,7 +27,7 @@ public interface IRole {
      * @return
      * @return
      */
      */
     @RequestMapping(value = "/pea-user/role/add", method = RequestMethod.POST)
     @RequestMapping(value = "/pea-user/role/add", method = RequestMethod.POST)
-    WebResult<RoleInfo> addRole(@RequestBody RoleInfo roleInfo);
+    Result<RoleInfo> addRole(@RequestBody RoleInfo roleInfo);
 
 
 
 
     /**
     /**
@@ -37,7 +37,7 @@ public interface IRole {
      * @return
      * @return
      */
      */
     @RequestMapping(value = "/pea-user/role/update", method = RequestMethod.POST)
     @RequestMapping(value = "/pea-user/role/update", method = RequestMethod.POST)
-    WebResult<RoleInfo> updateRole(@RequestBody RoleInfo roleInfo);
+    Result<RoleInfo> updateRole(@RequestBody RoleInfo roleInfo);
 
 
     /**
     /**
      * 删除角色
      * 删除角色
@@ -46,7 +46,7 @@ public interface IRole {
      * @return
      * @return
      */
      */
     @RequestMapping(value = "/pea-user/role/delete", method = RequestMethod.POST)
     @RequestMapping(value = "/pea-user/role/delete", method = RequestMethod.POST)
-    WebResult<Boolean> deleteRole(@RequestParam("id") String roleId);
+    Result<Boolean> deleteRole(@RequestParam("id") String roleId);
 
 
     /**
     /**
      * 添加用户角色
      * 添加用户角色

project-user/src/main/java/com/dituhui/pea/user/controller/RoleController.java

@@ -33,25 +33,25 @@ public class RoleController implements IRole {
     RoleService roleService;
     RoleService roleService;
 
 
     @Override
     @Override
-    public WebResult<RoleInfo> addRole(@Validated RoleInfo roleInfo) {
+    public Result<RoleInfo> addRole(@Validated RoleInfo roleInfo) {
         roleInfo = roleService.addRole(roleInfo);
         roleInfo = roleService.addRole(roleInfo);
-        return WebResult.ok(roleInfo);
+        return Result.success(roleInfo);
     }
     }
 
 
 
 
     @Override
     @Override
-    public WebResult<RoleInfo> updateRole(@Validated RoleInfo roleInfo) {
+    public Result<RoleInfo> updateRole(@Validated RoleInfo roleInfo) {
         roleInfo = roleService.updateRole(roleInfo);
         roleInfo = roleService.updateRole(roleInfo);
-        return WebResult.ok(roleInfo);
+        return Result.success(roleInfo);
     }
     }
 
 
     @Override
     @Override
-    public WebResult<Boolean> deleteRole(String roleId) {
+    public Result<Boolean> deleteRole(String roleId) {
         if (StringUtils.isBlank(roleId)) {
         if (StringUtils.isBlank(roleId)) {
-            return WebResult.failed(StatusCodeEnum.COMMON_PARAM_EMPTY);
+            return Result.failed(StatusCodeEnum.COMMON_PARAM_EMPTY, false);
         }
         }
         roleService.deleteRole(roleId);
         roleService.deleteRole(roleId);
-        return WebResult.ok();
+        return Result.success(true);
     }
     }
 
 
     @Override
     @Override

project-user/src/main/java/com/dituhui/pea/user/entity/RoleEntity.java

@@ -69,4 +69,9 @@ public class RoleEntity implements Serializable {
     @LastModifiedDate
     @LastModifiedDate
     private Date updatedTime;
     private Date updatedTime;
 
 
+    /**
+     * 备注
+     */
+    private String notes;
+
 }
 }

project-user/src/main/java/com/dituhui/pea/user/service/RoleService.java

@@ -84,9 +84,9 @@ public class RoleService {
         roleEntity = roleDao.save(roleEntity);
         roleEntity = roleDao.save(roleEntity);
         List<RoleResourceInfo> resourceInfos = roleInfo.getResourceInfos();
         List<RoleResourceInfo> resourceInfos = roleInfo.getResourceInfos();
         if (CollectionUtils.isNotEmpty(resourceInfos)) {
         if (CollectionUtils.isNotEmpty(resourceInfos)) {
-            for (RoleResourceInfo resourceInfo : resourceInfos) {
             // 先清除
             // 先清除
             roleResourceDao.deleteByRoleId(roleEntity.getId());
             roleResourceDao.deleteByRoleId(roleEntity.getId());
+            for (RoleResourceInfo resourceInfo : resourceInfos) {
                 RoleResourceEntity roleResourceEntity = assembleRoleResource(roleEntity.getId(), resourceInfo.getResourceId());
                 RoleResourceEntity roleResourceEntity = assembleRoleResource(roleEntity.getId(), resourceInfo.getResourceId());
                 roleResourceDao.save(roleResourceEntity);
                 roleResourceDao.save(roleResourceEntity);
             }
             }