Ver código fonte

1.更新了标准化每日工时日志

verguenza 4 anos atrás
pai
commit
2158b58a6d

+ 2 - 0
src/main/java/com/galaxis/manatee/service/LogStandardService.java

@@ -48,10 +48,12 @@ public class LogStandardService {
     @Async
     public void standardHourByUserCompanyAndIsRecent(ChuanyunUserCompanyDO chuanyunUserCompanyDO, boolean isRecent) {
         if (!StringUtils.isEmpty(chuanyunUserCompanyDO.getUserId())) {
+            long start = Instant.now().getEpochSecond();
             //从日志原始数据中获取每人每个项目每天工时。
             //由isRecent判断是否只获取最近30天的数据
             List<ChuanyunWorkHourDO> selfList = isRecent ? chuanyunWorkHourDao.getSelfWorkHourRecently(chuanyunUserCompanyDO.getUserId()) : chuanyunWorkHourDao.getSelfWorkHour(chuanyunUserCompanyDO.getUserId());
             this.generateSelfWorkHourByWorkHourList(selfList);
+            log.info("每日工时标准化" + chuanyunUserCompanyDO.getUserName() + (Instant.now().getEpochSecond() - start) + "秒");
         }else {
             log.warn("用户信息中userId缺失");
         }

+ 2 - 7
src/main/java/com/galaxis/manatee/task/WorkHourStatistics.java

@@ -26,7 +26,6 @@ import org.springframework.util.StringUtils;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
@@ -89,12 +88,8 @@ public class WorkHourStatistics {
                 page += 1;
                 //逐个将员工每天工时进行统计汇总
                 List<ChuanyunUserCompanyDO> userCompanyDOList = chuanyunUserCompanyList.getContent();
-                userCompanyDOList.forEach(chuanyunUserCompanyDO -> {
-                    long start = Instant.now().getEpochSecond();
-                    //工时标准化
-                    logStandardService.standardHourByUserCompanyAndIsRecent(chuanyunUserCompanyDO, false);
-                    log.info("每日工时标准化" + chuanyunUserCompanyDO.getUserName() + (Instant.now().getEpochSecond() - start) + "秒");
-                });
+                //工时标准化
+                userCompanyDOList.forEach(chuanyunUserCompanyDO -> logStandardService.standardHourByUserCompanyAndIsRecent(chuanyunUserCompanyDO, false));
             } else {
                 break;
             }