添加请假跨天判读

attendance-performance-manager/src/main/java/com/mortals/xhx/daemon/task/SyncDoorsEventAfterTaskImpl.java

@@ -56,8 +56,8 @@ public class SyncDoorsEventAfterTaskImpl implements ITaskExcuteService {
         // syncDoorEvents();
         //判断时间段 不在时间段的 不做计算
         //早上9点 子晚上8点 计算
-        Date beginDateTime = DateUtil.parseDateTime(DateUtil.today() + " 09:00:00");
-        Date endDateTime = DateUtil.parseDateTime(DateUtil.today() + " 20:30:00");
+        Date beginDateTime = DateUtil.parseDateTime(DateUtil.today() + " 07:00:00");
+        Date endDateTime = DateUtil.parseDateTime(DateUtil.today() + " 23:30:00");
 
         boolean in = DateUtil.isIn(new Date(), beginDateTime, endDateTime);
         if (in) {

attendance-performance-manager/src/main/java/com/mortals/xhx/daemon/task/SyncDoorsEventTaskImpl.java

@@ -66,7 +66,7 @@ public class SyncDoorsEventTaskImpl implements ITaskExcuteService {
             day = 0;
         }
         Date beginDateTime=DateUtil.parseDateTime(DateUtil.today()+" 08:00:00");
-        Date endDateTime=DateUtil.parseDateTime(DateUtil.today()+" 20:30:00");
+        Date endDateTime=DateUtil.parseDateTime(DateUtil.today()+" 23:30:00");
 
         boolean in = DateUtil.isIn(new Date(), beginDateTime, endDateTime);
         if(in){

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/AttendanceRecordHikService.java

@@ -56,4 +56,7 @@ public interface AttendanceRecordHikService extends ICRUDService<AttendanceRecor
      */
     void buildCustomHikRecord(AttendanceRecordHikQuery recordHikQuery,Context context);
 
+
+    void buildSourceHikRecord(AttendanceRecordHikQuery recordHikQuery,Context context);
+
 }

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/web/AttendanceRecordHikController.java

@@ -207,6 +207,49 @@ public class AttendanceRecordHikController extends BaseCRUDJsonBodyMappingContro
     }
 
 
+
+
+    @PostMapping(value = "/addAttendanceHikRecordCustom")
+    @UnAuth
+    public Rest<String> addAttendanceHikRecordCustom(@RequestBody AttendanceRecordHikQuery hikEntity) {
+        Rest<String> ret = new Rest();
+        Map<String, Object> model = new HashMap();
+        Context context = this.getContext();
+        String busiDesc = "查询" + this.getModuleDesc();
+        int code = 1;
+        try {
+            //天数区间分段计算
+            DateTime attendStart = DateUtil.parseDate(hikEntity.getAttendanceDateStart());
+            DateTime attendEnd = DateUtil.parseDate(hikEntity.getAttendanceDateEnd());
+            Long compare = DateUtil.between(attendEnd, attendStart, DateUnit.DAY);
+            StopWatch stopWatch = new StopWatch("stopwatch attend1");
+            log.info("考勤计算天数区间：{}", compare);
+            for (int i = 0; i <= compare.intValue(); i++) {
+                DateTime curDate = DateUtil.offsetDay(attendStart, i);
+                log.info("考勤计算日期：{}", curDate.toDateStr());
+                stopWatch.start("执行本地方法");
+                hikEntity.setAttendanceDateStart(curDate.toDateStr());
+                hikEntity.setAttendanceDateEnd(curDate.toDateStr());
+                hikService.buildSourceHikRecord(hikEntity, context);
+                stopWatch.stop();
+                log.info("考勤计算日期：{} 完成,耗时：{}ms", curDate.toDateStr(), stopWatch.getLastTaskTimeMillis());
+            }
+            model.put("message_info", busiDesc + "成功");
+            this.recordSysLog(this.request, busiDesc + " 【成功】");
+        } catch (Exception e) {
+            code = -1;
+            this.doException(this.request, busiDesc, model, e);
+            model.put("message_info", e.getMessage());
+        }
+
+        this.init(model, context);
+        ret.setCode(code);
+        ret.setMsg(model.get("message_info") == null ? "" : model.remove("message_info").toString());
+        return ret;
+
+    }
+
+
     @Override
     protected void doListBefore(AttendanceRecordHikEntity query, Map<String, Object> model, Context context) throws AppException {
         if (query.getStaffName() != null && !query.getStaffName().equals("")) {

attendance-performance-manager/src/test/java/com/mortals/httpclient/system.http

@@ -61,8 +61,19 @@ Authorization: {{authToken}}
 Content-Type: application/json
 
 {
-  "attendanceDateStart":"2024-01-17",
-  "attendanceDateEnd":"2024-01-24"
+  "attendanceDateStart":"2023-12-01",
+  "attendanceDateEnd":"2024-01-25"
+}
+
+
+###海康考勤打卡记录原始记录同步
+POST {{baseUrl}}/attendance/record/hik/addAttendanceHikRecordCustom
+Authorization: {{authToken}}
+Content-Type: application/json
+
+{
+  "attendanceDateStart":"2024-01-01",
+  "attendanceDateEnd":"2024-01-25"
 }