新增管理员

gic-platform-auth-api/src/main/java/com/gic/auth/dto/UserDTO.java

@@ -105,6 +105,16 @@ public class UserDTO implements UserInfo,Serializable{
      * 登陆账号类型 1:运营 0:默认GIC
      */
     private Integer loginType;
+    /**
+     * 用户角色，可以多选，用英文逗号隔开
+     */
+    @NotBlank(message = "用户角色不能为空", groups = {SaveUserValid.class, EditUserValid.class, UserQoValid.class})
+    private String userRoleIds;
+    /**
+     * 用户资源组授权，可以多选，用英文逗号隔开
+     */
+    @NotBlank(message = "用户资源组不能为空", groups = {SaveUserValid.class, EditUserValid.class, UserQoValid.class})
+    private String userResourceIds;
 
     public Integer getUserId() {
         return userId;
@@ -217,4 +227,20 @@ public class UserDTO implements UserInfo,Serializable{
     public void setLoginType(Integer loginType) {
         this.loginType = loginType;
     }
+
+    public String getUserRoleIds() {
+        return userRoleIds;
+    }
+
+    public void setUserRoleIds(String userRoleIds) {
+        this.userRoleIds = userRoleIds;
+    }
+
+    public String getUserResourceIds() {
+        return userResourceIds;
+    }
+
+    public void setUserResourceIds(String userResourceIds) {
+        this.userResourceIds = userResourceIds;
+    }
 }

gic-platform-auth-api/src/main/java/com/gic/auth/dto/UserResourceDTO.java

@@ -3,6 +3,8 @@ package com.gic.auth.dto;
 import java.io.Serializable;
 import java.util.Date;
 
+import javax.validation.constraints.NotNull;
+
 /**
  * 用户资源组关联表
  * @ClassName: UserResourceDTO

@@ -13,6 +15,10 @@ import java.util.Date;
 public class UserResourceDTO implements Serializable{
     private static final long serialVersionUID = 5635155351382206941L;
 
+    public interface SaveUserResourceValid {
+    }
+
+
     /**
      * id
      */
@@ -21,16 +27,19 @@ public class UserResourceDTO implements Serializable{
     /**
      * 角色集id
      */
+    @NotNull(message = "资源不能为空", groups = {SaveUserResourceValid.class})
     private Integer resourceId;
 
     /**
      * 管理员ID
      */
+    @NotNull(message = "用户不能为空", groups = {SaveUserResourceValid.class})
     private Integer userId;
 
     /**
      * 企业ID
      */
+    @NotNull(message = "商户不能为空", groups = {SaveUserResourceValid.class})
     private Integer enterpriseId;
 
     /**

gic-platform-auth-api/src/main/java/com/gic/auth/service/UserApiService.java

@@ -25,6 +25,14 @@ public interface UserApiService {
      */
     ServiceResponse editUser(UserDTO userDTO);
 
+    /**
+     * 用户详情
+     * @Title: getUserById

+     * @Description:
+    
 * @author guojuxing
+     * @param userId

+     * @return  com.gic.api.base.commons.ServiceResponse<com.gic.auth.dto.UserDTO>

+    
 */
     ServiceResponse<UserDTO> getUserById(Integer userId);
 
     /**