Merge remote-tracking branch 'origin/wn' into ywx

suser/src/main/java/com/xhkjedu/suser/mapper/system/UserMapper.java

@@ -269,4 +269,7 @@ public interface UserMapper extends TkMapper<TUser> {
 
     //更新用户信息
     void updateUser(@Param("u") TUser user);
+
+    //获取当前区域码
+    String getCloudCode();
 }

suser/src/main/java/com/xhkjedu/suser/model/system/TUser.java

@@ -153,13 +153,25 @@ public class TUser extends BaseBean {
     @Transient
     private String qrkey;// 扫码登录时二维码唯一标识
 
-    @Transient
+ /*   @Transient
     private String browser;//浏览器
 
     @Transient
-    private String os;//操作系统
+    private String os;//操作系统*/
 
     //重置默认头像1重置
     @Transient
     private Integer resethead;
+
+    //系统版本（android、鸿蒙、荣耀系统等）
+    @Transient
+    private String systemversion;
+
+    @Transient
+    //登录终端品牌（华为、小米、荣耀、vivo、oppo等）
+    private String ultypeband;
+
+    @Transient
+    //登录终端型号（华为mate9、小米13等）
+    private String ultypemodel;
 }

suser/src/main/java/com/xhkjedu/suser/model/system/TUserLog.java

