上线审核配合 隐私政策同意状态以及同意时间

jd-logistics-api/jd-logistics-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java

@@ -70,7 +70,11 @@ public class SysUser extends BaseEntity
     /** 最后登录时间 */
     @Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
     private Date loginDate;
+    /** 最早登录时间 */
+    @Excel(name = "最早登录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
+    private Date loginFirstDate;
 
+    private String agreeFlag;
     /** 密码最后更新时间 */
     private Date pwdUpdateDate;
 
@@ -322,6 +326,22 @@ public class SysUser extends BaseEntity
         this.openId = openId;
     }
 
+    public void setLoginFirstDate(Date loginFirstDate) {
+        this.loginFirstDate = loginFirstDate;
+    }
+
+    public void setAgreeFlag(String agreeFlag) {
+        this.agreeFlag = agreeFlag;
+    }
+
+    public Date getLoginFirstDate() {
+        return loginFirstDate;
+    }
+
+    public String getAgreeFlag() {
+        return agreeFlag;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

jd-logistics-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java

@@ -19,6 +19,8 @@ import com.ruoyi.system.api.RemoteUserService;
 import com.ruoyi.system.api.domain.SysUser;
 import com.ruoyi.system.api.model.LoginUser;
 
+import java.util.Date;
+
 /**
  * 登录校验方法
  * 
@@ -93,10 +95,35 @@ public class SysLoginService
         }
         passwordService.validate(user, password);
         recordLogService.recordLogininfor(username, Constants.LOGIN_SUCCESS, "登录成功");
-        recordLoginInfo(user.getUserId());
+        //recordLoginInfo(user.getUserId());
+        recordLoginInfoAndPolicy(user);
         return userInfo;
     }
 
+    /**
+     * 记录登录信息
+     *
+     * @paramuser
+     */
+    public void recordLoginInfoAndPolicy( SysUser user)
+    {
+        SysUser sysUser = new SysUser();
+        sysUser.setUserId(user.getUserId());
+        if("0".equals(user.getAgreeFlag())){
+            sysUser.setLoginFirstDate(new Date());
+            sysUser.setAgreeFlag("1");
+        }
+        // 更新用户登录IP
+        sysUser.setLoginIp(IpUtils.getIpAddr());
+        // 更新用户登录时间
+        sysUser.setLoginDate(DateUtils.getNowDate());
+
+
+        remoteUserService.recordUserLogin(sysUser, SecurityConstants.INNER);
+    }
+
+
+
     /**
      * 记录登录信息
      *
@@ -208,8 +235,8 @@ public class SysLoginService
             throw new ServiceException("对不起，您的账号：" + username + " 已停用");
         }
         recordLogService.recordLogininfor(username, Constants.LOGIN_SUCCESS, "登录成功");
-        recordLoginInfo(user.getUserId());
-
+        //recordLoginInfo(user.getUserId());
+        recordLoginInfoAndPolicy(user);
         return userInfo;
     }
 

jd-logistics-modules/jd-logistics-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -24,6 +24,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"     column="update_by"        />
         <result property="updateTime"   column="update_time"      />
         <result property="remark"       column="remark"           />
+		<result property="loginFirstDate"   column="login_first_date"      />
+		<result property="agreeFlag"       column="agree_flag"           />
         <association property="dept"    javaType="SysDept"         resultMap="deptResult" />
         <collection  property="roles"   javaType="java.util.List"  resultMap="RoleResult" />
     </resultMap>
@@ -48,7 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 	
 	<sql id="selectUserVo">
-        select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.pwd_update_date, u.create_by, u.create_time, u.remark, 
+        select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.pwd_update_date, u.create_by, u.create_time, u.remark,u.login_first_date,u.agree_flag,
         d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
         r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
         from sys_user u
@@ -196,6 +198,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="loginDate != null">login_date = #{loginDate},</if>
  			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
  			<if test="remark != null">remark = #{remark},</if>
+			<if test="loginFirstDate != null">login_first_date = #{loginFirstDate},</if>
+			<if test="agreeFlag != null">agree_flag = #{agreeFlag},</if>
  			update_time = sysdate()
  		</set>
  		where user_id = #{userId}