Merge remote-tracking branch 'origin/master'

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/workClientInfo/controller/WorkClientController.java

@@ -68,9 +68,9 @@ public class WorkClientController {
     }
 
     /**
-     * 客户信息查询
+     * 根据名称模糊搜索客户信息
      */
-    @ApiOperation(value = "客户信息更新")
+    @ApiOperation(value = "根据名称模糊搜索客户信息")
     @GetMapping(value = "findListByName")
     public List<WorkClientInfo> findListByName(@RequestParam String name) {
         return workClientService.findListByName(name);

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/workClientInfo/service/WorkClientService.java

@@ -82,8 +82,8 @@ public class WorkClientService {
                         String jobTypeId = info.getJobTypeId();
                         s = s + "," + jobTypeId;
                     }
-                    s.substring(1, s.length()-1);
-                    i.setDeputy(s);
+                    String substring = s.substring(1, s.length());
+                    i.setDeputy(substring);
                 }
             });
             infoPage.setRecords(records);
@@ -213,8 +213,8 @@ public class WorkClientService {
                 String jobTypeId = info.getJobTypeId();
                 s = s + "," + jobTypeId;
             }
-            s.substring(1, s.length()-1);
-            workClientInfo.setDeputy(s);
+            String substring = s.substring(1, s.length());
+            workClientInfo.setDeputy(substring);
         }
         //客户信息查询
         dto.setWorkClientInfo(workClientInfo);
@@ -305,6 +305,11 @@ public class WorkClientService {
         return "更新完成!";
     }
 
