face status

bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysUser.java

@@ -89,6 +89,11 @@ public class SysUser extends BaseEntity {
      */
     private String photoUrl;
 
+    /**
+     * 人脸上传状态(0-未上传 1-成功 2-失败)
+     */
+    private String faceStatus;
+
     /** 生日 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd")
@@ -290,6 +295,13 @@ public class SysUser extends BaseEntity {
         this.photoUrl = photoUrl;
     }
 
+    public String getFaceStatus() {
+        return faceStatus;
+    }
+
+    public void setFaceStatus(String faceStatus) {
+        this.faceStatus = faceStatus;
+    }
 
     public String getBirthday() {
         return birthday;

bonus-modules/bonus-system/src/main/java/com/bonus/system/warning/ScheduledTasks.java

@@ -30,15 +30,15 @@ public class ScheduledTasks {
     }
 
     // 每6个小时执行
-//    @Scheduled(fixedRate = 5*60*1000)
-//    public void taskToChangeUserStatus() {
-//        System.out.println("用户状态修正任务开始执行，执行时间：" + LocalDateTime.now().format(formatter));
-//        List<SysUser> sysUsers = userService.selectUserList4Job(new SysUser());
-//        for (SysUser sysUser : sysUsers) {
-//            userService.setUserStatus(sysUser);
-//            userService.updateUserStatus4Job(sysUser);
-//        }
-//    }
+    @Scheduled(fixedRate = 10*60*1000)
+    public void taskToChangeUserStatus() {
+        System.out.println("用户状态修正任务开始执行，执行时间：" + LocalDateTime.now().format(formatter));
+        List<SysUser> sysUsers = userService.selectUserList4Job(new SysUser());
+        for (SysUser sysUser : sysUsers) {
+            userService.setUserStatus(sysUser);
+            userService.updateUserStatus4Job(sysUser);
+        }
+    }
 
 //    // 每天凌晨1点执行
 //    @Scheduled(cron = "0 */5 * * * ?")

bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -16,6 +16,7 @@
         <result property="sex" column="sex"/>
         <result property="avatar" column="avatar"/>
         <result property="photoUrl" column="photo_url"/>
+        <result property="faceStatus" column="face_status"/>
         <result property="birthday" column="birthday"/>
         <result property="password" column="password"/>
         <result property="status" column="status"/>
@@ -72,6 +73,11 @@
                u.email,
                u.avatar,
                uf.photo_url,
+               CASE
+                   WHEN uf.photo_url is not null THEN '1'
+                   WHEN u.photo_url is null THEN '0'
+                   ELSE '2'
+                   END AS face_status,
                u.birthday,
                u.phonenumber,
                u.password,
@@ -113,13 +119,19 @@
     <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
         select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber,u.sex, u.status, u.birthday,
                 u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,u.approval_status,
-                u.is_permanent,u.is_built_in, uf.photo_url, u.effective_start_day, u.effective_end_day,
+                u.is_permanent,u.is_built_in, u.effective_start_day, u.effective_end_day,
                 d.dept_name, d.leader,r.role_id,
                 r.role_name,
                 r.role_key,
                 r.role_sort,
                 r.data_scope,
-                r.status as role_status
+                r.status as role_status,
+                uf.photo_url,
+                CASE
+                    WHEN uf.photo_url is not null THEN '1'
+                    WHEN u.photo_url is null THEN '0'
+                    ELSE '2'
+                END AS face_status
         from sys_user u
         left join sys_dept d on u.dept_id = d.dept_id
         left join sys_user_role ur on u.user_id = ur.user_id