Merge branch 'JCB-KF' of uskycloud/usky-cloud into master

base-modules/service-system/service-system-api/src/main/java/com/usky/system/RemoteUserService.java

@@ -2,6 +2,7 @@ package com.usky.system;
 
 
 import com.usky.common.core.bean.ApiResult;
+import com.usky.system.domain.SysUser;
 import com.usky.system.domain.SysUserVO;
 import com.usky.system.factory.RemoteUserFallbackFactory;
 import com.usky.system.model.LoginUser;
@@ -11,6 +12,8 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
+import java.util.List;
+
 /**
  * 用户服务
  * 
@@ -36,4 +39,11 @@ public interface RemoteUserService
      */
     @PostMapping("/user/register")
     public ApiResult<Boolean> registerUserInfo(@RequestBody SysUserVO sysUser);
+
+    /**
+     * 用户列表查询
+     * @return
+     */
+    @GetMapping("/user/userList")
+    public ApiResult<List<SysUser>> userList();
 }

base-modules/service-system/service-system-api/src/main/java/com/usky/system/domain/SysUser.java

@@ -0,0 +1,323 @@
+package com.usky.system.domain;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.usky.common.core.bean.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
+
+
+/**
+ * 用户对象 sys_user
+ *
+ * @author yq
+ */
+public class SysUser extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 部门ID
+     */
+    private Long deptId;
+
+    /**
+     * 用户账号
+     */
+    private String userName;
+
+    /**
+     * 用户昵称
+     */
+    private String nickName;
+
+    /**
+     * 用户邮箱
+     */
+    private String email;
+
+    /**
+     * 手机号码
+     */
+    private String phonenumber;
+
+    /**
+     * 用户性别
+     */
+    private String sex;
+
+    /**
+     * 用户头像
+     */
+    private String avatar;
+
+    /**
+     * 密码
+     */
+    private String password;
+
+    /**
+     * 盐加密
+     */
+    private String salt;
+
+    /**
+     * 帐号状态（0正常 1停用）
+     */
+    private String status;
+
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
+    private String delFlag;
+
+    /**
+     * 最后登录IP
+     */
+    private String loginIp;
+
+    /**
+     * 最后登录时间
+     */
+    private Date loginDate;
+
+    /**
+     * 部门对象
+     */
+    private SysDeptVO dept;
+
+    /**
+     * 角色ID
+     */
+    private Long roleId;
+
+    /**
+     * 租户ID
+     */
+    private Integer tenantId;
+
+    /**
+     * 地址
+     */
+    private String address;
+
+    /**
+     * 用户类型
+     */
+    private String userType;
+
+    /**
+     * 姓名
+     */
+    private String fullName;
+
+    public SysUser() {
+
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public Integer getTenantId() {
+        return tenantId;
+    }
+
+    public void setTenantId(Integer tenantId) {
+        this.tenantId = tenantId;
+    }
+
+    public SysUser(Long userId) {
+        this.userId = userId;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public String getUserType() {
+        return userType;
+    }
+
+    public void setUserType(String userType) {
+        this.userType = userType;
+    }
+
+    public boolean isAdmin() {
+        return isAdmin(this.userId);
+    }
+
+    public static boolean isAdmin(Long userId) {
+        return userId != null && 1L == userId;
+    }
+
+    public Long getDeptId() {
+        return deptId;
+    }
+
+    public void setDeptId(Long deptId) {
+        this.deptId = deptId;
+    }
+
+    public String getNickName() {
+        return nickName;
+    }
+
+    public void setNickName(String nickName) {
+        this.nickName = nickName;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public String getPhonenumber() {
+        return phonenumber;
+    }
+
+    public void setPhonenumber(String phonenumber) {
+        this.phonenumber = phonenumber;
+    }
+
+    public String getSex() {
+        return sex;
+    }
+
+    public void setSex(String sex) {
+        this.sex = sex;
+    }
+
+    public String getFullName() {
+        return fullName;
+    }
+
+    public void setFullName(String fullName) {
+        this.fullName = fullName;
+    }
+
+    public String getAvatar() {
+        return avatar;
+    }
+
+    public void setAvatar(String avatar) {
+        this.avatar = avatar;
+    }
+
+    @JsonIgnore
+    @JsonProperty
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public String getSalt() {
+        return salt;
+    }
+
+    public void setSalt(String salt) {
+        this.salt = salt;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getDelFlag() {
+        return delFlag;
+    }
+
+    public void setDelFlag(String delFlag) {
+        this.delFlag = delFlag;
+    }
+
+    public String getLoginIp() {
+        return loginIp;
+    }
+
+    public void setLoginIp(String loginIp) {
+        this.loginIp = loginIp;
+    }
+
+    public Date getLoginDate() {
+        return loginDate;
+    }
+
+    public void setLoginDate(Date loginDate) {
+        this.loginDate = loginDate;
+    }
+
+    public SysDeptVO getDept() {
+        return dept;
+    }
+
+    public void setDept(SysDeptVO dept) {
+        this.dept = dept;
+    }
+
+    public Long getRoleId() {
+        return roleId;
+    }
+
+    public void setRoleId(Long roleId) {
+        this.roleId = roleId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("userId", getUserId())
+                .append("deptId", getDeptId())
+                .append("userName", getUserName())
+                .append("nickName", getNickName())
+                .append("email", getEmail())
+                .append("phonenumber", getPhonenumber())
+                .append("sex", getSex())
+                .append("avatar", getAvatar())
+                .append("password", getPassword())
+                .append("salt", getSalt())
+                .append("status", getStatus())
+                .append("delFlag", getDelFlag())
+                .append("loginIp", getLoginIp())
+                .append("loginDate", getLoginDate())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .append("remark", getRemark())
+                .append("dept", getDept())
+                .toString();
+    }
+}

base-modules/service-system/service-system-api/src/main/java/com/usky/system/factory/RemoteUserFallbackFactory.java

@@ -3,6 +3,7 @@ package com.usky.system.factory;
 
 import com.usky.common.core.bean.ApiResult;
 import com.usky.system.RemoteUserService;
+import com.usky.system.domain.SysUser;
 import com.usky.system.domain.SysUserVO;
 import com.usky.system.model.LoginUser;
 import org.slf4j.Logger;
@@ -10,6 +11,8 @@ import org.slf4j.LoggerFactory;
 import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * 用户服务降级处理
  * 
@@ -37,6 +40,11 @@ public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserServ
             {
                 return ApiResult.error("500","注册用户失败:" + throwable.getMessage());
             }
+
+            @Override
+            public ApiResult<List<SysUser>> userList() {
+                return ApiResult.error("500","获取用户信息:" + throwable.getMessage());
+            }
         };
     }
 }

