整理代码

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

@@ -103,8 +103,6 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
 
     public void addAttendanceOtherRecordList(List<AttendanceRecordHikEntity> hikEntityList, AttendanceRecordHikEntity attendanceRecordHikQuery, Context context) throws Exception {
 
-        StopWatch stopWatch = new StopWatch("stopwatch stat attendance");//耗时计算
-        stopWatch.start("数据获取");
         List<AttendanceRecordHikEntity> collect = hikEntityList.stream().sorted(Comparator.comparing(AttendanceRecordHikEntity::getAttendanceDate)).collect(Collectors.toList());
         Map<Long, List<AttendanceRecordHikEntity>> listMap = collect.stream().collect(Collectors.groupingBy(AttendanceRecordHikEntity::getStaffId));
         Map<Long, List<AttendanceGroupStaffEntity>> groupStaffMap = attendanceGroupStaffService.find(new AttendanceGroupStaffQuery()).parallelStream().collect(Collectors.groupingBy(x -> x.getStaffId()));
@@ -120,8 +118,6 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
         query.setAttendanceDateStart(attendanceDateStart);
         query.setAttendanceDateEnd(attendanceDateEnd);
         Map<Long, AttendanceRecordEntity> staffRecordMap = attendanceRecordService.find(query).parallelStream().collect(Collectors.toMap(x -> x.getStaffId(), y -> y, (o, n) -> n));
-        stopWatch.stop();
-        log.info("考勤数据获取耗时：{}ms", stopWatch.getLastTaskTimeMillis());
         //获取日期
         List<AttendanceRecordEntity> saveList = new ArrayList<>();
         List<AttendanceRecordEntity> updateList = new ArrayList<>();
@@ -184,7 +180,6 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
                     commonData.setRecordHikEntities(recordHikEntities);
                     commonData.setFixedSpecialGroupMap(fixedSpecialGroupMap);
                     commonData.setClassDetailEntityMap(classDetailEntityMap);
-                    commonData.setStopWatch(stopWatch);
                     workAbstract.doHandleWork(commonData);
                 }
                 //如果考勤人员信息list长度大于1 则该考勤人员有多个考勤组.
@@ -252,12 +247,7 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
                     }
                 }
             }
-            stopWatch.stop();
-            if(stopWatch.getLastTaskTimeMillis()>500){
-                log.info("考勤数据计算耗时：{}ms", stopWatch.getLastTaskTimeMillis());
-            }
         });
-        stopWatch.start("考勤新增与更新耗时");
         if (!ObjectUtils.isEmpty(saveList)) {
             log.info("新增考勤记录数：" + saveList.size());
             attendanceRecordService.save(saveList);
@@ -267,8 +257,6 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
             log.info("更新考勤记录数：" + updateList.size());
             attendanceRecordService.update(updateList);
         }
-        stopWatch.stop();
-        log.info("考勤数据新增与更新耗时：{}ms", stopWatch.getLastTaskTimeMillis());
     }
 
     public void addAttendanceRecordList(List<AttendanceRecordHikEntity> hikEntityList, Context context) throws Exception {

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

@@ -41,7 +41,6 @@ public class CommonData {
 
     private  Map<Long, List<AttendanceGroupFixedworkSpecialEntity>> fixedSpecialGroupMap;
 
-    private StopWatch stopWatch;
 
    // private Map<Long, List<AttendanceLeaveRecordEntity>> leaveRecordGroupMap;
 

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

@@ -287,9 +287,10 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
             }
         }
         //生成异常记录
-        StopWatch stopWatch =commonData.getStopWatch();
+        StopWatch stopWatch =new StopWatch();
         stopWatch.start("生成异常记录耗时");
         genErrorAttendRecord(commonData.getContext(), commonData.getDateStr(), commonData.getAttendanceRecordEntity(), commonData.getDetailEntityList());
+        stopWatch.stop();
         log.info("生成异常记录耗时：{}ms", stopWatch.getLastTaskTimeMillis());
     }