Commit 0b5188d1 authored by 赵啸非's avatar 赵啸非

整理代码

parent b3de2e8a
...@@ -43,7 +43,8 @@ public class CalculateDayAttendTaskImpl implements ITaskExcuteService { ...@@ -43,7 +43,8 @@ public class CalculateDayAttendTaskImpl implements ITaskExcuteService {
//查询当日考勤记录,查询未考勤人员,构造一条假记录方便计算 //查询当日考勤记录,查询未考勤人员,构造一条假记录方便计算
try { try {
//清除当天考勤记录缓存 //清除当天考勤记录缓存
attendanceRecordDetailService.loadCache(); //attendanceRecordDetailService.loadCache();
AttendanceRecordHikQuery recordHikQuery = new AttendanceRecordHikQuery(); AttendanceRecordHikQuery recordHikQuery = new AttendanceRecordHikQuery();
recordHikQuery.setAttendanceDateStart(DateUtil.today()); recordHikQuery.setAttendanceDateStart(DateUtil.today());
recordHikQuery.setAttendanceDateEnd(DateUtil.today()); recordHikQuery.setAttendanceDateEnd(DateUtil.today());
......
...@@ -63,10 +63,6 @@ public class SyncDoorsEventAfterTaskImpl implements ITaskExcuteService { ...@@ -63,10 +63,6 @@ public class SyncDoorsEventAfterTaskImpl implements ITaskExcuteService {
boolean in = DateUtil.isIn(new Date(), beginDateTime, endDateTime); boolean in = DateUtil.isIn(new Date(), beginDateTime, endDateTime);
if (in) { if (in) {
calculateAttendByDay(); calculateAttendByDay();
/* AttendanceSummaryQuery query = new AttendanceSummaryQuery();
query.setSummaryTimeStart(DateUtil.today());
query.setSummaryTimeEnd(DateUtil.today());
cacheService.lpush(KEY_ATTENDANCE_STAT_CACHE, query);*/
} }
//统计当日 //统计当日
log.info("统计当日考勤"); log.info("统计当日考勤");
......
...@@ -14,7 +14,7 @@ import java.util.List; ...@@ -14,7 +14,7 @@ import java.util.List;
* @author zxfei * @author zxfei
* @date 2023-04-07 * @date 2023-04-07
*/ */
public interface AttendanceRecordDetailService extends ICRUDCacheService<AttendanceRecordDetailEntity,Long> { public interface AttendanceRecordDetailService extends ICRUDService<AttendanceRecordDetailEntity,Long> {
/** /**
* 查询每日打卡记录明细 * 查询每日打卡记录明细
* @param query * @param query
......
...@@ -26,12 +26,12 @@ import java.util.Map; ...@@ -26,12 +26,12 @@ import java.util.Map;
* @date 2023-04-07 * @date 2023-04-07
*/ */
@Service("attendanceRecordDetailService") @Service("attendanceRecordDetailService")
public class AttendanceRecordDetailServiceImpl extends AbstractCRUDCacheServiceImpl<AttendanceRecordDetailDao, AttendanceRecordDetailEntity, Long> implements AttendanceRecordDetailService { public class AttendanceRecordDetailServiceImpl extends AbstractCRUDServiceImpl<AttendanceRecordDetailDao, AttendanceRecordDetailEntity, Long> implements AttendanceRecordDetailService {
@Autowired @Autowired
private AttendanceRecordService attendanceRecordService; private AttendanceRecordService attendanceRecordService;
@Override /* @Override
public void loadCache() { public void loadCache() {
//仅读取当日数据 //仅读取当日数据
log.info("removeAllCache..." + this.getCacheName()); log.info("removeAllCache..." + this.getCacheName());
...@@ -47,7 +47,7 @@ public class AttendanceRecordDetailServiceImpl extends AbstractCRUDCacheServiceI ...@@ -47,7 +47,7 @@ public class AttendanceRecordDetailServiceImpl extends AbstractCRUDCacheServiceI
this.putCache(entity.getId().toString(), entity); this.putCache(entity.getId().toString(), entity);
}); });
}); });
} }*/
@Override @Override
public List<AttendanceRecordDetailEntity> getListByWhere(AttendanceRecordQuery query) { public List<AttendanceRecordDetailEntity> getListByWhere(AttendanceRecordQuery query) {
......
...@@ -120,8 +120,6 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte ...@@ -120,8 +120,6 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
List<AttendanceRecordEntity> saveList = new ArrayList<>(); List<AttendanceRecordEntity> saveList = new ArrayList<>();
List<AttendanceRecordEntity> updateList = new ArrayList<>(); List<AttendanceRecordEntity> updateList = new ArrayList<>();
listMap.entrySet().stream().forEach(itemEntry -> { listMap.entrySet().stream().forEach(itemEntry -> {
// });
// for (Map.Entry<Long, List<AttendanceRecordHikEntity>> itemEntry : listMap.entrySet()) {
//按人员 todo 改为多线程并行计算 //按人员 todo 改为多线程并行计算
Long staffId = itemEntry.getKey(); Long staffId = itemEntry.getKey();
List<AttendanceRecordHikEntity> recordHikEntityList = itemEntry.getValue(); List<AttendanceRecordHikEntity> recordHikEntityList = itemEntry.getValue();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment