1、课表同步调整

2、海康出入记录同步调整

src/main/java/com/xjrsoft/module/hikvision/util/OutInRecordUtil.java

@@ -123,13 +123,13 @@ public class OutInRecordUtil {
             LocalDateTime recordTimeDate = LocalDateTime.parse(recordTime, formatter);
             String attendanceStatus = discernTeacherStatus(recordTimeDate, status, userId);
 
-            String updSql = "UPDATE attendance_user_relation SET " +
-                    "attendance_status = '" + attendanceStatus + "', " +
-                    "attendance_time = '" + recordTime + "', " +
-                    "attendance_mode = '车辆', " +
-                    "car_number = '" + planNo + "' " +
-                    "WHERE user_id = '" + userId + "' AND delete_mark = 0";
-            SqlRunnerAdapter.db().update(updSql);
+//            String updSql = "UPDATE attendance_user_relation SET " +
+//                    "attendance_status = '" + attendanceStatus + "', " +
+//                    "attendance_time = '" + recordTime + "', " +
+//                    "attendance_mode = '车辆', " +
+//                    "car_number = '" + planNo + "' " +
+//                    "WHERE user_id = (SELECT source_id FROM hikvision_data WHERE hikvision_id = '" + userId + "' LIMIT 1) AND delete_mark = 0";
+//            SqlRunnerAdapter.db().update(updSql);
         }
     }
 

src/main/java/com/xjrsoft/module/job/JianyuekbScheduleTask.java

@@ -237,6 +237,7 @@ public class JianyuekbScheduleTask {
                 handleCourseAdjust(classList, startDateStr, endDateStr);
             }catch (Exception e){
                 Log.error(e.getMessage(), e);
+            }finally {
                 ongoing.remove(eduYearSerialNo);
                 redisUtil.set(taskKey, ongoing);
             }

src/test/java/com/xjrsoft/module/job/AttendanceRecordTaskTest.java

@@ -75,8 +75,8 @@ class AttendanceRecordTaskTest {
     @Test
     public void execute() {
 
-        LocalDateTime now = LocalDateTime.of(2024, 10, 1, 0, 0, 0);
-        for (int i = 0; i < 21; i ++){
+        LocalDateTime now = LocalDateTime.of(2024, 11, 1, 0, 0, 0);
+        for (int i = 0; i < 17; i ++){
             LocalDateTime startDateTime = now.plusDays(i).withHour(0).withMinute(0).withSecond(0).withNano(0);
             LocalDateTime endDateTime = startDateTime.plusDays(i).withHour(23).withMinute(59).withSecond(59);
 
@@ -93,11 +93,17 @@ class AttendanceRecordTaskTest {
      * @param endDateTime 结束时间
      */
     public void teacherAttendanceRecord(LocalDateTime startDateTime, LocalDateTime endDateTime, Integer timePeriod){
+        List<String> nameList = new ArrayList<>();
+        nameList.add("李顺");
+        nameList.add("袁凯");
+        nameList.add("童勇");
+        nameList.add("张伟（大）");
         List<User> teacherList = userService.list(
                 new MPJLambdaWrapper<User>()
                         .select(User::getId)
                         .select(User.class, x -> VoToColumnUtil.fieldsToColumns(User.class).contains(x.getProperty()))
                         .innerJoin(BaseTeacher.class, BaseTeacher::getUserId, User::getId)
+                        .in(User::getName, nameList)
         );
         List<Long> userIds = teacherList.stream().map(User::getId).collect(Collectors.toList());
         Map<Long, AttendanceRuleDetailsUserVo> teacherTodyRuleByUserId = ruleCategoryService.getTeacherTodyRuleByUserId(userIds);

src/test/java/com/xjrsoft/module/job/JianyuekbScheduleTaskTest2.java

@@ -137,7 +137,7 @@ class JianyuekbScheduleTaskTest2 {
         doExecute();
     }
     public void doExecute() {
-        String sql = "SELECT * FROM course_receive_msg WHERE delete_mark = 0 AND is_callback = null";
+        String sql = "SELECT * FROM course_receive_msg WHERE delete_mark = 0 AND is_callback is null";
         List<Map<String, Object>> receiveMsgs = SqlRunnerAdapter.db().selectList(sql);
         if(receiveMsgs.isEmpty()){
             return;