|
@@ -15,12 +15,14 @@ import com.galaxis.manatee.entity.chuanyun.dto.Filter;
|
|
import com.galaxis.manatee.exception.BigSizeException;
|
|
import com.galaxis.manatee.exception.BigSizeException;
|
|
import com.galaxis.manatee.manager.ChuanYunManager;
|
|
import com.galaxis.manatee.manager.ChuanYunManager;
|
|
import com.galaxis.manatee.service.LogStandardService;
|
|
import com.galaxis.manatee.service.LogStandardService;
|
|
|
|
+import com.galaxis.manatee.service.LogUpdateService;
|
|
import com.galaxis.manatee.util.ChuanyunLocalDateTimeDeserializer;
|
|
import com.galaxis.manatee.util.ChuanyunLocalDateTimeDeserializer;
|
|
import com.galaxis.manatee.util.ChuanyunLocalDateTimeSerializer;
|
|
import com.galaxis.manatee.util.ChuanyunLocalDateTimeSerializer;
|
|
import lombok.Data;
|
|
import lombok.Data;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import org.springframework.data.domain.PageRequest;
|
|
import org.springframework.data.domain.PageRequest;
|
|
import org.springframework.scheduling.annotation.Async;
|
|
import org.springframework.scheduling.annotation.Async;
|
|
|
|
+import org.springframework.scheduling.annotation.Scheduled;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.util.StringUtils;
|
|
import org.springframework.util.StringUtils;
|
|
|
|
|
|
@@ -45,19 +47,29 @@ public class WorkHourStatistics {
|
|
private final ChuanyunWorkHourDao chuanyunWorkHourDao;
|
|
private final ChuanyunWorkHourDao chuanyunWorkHourDao;
|
|
private final ChuanyunSelfWorkHourDao chuanyunSelfWorkHourDao;
|
|
private final ChuanyunSelfWorkHourDao chuanyunSelfWorkHourDao;
|
|
private final ChuanyunSelfCostDao chuanyunSelfCostDao;
|
|
private final ChuanyunSelfCostDao chuanyunSelfCostDao;
|
|
- private final ChuanyunWeekMemberHourDao chuanyunWeekMemberHourDao;
|
|
|
|
private final ChuanyunMemberCostDao chuanyunMemberCostDao;
|
|
private final ChuanyunMemberCostDao chuanyunMemberCostDao;
|
|
private final LogStandardService logStandardService;
|
|
private final LogStandardService logStandardService;
|
|
|
|
+ private final LogUpdateService logUpdateService;
|
|
|
|
|
|
- public WorkHourStatistics(ChuanYunManager chuanYunManager, ChuanyunUserCompanyDao chuanyunUserCompanyDao, ChuanyunWorkHourDao chuanyunWorkHourDao, ChuanyunSelfWorkHourDao chuanyunSelfWorkHourDao, ChuanyunSelfCostDao chuanyunSelfCostDao, ChuanyunWeekMemberHourDao chuanyunWeekMemberHourDao, ChuanyunMemberCostDao chuanyunMemberCostDao, LogStandardService logStandardService) {
|
|
|
|
|
|
+ public WorkHourStatistics(ChuanYunManager chuanYunManager, ChuanyunUserCompanyDao chuanyunUserCompanyDao, ChuanyunWorkHourDao chuanyunWorkHourDao, ChuanyunSelfWorkHourDao chuanyunSelfWorkHourDao, ChuanyunSelfCostDao chuanyunSelfCostDao, ChuanyunMemberCostDao chuanyunMemberCostDao, LogStandardService logStandardService, LogUpdateService logUpdateService) {
|
|
this.chuanYunManager = chuanYunManager;
|
|
this.chuanYunManager = chuanYunManager;
|
|
this.chuanyunUserCompanyDao = chuanyunUserCompanyDao;
|
|
this.chuanyunUserCompanyDao = chuanyunUserCompanyDao;
|
|
this.chuanyunWorkHourDao = chuanyunWorkHourDao;
|
|
this.chuanyunWorkHourDao = chuanyunWorkHourDao;
|
|
this.chuanyunSelfWorkHourDao = chuanyunSelfWorkHourDao;
|
|
this.chuanyunSelfWorkHourDao = chuanyunSelfWorkHourDao;
|
|
this.chuanyunSelfCostDao = chuanyunSelfCostDao;
|
|
this.chuanyunSelfCostDao = chuanyunSelfCostDao;
|
|
- this.chuanyunWeekMemberHourDao = chuanyunWeekMemberHourDao;
|
|
|
|
this.chuanyunMemberCostDao = chuanyunMemberCostDao;
|
|
this.chuanyunMemberCostDao = chuanyunMemberCostDao;
|
|
this.logStandardService = logStandardService;
|
|
this.logStandardService = logStandardService;
|
|
|
|
+ this.logUpdateService = logUpdateService;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * 每3小时上传一次所有日工时、周工时、月工时
|
|
|
|
+ */
|
|
|
|
+ @Scheduled(fixedDelay = 10800000L)
|
|
|
|
+ public void updateHour(){
|
|
|
|
+ logUpdateService.updateAllChuanyunSelfWorkHour();
|
|
|
|
+ logUpdateService.updateAllChuanyunWeekMemberHour();
|
|
|
|
+ logUpdateService.updateAllChuanyunSelfCost();
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -65,7 +77,7 @@ public class WorkHourStatistics {
|
|
*/
|
|
*/
|
|
// @Scheduled(fixedDelay = 432000000L)
|
|
// @Scheduled(fixedDelay = 432000000L)
|
|
@Async
|
|
@Async
|
|
- public void updateHour() {
|
|
|
|
|
|
+ public void standardHour() {
|
|
//每日工时标准化
|
|
//每日工时标准化
|
|
standardWorkHour();
|
|
standardWorkHour();
|
|
standardWeeklyWorkHour();
|
|
standardWeeklyWorkHour();
|