+    /**
+     * 根据名称模糊搜索客户信息
+     * @param name
+     * @return
+     */
     public List<WorkClientInfo> findListByName(String name) {
         LambdaQueryWrapper<WorkClientInfo> wrapper = new LambdaQueryWrapper<>();
         wrapper.like(WorkClientInfo::getName, name);

jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/sys/constant/CacheNames.java

@@ -11,35 +11,35 @@ public interface CacheNames {
     /**
      * 系统缓存
      */
-     String SYS_CACHE_CODE = "sys:cache:code"; // 验证码
+     String SYS_CACHE_CODE = "sys:assess:cache:code"; // 验证码
 
-     String SYS_CACHE_CONFIG = "sys:cache:config"; //系统配置
+     String SYS_CACHE_CONFIG = "sys:assess:cache:config"; //系统配置
 
-     String SYS_CACHE_AREA_LIST = "sys:cache:areaList"; //区域
+     String SYS_CACHE_AREA_LIST = "sys:assess:cache:areaList"; //区域
 
-     String SYS_CACHE_DICT_MAP = "sys:cache:dictMap"; // 字典
+     String SYS_CACHE_DICT_MAP = "sys:assess:cache:dictMap"; // 字典
 
-     String SYS_CACHE_MENU = "sys:cache:menu"; // 菜单
+     String SYS_CACHE_MENU = "sys:assess:cache:menu"; // 菜单
 
     /**
      * 用户缓存--属于用户，和用户绑定
      */
 
-     String USER_CACHE_TOP_MENU = "user:cache:topMenu"; //用户的顶部菜单
+     String USER_CACHE_TOP_MENU = "user:assess:cache:topMenu"; //用户的顶部菜单
 
-     String USER_CACHE_MENU_LIST = "user:cache:menuList"; //用户的左侧菜单
+     String USER_CACHE_MENU_LIST = "user:assess:cache:menuList"; //用户的左侧菜单
 
-     String USER_CACHE_DATA_RULE_LIST = "user:cache:dataRuleList"; // 用户的数据权限
+     String USER_CACHE_DATA_RULE_LIST = "user:assess:cache:dataRuleList"; // 用户的数据权限
 
-     String USER_CACHE_ROLE_LIST = "user:cache:roleList"; //用户角色列表
+     String USER_CACHE_ROLE_LIST = "user:assess:cache:roleList"; //用户角色列表
 
-     String USER_CACHE_USER_ID = "user:cache:userId"; //根据id关联用户
+     String USER_CACHE_USER_ID = "user:assess:cache:userId"; //根据id关联用户
 
-     String USER_CACHE_LOGIN_NAME = "user:cache:loginName"; //根据登录名关联用户
+     String USER_CACHE_LOGIN_NAME = "user:assess:cache:loginName"; //根据登录名关联用户
 
-     String USER_CACHE_TOKEN = "user:cache:token:";
+     String USER_CACHE_TOKEN = "user:assess:cache:token:";
 
-     String USER_CACHE_LOGIN_CODE = "user:cache:code:loginName"; //用户登录次数
+     String USER_CACHE_LOGIN_CODE = "user:assess:cache:code:loginName"; //用户登录次数
 
 
 }

jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/sys/controller/LoginController.java

@@ -28,6 +28,7 @@ import com.jeeplus.sys.utils.UserUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.compress.utils.Lists;
 import org.jasig.cas.client.authentication.AttributePrincipal;
 import org.jasig.cas.client.validation.Assertion;
 import org.jasig.cas.client.validation.Cas20ServiceTicketValidator;
@@ -52,6 +53,7 @@ import javax.servlet.http.HttpSession;
 import java.io.IOException;
 import java.nio.file.AccessDeniedException;
 import java.util.Date;
+import java.util.List;
 import java.util.UUID;
 
 /**
@@ -83,18 +85,19 @@ public class LoginController {
     @ApiOperation("登录接口")
     public ResponseEntity login(@RequestBody LoginForm loginForm) {
         ResponseUtil responseUtil = new ResponseUtil ( );
+        String loginUserName = loginForm.getUsername ();
         String username = loginForm.getUsername ();
         String password = loginForm.getPassword ();
         String code = loginForm.getCode ();
-        Integer redisLoginNumber = (Integer) RedisUtils.getInstance ().get ( CacheNames.USER_CACHE_LOGIN_CODE + username );
+        Integer redisLoginNumber = (Integer) RedisUtils.getInstance ().get ( CacheNames.USER_CACHE_LOGIN_CODE + loginUserName );
         if(null == redisLoginNumber){
             redisLoginNumber = 0;
         }else{
             redisLoginNumber ++ ;
         }
-        RedisUtils.getInstance().set(CacheNames.USER_CACHE_LOGIN_CODE + username , redisLoginNumber);
+        RedisUtils.getInstance().set(CacheNames.USER_CACHE_LOGIN_CODE + loginUserName , redisLoginNumber);
         //给登录次数记录设置6小时的过期时间
-        RedisUtils.getInstance().expire(CacheNames.USER_CACHE_LOGIN_CODE + username , 21600);
+        RedisUtils.getInstance().expire(CacheNames.USER_CACHE_LOGIN_CODE + loginUserName , 21600);
 
         String dictValue = DictUtils.getDictLabel("login_number", "login_verification_number", null);
         //字典中限制显示次数
@@ -107,6 +110,16 @@ public class LoginController {
                 throw new AccountExpiredException ( ErrorConstants.LOGIN_ERROR_ERROR_VALIDATE_CODE );
             }
         }
+        //根据登录名查询登录信息
+        List<UserDTO> loginUserList = userService.getUserIdByLoginOrMobile(username);
+        if(null != loginUserList){
+            if (loginUserList.size()>1){
+                throw new DisabledException ( "登录名重复，请使用手机号登录" );
+            }else{
+                username = loginUserList.get(0).getLoginName();
+            }
+        }
+
         SecurityUtils.login (username, password, authenticationManager  ); //登录操作spring security
 
         /**
@@ -124,7 +137,7 @@ public class LoginController {
         updateUserLoginInfo ( responseUtil, userDTO , token);
 
         //删除redis中登录次数的信息
-        RedisUtils.getInstance ().delete ( CacheNames.USER_CACHE_LOGIN_CODE + username );
+        RedisUtils.getInstance ().delete ( CacheNames.USER_CACHE_LOGIN_CODE + loginUserName );
 
         return responseUtil.ok ( );
     }

jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/sys/mapper/UserMapper.java

@@ -133,4 +133,11 @@ public interface UserMapper extends BaseMapper<User> {
      */
     List<UserDTO> getUserByOfficeIds(@Param("officeIds") List<String> officeIds);
 
+    /**
+     * getUserIdByLoginOrMobile
+     * @param userName
+     * @return
+     */
+    List<UserDTO> getUserIdByLoginOrMobile(String userName);
+
 }

jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/sys/mapper/xml/UserMapper.xml

@@ -233,4 +233,16 @@
 		</where>
 	</select>
 
+
+	<select id="getUserIdByLoginOrMobile" resultType="com.jeeplus.sys.service.dto.UserDTO">
+		SELECT
+		<include refid="userOfficeColumns"/>
+		FROM sys_user a
+		<include refid="userJoins"/>
+		<where>
+			a.del_flag = 0
+			and (login_name = #{userName} or mobile = #{userName})
+		</where>
+	</select>
+
 </mapper>

jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/sys/service/UserService.java

@@ -119,6 +119,15 @@ public class UserService  extends ServiceImpl<UserMapper, User> {
 	}
 
 	/**
+	 * 根据登录名或手机号获取用户信息
+	 * @param loginName
+	 * @return
+	 */
+	public List<UserDTO> getUserIdByLoginOrMobile(String loginName) {
+		return userMapper.getUserIdByLoginOrMobile (loginName);
+	}
+
+	/**
 	 * 根据用户name获取用户id
 	 * @param name
 	 * @return