Merge branch 'feature/common'

# Conflicts:
#	epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysUserController.java

epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysUserController.java

@@ -536,17 +536,18 @@ public class SysUserController {
         return sysDeptService.getUserDeptOptionByUserId(String.valueOf(SecurityUser.getUserId()));
     }
 
+
     /**
-     * 展示用户列表
+     * 查询用户登录时是否需要短信验证码，如果需要手机短信验证，则返回手机号
      *
-     * @param params
+     * @param username
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.SysRoleMembersDTO>>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.Map < java.lang.String, java.lang.String>>
-     * @author zhy
+     * @author work@yujt.net.cn
-     * @date 2021/5/31 15:44
+     * @date 2021/6/1 09:52
      */
-    @GetMapping("userList")
+    @GetMapping("getLoginMobile")
-    public Result<List<SysUserDTO>> userList(@RequestParam Map<String, Object> params) {
+    public Result<Map<String, String>> getLoginMobile(String username) {
-        return new Result<List<SysUserDTO>>().ok(sysUserService.list(params));
+        return new Result().ok(sysUserService.getLoginMobile(username));
     }
 
 }

epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/SysUserDao.java

@@ -53,33 +53,30 @@ public interface SysUserDao extends BaseDao<SysUserEntity> {
     List<String> selectListLeaderGridId(@Param("mobile") String mobile);
 
     /**
-     *
      * 获取部门下的所有用户ID
      *
-     * @params [deptId]
      * @return java.util.List<java.lang.Long>
+     * @params [deptId]
      * @author liuchuang
      * @since 2019/10/29 16:18
      */
     List<Long> selectListOfUserIdsByDeptId(@Param("deptId") Long deptId);
 
     /**
-     *
      * 根据用户名更新用户微信openId
      *
-     * @params [sysUserOpenIdFormDto]
      * @return void
+     * @params [sysUserOpenIdFormDto]
      * @author liuchuang
      * @since 2019/11/20 9:59
      */
     void updateOpenIdByUsername(SysUserOpenIdFormDTO sysUserOpenIdFormDto);
 
     /**
-     *
      * 根据openId获取用户信息
      *
-     * @params [openId]
      * @return com.elink.esua.epdc.dto.SysUserDTO
+     * @params [openId]
      * @author liuchuang
      * @since 2019/11/20 13:56
      */
@@ -116,4 +113,14 @@ public interface SysUserDao extends BaseDao<SysUserEntity> {
      * @Date: 2020-06-09
      */
     List<SysRoleMembersDTO> getRoleMembers(SysRoleMembersFormDTO dto);
+
+    /**
+     * 通过用户名，查询用户登录需要验证的手机号
+     *
+     * @param username
+     * @return java.util.List<java.util.Map < java.lang.String, java.lang.String>>
+     * @author work@yujt.net.cn
+     * @date 2021/6/1 09:54
+     */
+    List<Map<String, String>> getLoginMobile(@Param("username") String username);
 }

epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/SysUserService.java

@@ -97,6 +97,7 @@ public interface SysUserService extends BaseService<SysUserEntity> {
 
     /**
      * 退出登录
+     *
      * @param userId
      * @return
      */
@@ -105,7 +106,7 @@ public interface SysUserService extends BaseService<SysUserEntity> {
     /**
      * @Description: 根据部门id，查询部门下的所有用户手机号
      * @Param: [deptId]
-     * @return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<java.lang.String>>
+     * @return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < java.lang.String>>
      * @Author: zy
      * @Date: 2020-01-09
      */
@@ -114,36 +115,46 @@ public interface SysUserService extends BaseService<SysUserEntity> {
     /**
      * @Description: 根据议题网格ID查询拥有这个网格数据权限且是网格长的角色，再根据角色查出所有用户手机号
      * @Param: [deptId]
-     * @return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<java.lang.String>>
+     * @return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < java.lang.String>>
      * @Author: zy
      * @Date: 2020-01-09
      */
     Result<List<String>> getSysGridLeaderPhone(Long deptId);
 
     /**
-    * @describe: 判断是否更新头像
+     * @param []
-    * @author wangtong
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
-    * @date 2020/3/30 13:52
+     * @describe: 判断是否更新头像
-    * @param []
+     * @author wangtong
-    * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @date 2020/3/30 13:52
-    */
+     */
     Result checkUpdateAvatar();
 
     /**
-    * @describe: 更新头像
+     * @param [avatar]
-    * @author wangtong
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
-    * @date 2020/3/30 16:12
+     * @describe: 更新头像
-    * @param [avatar]
+     * @author wangtong
-    * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @date 2020/3/30 16:12
-    */
+     */
     Result updateAvatar(String avatar);
 
     /**
+     * @param dto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
      * @describe: 获取成员角色
      * @author zhangyuan
      * @date 2020/3/30 16:12
-     * @param dto
-     * @return com.elink.esua.epdc.commons.tools.utils.Result
      */
     Result getRoleMembers(SysRoleMembersFormDTO dto);
+
+    /**
+     * 查询用户登录时是否需要短信验证码，如果需要手机短信验证，则返回手机号
+     *
+     * @param username
+     * @return java.util.Map < java.lang.String, java.lang.String>
+     * @author work@yujt.net.cn
+     * @date 2021/6/1 09:52
+     */
+    Map<String, String> getLoginMobile(String username);
 }

epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java

@@ -253,8 +253,8 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
 
     @Override
     public Result<List<String>> getUserPhoneByListDeptId(List<Long> deptId) {
-        Map<String,Object> map = new HashMap<>();
+        Map<String, Object> map = new HashMap<>();
-        map.put("deptId",deptId);
+        map.put("deptId", deptId);
         List<String> list = baseDao.getUserPhoneByListDeptId(map);
         return new Result<List<String>>().ok(list);
     }
@@ -268,12 +268,12 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
     public Result checkUpdateAvatar() {
         String userId = SecurityUser.getUser().getId().toString();
         SysUserEntity userInfo = baseDao.selectById(userId);
-        if(userInfo==null || userInfo.getDelFlag()==1 || userInfo.getStatus()==0){
+        if (userInfo == null || userInfo.getDelFlag() == 1 || userInfo.getStatus() == 0) {
             throw new RenException("未查到次用户信息或此用户被停用！");
         }
-        if(StringUtils.isNotBlank(userInfo.getHeadUrl())){
+        if (StringUtils.isNotBlank(userInfo.getHeadUrl())) {
             return new Result().ok(false);
-        }else{
+        } else {
             return new Result().ok(true);
         }
     }
@@ -281,7 +281,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
     @Transactional
     @Override
     public Result updateAvatar(String avatar) {
-        if(StringUtils.isBlank(avatar)){
+        if (StringUtils.isBlank(avatar)) {
             throw new RenException("头像地址不可为空");
         }
         String userId = SecurityUser.getUser().getId().toString();
@@ -292,8 +292,20 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
     }
 
     @Override
-    public Result<List<SysRoleMembersDTO>> getRoleMembers(SysRoleMembersFormDTO dto){
+    public Result<List<SysRoleMembersDTO>> getRoleMembers(SysRoleMembersFormDTO dto) {
         List<SysRoleMembersDTO> list = baseDao.getRoleMembers(dto);
         return new Result<List<SysRoleMembersDTO>>().ok(list);
     }
+
+    @Override
+    public Map<String, String> getLoginMobile(String username) {
+        List<Map<String, String>> userList = baseDao.getLoginMobile(username);
+        if (CollUtil.isEmpty(userList)) {
+            throw new RenException("账号不存在");
+        }
+        if (userList.size() > NumConstant.ONE) {
+            throw new RenException("账户名重复，请联系管理员处理");
+        }
+        return userList.get(NumConstant.ZERO);
+    }
 }

epdc-cloud-admin/src/main/resources/mapper/SysUserDao.xml

@@ -177,4 +177,15 @@
         )
         </if>
     </select>
+
+    <select id="getLoginMobile" resultType="java.util.Map">
+        SELECT
+            CONCAT( '', u.id ) AS keyword,
+            u.mobile
+        FROM
+            sys_user u
+        WHERE
+            u.del_flag = '0'
+            AND u.username = #{username}
+    </select>
 </mapper>