@@ -23,6 +23,9 @@ public class TUserLog extends BaseBean {
     //登录名
     private String loginname;
 
+    //用户类型999超管0学校管理员1教师2学生
+    private Integer usertype;
+
     //登录状态1成功2失败
     private Integer loginstate;
 
@@ -38,9 +41,18 @@ public class TUserLog extends BaseBean {
     //登录终端设备
     private String ultype;
 
+    //登录终端品牌（华为、小米、荣耀、vivo、oppo等）
+    private String ultypeband;
+
+    //登录终端型号（华为mate9、小米13等）
+    private String ultypemodel;
+
     //版本号
     private String versionnum;
 
+    //系统版本（android、鸿蒙、荣耀系统等）
+    private String systemversion;
+
     //备注
     private String logtxt;
 

suser/src/main/java/com/xhkjedu/suser/service/system/UserLogService.java

@@ -2,11 +2,9 @@ package com.xhkjedu.suser.service.system;
 
 import com.alibaba.fastjson.JSON;
 import com.xhkjedu.suser.config.ConfigKey;
-import com.xhkjedu.suser.mapper.system.UserLogMapper;
+import com.xhkjedu.suser.mapper.system.UserMapper;
 import com.xhkjedu.suser.model.system.TUser;
 import com.xhkjedu.suser.model.system.TUserLog;
-import com.xhkjedu.suser.utils.IpRegionUtil;
-import com.xhkjedu.suser.utils.UserUtil;
 import com.xhkjedu.suser.vo.system.UserVo;
 import com.xhkjedu.utils.N_Utils;
 import lombok.extern.slf4j.Slf4j;
@@ -14,7 +12,6 @@ import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -27,62 +24,43 @@ import java.util.Map;
 @Slf4j
 public class UserLogService {
     @Resource
-    private UserLogMapper userLogMapper;
+    private UserMapper userMapper;
 
     //保存登录日志
-    @Async("asyncPoolTaskExecutor")
-    public void saveSyncLoginLog(TUserLog userLog, TUser user, HttpServletRequest request) {
-        try {
-            userLog.setUserid(user.getUserid());
-            userLog.setUsername(user.getUsername());
-            userLog.setSchoolid(user.getSchoolid());
-            //获取请求ip并解析区域
-            String ip = UserUtil.getIpAddress(request);
-            String region = null;
-            if (N_Utils.isNotEmpty(ip)) {
-                IpRegionUtil ipRegionUtil = new IpRegionUtil();
-                region = ipRegionUtil.getIpForAddress(ip);
-            }
-            userLog.setLogip(ip);
-            userLog.setLogaddress(region);
-            Integer usertype = user.getUsertype();
-            String ultype = user.getUltype();
-            if (N_Utils.isNotEmpty(ultype) && ultype.equals("p_web") && usertype != null) {
-                //网页端学生和教师合并登录，前端传p_web,拼接完整的ultype
-                if (usertype == 2) {
-                    userLog.setUltype(user.getUltype() + "_s");
-                } else {
-                    userLog.setUltype(user.getUltype() + "_t");
-                }
-            } else {
-                userLog.setUltype(user.getUltype());
-            }
 
-            userLog.setVersionnum(user.getVersionnum());
-            int logintime = N_Utils.getSecondTimestamp();
-            userLog.setLogtime(logintime);
-            userLogMapper.insertSelective(userLog);
-        } catch (Exception e) {
-            log.error("添加登录日志失败:" + e.getMessage());
-        }
-    }
 
     //用户登录信息同步到云平台
     @Async("asyncPoolTaskExecutor")
     public void saveSyncUserLogin(UserVo userVo, TUser user, TUserLog userLog) {
         Map<String, Object> params = new HashMap<>();
-        params.put("cloudcode", userVo.getCloudcode());
-        params.put("schoolname", userVo.getSchoolname());
-        params.put("userid", userVo.getUserid());
-        params.put("loginname", userVo.getLoginname());
-        params.put("usertype", userVo.getUsertype());
-        params.put("device", userLog.getUltype());
+        if(userVo == null){
+            //获取当前区域码
+            String cloudcode = userMapper.getCloudCode();
+            params.put("cloudcode", cloudcode);
+            params.put("schoolname", "");
+            params.put("userid", user.getUserid());
+            params.put("loginname", user.getLoginname());
+            params.put("username", "");
+
+        }else{
+            params.put("cloudcode", userVo.getCloudcode());
+            params.put("schoolname", userVo.getSchoolname());
+            params.put("userid", userVo.getUserid());
+            params.put("loginname", userVo.getLoginname());
+            params.put("username", userVo.getUsername());
+        }
+        params.put("deviceband", user.getUltypeband());
+        params.put("devicemodel", user.getUltypemodel());
         params.put("mac", user.getMac());
-        params.put("loginip", userLog.getLogip());
-        params.put("logintime", userLog.getLogtime());
         params.put("versioncode", user.getVersionnum());
-        params.put("browser", user.getBrowser());
-        params.put("env", user.getOs());
+        params.put("systemversion", user.getSystemversion());
+        params.put("usertype", userLog.getUsertype());
+        params.put("device", userLog.getUltype());
+        params.put("logip", userLog.getLogip());
+        params.put("logaddress", userLog.getLogaddress());
+        params.put("logtime", userLog.getLogtime());
+        params.put("loginstate", userLog.getLoginstate());
+        params.put("logtxt",userLog.getLogtxt());
 
         try {
             N_Utils.sendJsonPost(ConfigKey.cloudapi + "rlinfo/save", JSON.toJSONString(params));

suser/src/main/java/com/xhkjedu/suser/service/system/UserService.java

@@ -9,6 +9,7 @@ import com.xhkjedu.suser.mapper.gradeclass.ClassTeacherMapper;
 import com.xhkjedu.suser.mapper.gradeclass.SchoolMapper;
 import com.xhkjedu.suser.mapper.subjectbook.TeacherPowersbMapper;
 import com.xhkjedu.suser.mapper.system.MsgMapper;
+import com.xhkjedu.suser.mapper.system.UserLogMapper;
 import com.xhkjedu.suser.mapper.system.UserMapper;
 import com.xhkjedu.suser.mapper.system.UserUsecretMapper;
 import com.xhkjedu.suser.model.gradeclass.TClassTeacher;
@@ -16,6 +17,7 @@ import com.xhkjedu.suser.model.system.TMsg;
 import com.xhkjedu.suser.model.system.TUser;
 import com.xhkjedu.suser.model.system.TUserLog;
 import com.xhkjedu.suser.model.system.TUserUsecret;
+import com.xhkjedu.suser.utils.IpRegionUtil;
 import com.xhkjedu.suser.utils.PoiUtils;
 import com.xhkjedu.suser.utils.SMSSender;
 import com.xhkjedu.suser.utils.UserUtil;
@@ -65,6 +67,8 @@ public class UserService extends JedisUtil {
     private UserUsecretMapper userUsecretMapper;
     @Resource
     private TeacherPowersbMapper teacherPowersbMapper;
+    @Resource
+    private UserLogMapper userLogMapper;
 
     /**
      * 功能描述  根据登录名和密码获取用户信息
@@ -101,7 +105,7 @@ public class UserService extends JedisUtil {
     private ResultVo checkLoginUser(TUser user, UserVo userVo, Integer checkmethod) {
         if (checkmethod == 1 && !userVo.getLoginpwd().equals(user.getLoginpwd())) {
             //帐号密码登录
-            return new ResultVo(1, "密码错误");
+            return new ResultVo(1, "密码错误", userVo);
         } else {
             Integer usertype = userVo.getUsertype();
             if (usertype == 999) {
@@ -109,20 +113,20 @@ public class UserService extends JedisUtil {
             }
             //判断学校状态
             if (userVo.getSchoolstate() != 1) {
-                return new ResultVo(1, "此学校已锁定，禁止登录");
+                return new ResultVo(1, "此学校已锁定，禁止登录", userVo);
             }
             //判断用户状态
             if (userVo.getUserstate() != 1) {
                 if (usertype == 2) {//学生
-                    return new ResultVo(1, "此账号无权访问，请联系老师");
+                    return new ResultVo(1, "此账号无权访问，请联系老师", userVo);
                 } else {
-                    return new ResultVo(1, "此账号无权访问，请联系管理员");
+                    return new ResultVo(1, "此账号无权访问，请联系管理员", userVo);
                 }
             }
 
             //判断用户状态
             if (userVo.getUserlock() == 1) {
-                return new ResultVo(1, "此账号已锁定，禁止登录");
+                return new ResultVo(1, "此账号已锁定，禁止登录", userVo);
             }
 
             //判断用户有效期
@@ -131,9 +135,9 @@ public class UserService extends JedisUtil {
                 String dayBegin = DatesUtil.getDayBegin();
                 if (usertime.compareTo(dayBegin) < 0) {
                     if (usertype == 2) {//学生
-                        return new ResultVo(1, "账号已过有效期，请联系老师");
+                        return new ResultVo(1, "账号已过有效期，请联系老师", userVo);
                     } else {
-                        return new ResultVo(1, "账号已过有效期，请联系管理员");
+                        return new ResultVo(1, "账号已过有效期，请联系管理员", userVo);
                     }
                 }
             }
@@ -141,7 +145,7 @@ public class UserService extends JedisUtil {
             //进行角色判断
             if (usertype == 2) {
                 Integer stuweb = userVo.getStuweb();
-                if (stuweb != null && stuweb != 1) return new ResultVo(1, "学生账号无法登录");
+                if (stuweb != null && stuweb != 1) return new ResultVo(1, "学生账号无法登录", userVo);
 
                 Integer sbindmac = userVo.getSbindmac();
                 String mac = user.getMac();
@@ -150,11 +154,11 @@ public class UserService extends JedisUtil {
                 UserVo binduser = userMapper.getStudentByuserIdMac(userVo.getUserid(), mac);
                 if (sbindmac == 1 && N_Utils.isNotEmpty(mac)) {
                     if (N_Utils.isNotEmpty(binduser.getMac()) && !mac.equals(binduser.getMac())) {
-                        return new ResultVo(1, "登录失败，该账号已与其他设备关联");
+                        return new ResultVo(1, "该账号已与其他设备关联", userVo);
                     } else {
                         //20211221添加注释，sql语句修改了，不绑定的情况下会出现一个mac可以绑定多个帐号，绑定情况下没问题
                         if (N_Utils.isNotEmpty(binduser.getMacname()) && !binduser.getMacname().equals(user.getLoginname())) {
-                            return new ResultVo(1, "登录失败，该设备已与其他账号关联");
+                            return new ResultVo(1, "该设备已与其他账号关联", userVo);
                         } else {
                             return new ResultVo(0, "登录成功", userVo);
                         }
@@ -162,7 +166,7 @@ public class UserService extends JedisUtil {
                 }
                 //验证用户是否有行政班
                 if (binduser.getXznum() == 0) {
-                    return new ResultVo(1, "此账号未分配班级");
+                    return new ResultVo(1, "此账号未分配班级", userVo);
                 }
 
                 String device = user.getDevice();//只有学生
@@ -200,18 +204,14 @@ public class UserService extends JedisUtil {
             user.setSchoolid(userVo.getSchoolid());
             user.setUsertype(userVo.getUsertype());
             if (userVo.getUsertype() != 1) {
-                resultVo = new ResultVo(1, "禁止非教师帐号登录");
+                resultVo = new ResultVo(1, "禁止非教师帐号登录", userVo);
             } else {
                 //验证用户信息
                 resultVo = this.checkLoginUser(user, userVo, 1);
             }
-
         } else {
             resultVo = new ResultVo(1, "此账号不存在");
         }
-
-
-
         return getLogResultVo(user, resultVo, loginpwd, request);
     }
 
@@ -247,7 +247,7 @@ public class UserService extends JedisUtil {
     //验证学生登录系列问题
     private ResultVo checkLoginStudent(TUser user, UserVo userVo) {
         if (!userVo.getLoginpwd().equals(user.getLoginpwd())) {
-            return new ResultVo(1, "密码错误");
+            return new ResultVo(1, "密码错误", userVo);
         } else {
             Integer sbindmac = userVo.getSbindmac();//学校是否绑定设备0未绑定1绑定
             String mac = user.getMac();
@@ -255,34 +255,34 @@ public class UserService extends JedisUtil {
 
             //判断学校状态
             if (userVo.getSchoolstate() != 1) {
-                return new ResultVo(1, "此学校已锁定，禁止登录");
+                return new ResultVo(1, "此学校已锁定，禁止登录", userVo);
             }
 
             //判断用户状态
             if (userVo.getUserstate() != 1) {
                 if (userVo.getUsertype() == 2) {//学生
-                    return new ResultVo(1, "此账号无权访问，请联系老师");
+                    return new ResultVo(1, "此账号无权访问，请联系老师", userVo);
                 }
             }
 
             if (userVo.getUserlock() == 1) {
-                return new ResultVo(1, "此账号已锁定，禁止登录");
+                return new ResultVo(1, "此账号已锁定，禁止登录", userVo);
             } else if (userVo.getUsertype() != 2) {
-                return new ResultVo(1, "登录失败，仅允许学生登录");
+                return new ResultVo(1, "登录失败，仅允许学生登录", userVo);
             } else if (userVo.getXznum() == 0) {
-                return new ResultVo(1, "此账号未分配班级");
+                return new ResultVo(1, "此账号未分配班级", userVo);
             } else if (N_Utils.isNotEmpty(usertime)) {
                 String dayBegin = DatesUtil.getDayBegin();
                 if (usertime.compareTo(dayBegin) < 0) {
-                    return new ResultVo(1, "账号已过有效期，请联系老师");
+                    return new ResultVo(1, "账号已过有效期，请联系老师", userVo);
                 }
             } else if (sbindmac == 1 && N_Utils.isNotEmpty(mac)) {
                 if (N_Utils.isNotEmpty(userVo.getMac()) && !mac.equals(userVo.getMac())) {
-                    return new ResultVo(1, "登录失败，该账号已与其他设备关联");
+                    return new ResultVo(1, "登录失败，该账号已与其他设备关联", userVo);
                 } else {
                     //20211221添加注释，sql语句修改了，不绑定的情况下会出现一个mac可以绑定多个帐号，绑定情况下没问题
                     if (N_Utils.isNotEmpty(userVo.getMacname()) && !userVo.getMacname().equals(user.getLoginname())) {
-                        return new ResultVo(1, "登录失败，该设备已与其他账号关联");
+                        return new ResultVo(1, "登录失败，该设备已与其他账号关联", userVo);
                     }
                 }
             }
@@ -312,7 +312,7 @@ public class UserService extends JedisUtil {
             Integer usertype = user.getUsertype();
             Integer utype = userVo.getUsertype();
             if (usertype != null && usertype == 1 && utype != 0 & utype != 1) {//教师端只能管理员、教师登录
-                return new ResultVo(1, "禁止非教师帐号登录");
+                return new ResultVo(1, "禁止非教师帐号登录", userVo);
             }
             user.setUserid(userVo.getUserid());
             user.setUsername(userVo.getUsername());
@@ -389,7 +389,6 @@ public class UserService extends JedisUtil {
         TUserLog userLog = new TUserLog();
         userLog.setLoginname(loginname);
         userLog.setMac(user.getMac());
-        Integer usertype = user.getUsertype();
         UserVo userVo = null;
         if (result.getCode() == 0) {
             userVo = (UserVo) result.getObj();
@@ -401,7 +400,9 @@ public class UserService extends JedisUtil {
             if (!redis_rtn) {
                 result.setCode(1);
                 result.setMsg("加入缓存出错!");
-                return result;
+                userLog.setLoginstate(2);
+                userLog.setLogtxt("登录失败，" + result.getMsg());
+                // return result;
             } else {
                 userLog.setLoginstate(1);
                 userLog.setLogtxt("登录成功");
@@ -410,18 +411,71 @@ public class UserService extends JedisUtil {
                 result.setObj(userVo);
             }
         } else {
+            if(N_Utils.isNotEmpty(result.getObj())){
+                userVo = (UserVo) result.getObj();
+            }
             userLog.setLoginstate(2);
-            userLog.setLogtxt(result.getMsg() + "，密码：" + loginpwd);
+            if(result.getMsg().contains("密码错误")){
+                userLog.setLogtxt("登录失败，" + result.getMsg() + "，密码：" + loginpwd);
+            }else{
+                userLog.setLogtxt("登录失败，" + result.getMsg());
+            }
         }
+
         //保存登录日志
-        userLogService.saveSyncLoginLog(userLog,user,request);
-        boolean cloudsynclogin = ConfigKey.cloudsynclogin;//为true时代表同步云平台
-        if(cloudsynclogin && userLog.getLoginstate() !=null && userLog.getLoginstate() == 1){
-            userLogService.saveSyncUserLogin(userVo, user, userLog);
-        }
+        saveSyncLoginLog(userLog,user,userVo,request);
+
         return result;
     }
 
+    //保存登录日志
+    @Async("asyncPoolTaskExecutor")
+    public void saveSyncLoginLog(TUserLog userLog, TUser user,UserVo userVo, HttpServletRequest request) {
+        try {
+
+            userLog.setUserid(user.getUserid());
+            userLog.setUsername(user.getUsername());
+            userLog.setSchoolid(user.getSchoolid());
+            Integer usertype = user.getUsertype();
+            userLog.setUsertype(usertype);
+            String ultype = user.getUltype();
+            if (N_Utils.isNotEmpty(ultype) && ultype.equals("p_web") && usertype != null) {
+                //网页端学生和教师合并登录，前端传p_web,拼接完整的ultype
+                if (usertype == 2) {
+                    userLog.setUltype(user.getUltype() + "_s");
+                } else {
+                    userLog.setUltype(user.getUltype() + "_t");
+                }
+            } else {
+                userLog.setUltype(user.getUltype());
+            }
+
+            userLog.setVersionnum(user.getVersionnum());
+            int logintime = N_Utils.getSecondTimestamp();
+            userLog.setLogtime(logintime);
+
+            //获取请求ip并解析区域
+            String ip = UserUtil.getIpAddress(request);
+            String region = null;
+            if (N_Utils.isNotEmpty(ip)) {
+                IpRegionUtil ipRegionUtil = new IpRegionUtil();
+                region = ipRegionUtil.getIpForAddress(ip);
+            }
+            userLog.setLogip(ip);
+            userLog.setLogaddress(region);
+
+            boolean cloudsynclogin = ConfigKey.cloudsynclogin;//为true时代表同步云平台
+            if(cloudsynclogin && userLog.getLoginstate() !=null){
+                userLogService.saveSyncUserLogin(userVo, user, userLog);
+            }
+
+            userLogMapper.insertSelective(userLog);
+
+        } catch (Exception e) {
+            log.error("添加登录日志失败:" + e.getMessage());
+        }
+    }
+
     /**
      * 添加用户信息
      *

suser/src/main/resources/mapper/system/UserMapper.xml

@@ -340,4 +340,9 @@
         </if>
         where userid=#{user.userid}
     </update>
+
+    <!--获取当前区域码-->
+    <select id="getCloudCode" resultType="java.lang.String">
+        select cloudcode from t_cloud order by cloudid limit 1;
+    </select>
 </mapper>