优化考勤计算

attendance-performance-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/AttendSummaryService.java

@@ -44,13 +44,14 @@ public class AttendSummaryService implements IApplicationStartedService {
                             Thread.sleep(2000);
                             if (StringUtils.isNotEmpty(query.getSummaryTimeStart()) && StringUtils.isNotEmpty(query.getSummaryTimeEnd())) {
                                 List<String> dateList = getDatesBetween(query.getSummaryTimeStart(), query.getSummaryTimeEnd());
-                                for (String day : dateList) {
+                              dateList.parallelStream().forEach(day->{
+                             //   for (String day : dateList) {
                                     AttendanceSummaryQuery temp = new AttendanceSummaryQuery(day);
                                     if(query.getStaffId()!=null){
                                         temp.setStaffId(query.getStaffId());
                                     }
                                     attendanceStatService.doAttendanceSummary(temp);
-                                }
+                                });
                             } else {
                                 attendanceStatService.doAttendanceSummary(query);
                             }

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

@@ -152,7 +152,11 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
         query.setAttendanceDateEnd(attendanceDateEnd);
         Map<Long, AttendanceRecordEntity> staffRecordMap = attendanceRecordService.find(query).parallelStream().collect(Collectors.toMap(x -> x.getStaffId(), y -> y, (o, n) -> n));
 
-  /*      AttendanceLeaveRecordQuery leaveRecordQuery = new AttendanceLeaveRecordQuery();
+
+        /*   AttendanceRecordErrorQuery attendanceRecordErrorQuery = new AttendanceRecordErrorQuery();
+        attendanceRecordErrorQuery.setProcessStatus(ProcessStatusEnum.已处理.getValue());
+
+        AttendanceLeaveRecordQuery leaveRecordQuery = new AttendanceLeaveRecordQuery();
         leaveRecordQuery.setAuditResultList(Arrays.asList(1, 4));
         Map<Long, List<AttendanceLeaveRecordEntity>> leaveRecordGroupMap = attendanceLeaveRecordService.find(leaveRecordQuery).parallelStream().collect(Collectors.groupingBy(x -> x.getLeavePersonId()));
 */
@@ -162,8 +166,8 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
 
 
         listMap.entrySet().parallelStream().forEach(itemEntry -> {
-     //   });
-      //  for (Map.Entry<Long, List<AttendanceRecordHikEntity>> itemEntry : listMap.entrySet()) {
+            //   });
+            //  for (Map.Entry<Long, List<AttendanceRecordHikEntity>> itemEntry : listMap.entrySet()) {
             //按人员  todo 改为多线程并行计算
             Long staffId = itemEntry.getKey();
             List<AttendanceRecordHikEntity> recordHikEntityList = itemEntry.getValue();
@@ -304,7 +308,7 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
                 }
             }
         });
-       // }
+        // }
         if (!ObjectUtils.isEmpty(saveList)) {
             log.info("新增考勤记录数：" + saveList.size());
             attendanceRecordService.save(saveList);

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

@@ -37,8 +37,8 @@ POST {{baseUrl}}/attendance/record/hik/addAttendanceRecord
 Content-Type: application/json
 
 {
-  "attendanceDateStart": "2024-06-01",
-  "attendanceDateEnd": "2024-06-30"
+  "attendanceDateStart": "2024-08-01",
+  "attendanceDateEnd": "2024-08-15"
 }
 
 ###海康考勤打卡记录计算1