base-modules/service-system/service-system-api/src/main/java/com/usky/system/model/LoginUser.java

@@ -63,13 +63,16 @@ public class LoginUser implements Serializable
     /** 租户ID */
     private Integer tenantId;
 
+    /** 用户类型 */
     private String userType;
 
-    public String getUserType() {
+    public String getUserType()
+    {
         return userType;
     }
 
-    public void setUserType(String userType) {
+    public void setUserType(String userType)
+    {
         this.userType = userType;
     }
 

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/controller/api/SysUserControllerApi.java

@@ -10,6 +10,8 @@ import com.usky.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 @RestController
 public class SysUserControllerApi implements RemoteUserService {
 
@@ -26,4 +28,8 @@ public class SysUserControllerApi implements RemoteUserService {
     public ApiResult<Boolean> registerUserInfo(SysUserVO sysUser) {
         return ApiResult.success(iSysUserService.register(BeanMapperUtils.map(sysUser, SysUser.class)));
     }
+
+    public ApiResult<List<SysUser>>userList(){
+        return ApiResult.success(iSysUserService.userList());
+    }
 }

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/controller/web/SysPlatformController.java

@@ -62,7 +62,7 @@ public class SysPlatformController {
     public ApiResult<Map<String, Object>> getPlatformMenu(@RequestParam Long platformId) {
 
         Long userId = SecurityUtils.getUserId();
-        List<SysMenu> menus = menuService.selectMenuList(userId);
+        List<SysMenu> menus = menuService.selectMenuListOne(userId);
         Map<String,Object> ajax = new HashMap<>();
         ajax.put("checkedKeys", sysPlatformService.getPlatformMenu(platformId));
         ajax.put("menus", menuService.buildMenuTreeSelect(menus));

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysMenuMapper.java

@@ -40,6 +40,8 @@ public interface SysMenuMapper extends CrudMapper<SysMenu>
      */
     public List<SysMenu> selectMenuListByUserId(SysMenu menu);
 
+    public List<SysMenu> selectMenuListByUserIdOne(Long userId);
+
     /**
      * 根据用户ID查询权限
      *

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysUserMapper.java

@@ -12,15 +12,14 @@ import java.util.List;
 
 /**
  * 用户表 数据层
- * 
+ *
  * @author yq
  */
 @Repository
-public interface SysUserMapper extends CrudMapper<SysUser>
-{
+public interface SysUserMapper extends CrudMapper<SysUser> {
     /**
      * 根据条件分页查询用户列表
-     * 
+     *
      * @param sysUser 用户信息
      * @return 用户信息集合信息
      */
@@ -28,7 +27,7 @@ public interface SysUserMapper extends CrudMapper<SysUser>
 
     /**
      * 根据条件分页查询未已配用户角色列表
-     * 
+     *
      * @param user 用户信息
      * @return 用户信息集合信息
      */
@@ -36,7 +35,7 @@ public interface SysUserMapper extends CrudMapper<SysUser>
 
     /**
      * 根据条件分页查询未分配用户角色列表
-     * 
+     *
      * @param user 用户信息
      * @return 用户信息集合信息
      */
@@ -44,17 +43,17 @@ public interface SysUserMapper extends CrudMapper<SysUser>
 
     /**
      * 通过用户名查询用户
-     * 
+     *
      * @param userName 用户名
      * @return 用户对象信息
      */
     public SysUser selectUserByUserName(String userName);
 
-    public SysUser selectUserByUserNameOne(String userName,Integer tenantId);
+    public SysUser selectUserByUserNameOne(@Param("userName") String userName, @Param("tenantId") Integer tenantId);
 
     /**
      * 通过用户ID查询用户
-     * 
+     *
      * @param userId 用户ID
      * @return 用户对象信息
      */
@@ -64,7 +63,7 @@ public interface SysUserMapper extends CrudMapper<SysUser>
 
     /**
      * 新增用户信息
-     * 
+     *
      * @param user 用户信息
      * @return 结果
      */
@@ -72,7 +71,7 @@ public interface SysUserMapper extends CrudMapper<SysUser>
 
     /**
      * 修改用户信息
-     * 
+     *
      * @param user 用户信息
      * @return 结果
      */
@@ -80,16 +79,16 @@ public interface SysUserMapper extends CrudMapper<SysUser>
 
     /**
      * 修改用户头像
-     * 
+     *
      * @param userName 用户名
-     * @param avatar 头像地址
+     * @param avatar   头像地址
      * @return 结果
      */
     public int updateUserAvatar(@Param("userName") String userName, @Param("avatar") String avatar);
 
     /**
      * 重置用户密码
-     * 
+     *
      * @param userName 用户名
      * @param password 密码
      * @return 结果
@@ -98,7 +97,7 @@ public interface SysUserMapper extends CrudMapper<SysUser>
 
     /**
      * 通过用户ID删除用户
-     * 
+     *
      * @param userId 用户ID
      * @return 结果
      */
@@ -106,7 +105,7 @@ public interface SysUserMapper extends CrudMapper<SysUser>
 
     /**
      * 批量删除用户信息
-     * 
+     *
      * @param userIds 需要删除的用户ID
      * @return 结果
      */
@@ -114,11 +113,11 @@ public interface SysUserMapper extends CrudMapper<SysUser>
 
     /**
      * 校验用户名称是否唯一
-     * 
+     *
      * @param userName 用户名称
      * @return 结果
      */
-    public int checkUserNameUnique(@Param("userName") String userName,@Param("tenantId") Integer tenantId);
+    public int checkUserNameUnique(@Param("userName") String userName, @Param("tenantId") Integer tenantId);
 
     /**
      * 校验手机号码是否唯一
@@ -142,4 +141,7 @@ public interface SysUserMapper extends CrudMapper<SysUser>
                                      @Param("current") Integer current,
                                      @Param("size") Integer size,
                                      @Param("userId") long userId);
+
+    public List<SysUser> userList(@Param("tenantId") Integer tenantId,
+                                  @Param("createBy") String createBy);
 }

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/ISysMenuService.java

@@ -33,6 +33,9 @@ public interface ISysMenuService extends CrudService<SysMenu>
      */
     public List<SysMenu> selectMenuList(SysMenu menu, Long userId);
 
+
+    List<SysMenu> selectMenuListOne(Long userId);
+
     /**
      * 根据用户ID查询权限
      * 

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/ISysUserService.java

@@ -212,6 +212,8 @@ public interface ISysUserService extends CrudService<SysUser> {
 
     public CommonPage<SysUser> userList(Integer tenantId, Integer page, Integer size, long userId);
 
+    public List<SysUser> userList();
+
 
 
 }

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysMenuServiceImpl.java

@@ -75,6 +75,14 @@ public class SysMenuServiceImpl extends AbstractCrudService<SysMenuMapper, SysMe
         return menuList;
     }
 
+
+    @Override
+    public List<SysMenu> selectMenuListOne(Long userId)
+    {
+        List<SysMenu> menuList = menuMapper.selectMenuListByUserIdOne(userId);
+        return menuList;
+    }
+
     /**
      * 根据用户ID查询权限
      *

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysUserServiceImpl.java

@@ -543,4 +543,19 @@ public class SysUserServiceImpl extends AbstractCrudService<SysUserMapper, SysUs
         List<SysUser> list = userMapper.getUserData(tenantId, current, size,userId);
         return new CommonPage<>(list, total, size, page);
     }
+
+
+    public List<SysUser> userList(){
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        String userType = null;
+        if (loginUser != null && !"".equals(loginUser)) {
+            userType = loginUser.getUserType();
+        }
+        String userName = null;
+        if ("00".equals(userType)){
+            userName = SecurityUtils.getUsername();
+        }
+        List<SysUser> list = userMapper.userList(SecurityUtils.getTenantId(),userName);
+        return list;
+    }
 }

base-modules/service-system/service-system-biz/src/main/resources/mapper/system/SysMenuMapper.xml

@@ -101,6 +101,14 @@
         order by m.parent_id, m.order_num
     </select>
 
+    <select id="selectMenuListByUserIdOne" 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
+        from sys_menu m
+        order by m.parent_id, m.order_num
+    </select>
+
+
     <select id="selectMenuTreeByUserId" parameterType="Long" resultMap="SysMenuResult">
         select distinct m.menu_id,
                         m.parent_id,

base-modules/service-system/service-system-biz/src/main/resources/mapper/system/SysUserMapper.xml

@@ -256,15 +256,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		where
 		del_flag=0 and user_type='01'
 		<if test="tenantId != null and tenantId != 0">
-			and 	tenant_id = #{tenantId}
+			and tenant_id = #{tenantId}
 		</if>
 		<if test="userId != null and userId != 0">
-			and 	user_id = #{userId}
+			and user_id = #{userId}
 		</if>
 		order by user_id
 		<if test="current != null and size != null and size != 0">
 			limit #{current},#{size}
 		</if>
 	</select>
-	
+
+
+	<select id="userList" resultType="com.usky.system.domain.SysUser">
+		SELECT * FROM sys_user
+		where
+		del_flag=0 and status=0
+		<if test="tenantId != null and tenantId != 0">
+			and tenant_id = #{tenantId}
+		</if>
+		<if test="createBy != null and createBy != ''">
+			and create_by = #{createBy}
+		</if>
+		order by user_id desc
+	</select>
 </mapper>