人脸更新

bonus-modules/bonus-system/src/main/java/com/bonus/system/att/dao/WechatPushDao.java

@@ -53,7 +53,7 @@ public interface WechatPushDao {
      * 审核人脸时调用
      * @String isCheck
      */
-    void checkWechatIsFace(String isCheck);
+    void checkWechatIsFace(SysUser user);
 
     /**
      * 查询请假数据

bonus-modules/bonus-system/src/main/java/com/bonus/system/att/tasks/WechatTasks.java

@@ -70,7 +70,7 @@ public class WechatTasks {
      * 人员基础数据同步定时器
      */
     //    @Scheduled(cron = "0 0/10 * * * ?")
-//    @Scheduled(fixedDelay = 60000 * 10)
+    @Scheduled(fixedDelay = 60000 * 10)
     @Async
     public void pushPersonTask() {
         log.info("--------人员基础数据同步定时器开启------");
@@ -84,10 +84,14 @@ public class WechatTasks {
         List<SysUser> wechatList = FastJsonHelper.jsonArrStrToBeanList(string, SysUser.class);
 //        //所有字段同步
         syncListsToDatabase(list, wechatList);
-//        //人脸更新
+        //人脸更新
-//        List<AttFaceBean> faceList = dao.getWebFaceList();
+        List<AttFaceBean> faceList = dao.getWebFaceList();
 //      List<AttFaceBean> wechatFaceList = dao.getWeChatFaceList();
-//        syncFaceToDatabase(faceList, wechatFaceList);
+        String jsonStr2 = "{}";
+        String method2 = "getWeChatFaceList";
+        String string2 = httpPost(method2, jsonStr2);
+        List<AttFaceBean> wechatFaceList = FastJsonHelper.jsonArrStrToBeanList(string2, AttFaceBean.class);
+        syncFaceToDatabase(faceList, wechatFaceList);
         log.info("--------人员基础数据同步定时器完毕------");
     }
 
@@ -141,7 +145,7 @@ public class WechatTasks {
     /**
      * 考勤数据同步定时器
      */
-    @Scheduled(fixedDelay = 60000 * 10)
+//    @Scheduled(fixedDelay = 60000 * 10)
     @Async
     public void wechatAttTask() {
         log.info("--------考勤数据定时器开启------");
@@ -183,13 +187,11 @@ public class WechatTasks {
         });
         //新增考勤到考勤来源表(数据过多时分批次插入)
         attTasks.insertAttSourceData(attSourceList);
-
         //将是否外勤更新到小程序库
 //        dao.updateWechatAttList(attSourceList);
         String jsonStr2 = FastJsonHelper.beanListToJsonArrStr(attSourceList);
         String method2 = "updateWechatAttList";
         String string2 = httpPost(method2, jsonStr2);
-
         log.info("--------考勤数据定时器完毕------");
     }
 
@@ -269,11 +271,9 @@ public class WechatTasks {
     }
 
 
-
     //人脸更新是调用的方法
 
 
-
     private String httpPost(String method, String jsonStr) {
         try {
             HttpResponse response = HttpRequest.post(IpAndPathConfig.getWechatUrl() + "/" + method)
@@ -290,5 +290,37 @@ public class WechatTasks {
         }
     }
 
+    /**
+     * 授予人脸重新录入权限时调用
+     * @param user
+     */
+    public int updateWechatIsFace(SysUser user){
+//        dao.updateWechatIsFace(user);
+        String jsonStr = FastJsonHelper.beanToJsonStr(user);
+        String method = "updateWechatIsFace";
+        String string = httpPost(method, jsonStr);
+        if("success".equals(string)){
+            return 1;
+        }else{
+            return 0;
+        }
+    }
+
+    /**
+     * 审核人脸时调用
+     * @String isCheck
+     */
+    public int checkWechatIsFace(SysUser user){
+//        dao.checkWechatIsFace(user);
+        String jsonStr = FastJsonHelper.beanToJsonStr(user);
+        String method = "checkWechatIsFace";
+        String string = httpPost(method, jsonStr);
+        if("success".equals(string)){
+            return 1;
+        }else{
+            return 0;
+        }
+    }
+
 
 }

bonus-modules/bonus-system/src/main/resources/mapper/att/WechatPushMapper.xml

@@ -8,7 +8,7 @@
         values(#{userId},#{userName},#{phone},#{password},#{isPd},#{isFace},#{updateTime},#{isCadre})
     </insert>
     <insert id="insertWebFace">
-        insert into sys_user_face(user_id,applied_face,applied_face_features,new_face,new_face_features,is_face,is_check)
+        insert into sys_user_face(user_id,applied_face,applied_face_features,new_face,new_face_features,is_check)
         values(#{userId},#{appliedFace},#{appliedFaceFeatures},#{newFace},#{newFaceFeatures},#{isCheck})
     </insert>
     <insert id="insertWebLeave" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
@@ -63,15 +63,7 @@
         <if test="isCheck == '2'">
             set is_check = #{isCheck},new_face = null,new_face_features = null
         </if>
-        where user_id = #{userId};
+        where user_id = #{userId}
-        update sys_user_face
-        <if test="isCheck == '1'">
-            set is_check = #{isCheck},applied_face = new_face,applied_face_features = new_face_features
-        </if>
-        <if test="isCheck == '2'">
-            set is_check = #{isCheck},new_face = null,new_face_features = null
-        </if>
-        where user_id = #{userId};
     </update>
     <update id="updateWechatLeave">
         update gz_attendance_wechat.leave_apply_wechat set id = #{id} where uuid = #{uuid}