1.修改更新氚云数据方法

src/main/java/com/galaxis/manatee/service/LogUpdateService.java

@@ -14,7 +14,6 @@ import com.galaxis.manatee.entity.chuanyun.dto.ChuanyunWeekMemberHourDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.data.domain.PageRequest;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
@@ -47,117 +46,130 @@ public class LogUpdateService {
     /**
      * 更新所有日工时
      */
-    public void updateAllChuanyunSelfWorkHour(){
+    public void updateAllChuanyunSelfWorkHour() {
         long startTime = Instant.now().getEpochSecond();
-        var pageSize = 20;
+        var pageSize = 200;
         var page = 0;
-        while (true){
-            var pageable = PageRequest.of(page, pageSize);
-            var updateList = chuanyunSelfWorkHourDao.findAll(pageable);
-            if (page <= updateList.getTotalPages()) {
-                page += 1;
-                this.updateChuanyunSelfWorkHourList(updateList.toList());
-            }else{
-                break;
+        while (true) {
+            try {
+                var pageable = PageRequest.of(page, pageSize);
+                var updateList = chuanyunSelfWorkHourDao.findAll(pageable);
+                if (page <= updateList.getTotalPages()) {
+                    page += 1;
+                    this.updateChuanyunSelfWorkHourList(updateList.toList());
+                } else {
+                    break;
+                }
+            } catch (Exception e) {
+                log.error(e.getMessage(), e);
+                log.error("更新每日工时异常");
             }
+
         }
-        log.info("更新所有每日工时花费"+(Instant.now().getEpochSecond()-startTime)+"秒");
+        log.info("更新所有每日工时花费" + (Instant.now().getEpochSecond() - startTime) + "秒");
     }
 
     /**
      * 更新所有周工时
      */
-    @Async
-    public void updateAllChuanyunWeekMemberHour(){
+    public void updateAllChuanyunWeekMemberHour() {
         long startTime = Instant.now().getEpochSecond();
         var pageSize = 20;
         var page = 0;
-        while (true){
-            var pageable = PageRequest.of(page, pageSize);
-            var updateList = chuanyunWeekMemberHourDao.findAll(pageable);
-            if (page <= updateList.getTotalPages()) {
-                page += 1;
-                this.updateChuanyunWeekMemberHourList(updateList.toList());
-            }else{
-                break;
+        while (true) {
+            try {
+                var pageable = PageRequest.of(page, pageSize);
+                var updateList = chuanyunWeekMemberHourDao.findAll(pageable);
+                if (page <= updateList.getTotalPages()) {
+                    page += 1;
+                    this.updateChuanyunWeekMemberHourList(updateList.toList());
+                } else {
+                    break;
+                }
+            } catch (Exception e) {
+                log.error(e.getMessage(), e);
+                log.error("更新周工时异常");
             }
         }
-        log.info("更新所有每周工时花费"+(Instant.now().getEpochSecond()-startTime)+"秒");
+        log.info("更新所有每周工时花费" + (Instant.now().getEpochSecond() - startTime) + "秒");
     }
 
     /**
      * 更新所有月工时
      */
-    @Async
-    public void updateAllChuanyunSelfCost(){
+    public void updateAllChuanyunSelfCost() {
         long startTime = Instant.now().getEpochSecond();
         var pageSize = 20;
         var page = 0;
-        while (true){
+        while (true) {
             var pageable = PageRequest.of(page, pageSize);
             var updateList = chuanyunSelfCostDao.findAll(pageable);
             if (page <= updateList.getTotalPages()) {
                 page += 1;
                 this.updateChuanyunSelfCostList(updateList.toList());
-            }else{
+            } else {
                 break;
             }
         }
-        log.info("更新所有每月工时花费"+(Instant.now().getEpochSecond()-startTime)+"秒");
+        log.info("更新所有每月工时花费" + (Instant.now().getEpochSecond() - startTime) + "秒");
     }
 
     /**
      * 更新最近一个月的标准每日工时
      */
-    public void updateRecentChuanyunSelfWorkHour(){
+    public void updateRecentChuanyunSelfWorkHour() {
         long startTime = Instant.now().getEpochSecond();
         var pageSize = 20;
         var page = 0;
-        while (true){
+        while (true) {
             var pageable = PageRequest.of(page, pageSize);
             var updateList = chuanyunSelfWorkHourDao.getRecentlyDayHour(pageable);
             if (page <= updateList.getTotalPages()) {
                 page += 1;
                 this.updateChuanyunSelfWorkHourList(updateList.toList());
-            }else{
+            } else {
                 break;
             }
         }
-        log.info("更新最近一个月每日工时花费"+(Instant.now().getEpochSecond()-startTime)+"秒");
+        log.info("更新最近一个月每日工时花费" + (Instant.now().getEpochSecond() - startTime) + "秒");
     }
 
     /**
      * 根据用户Id更新氚云每日工时列表
-     * @param userId    用户ID
+     *
+     * @param userId 用户ID
      */
-    public void updateChuanyunSelfWorkHourListByUserId(String userId){
-        List<ChuanyunSelfWorkHourDO> updateList=chuanyunSelfWorkHourDao.findByUserId(userId);
+    public void updateChuanyunSelfWorkHourListByUserId(String userId) {
+        List<ChuanyunSelfWorkHourDO> updateList = chuanyunSelfWorkHourDao.findByUserId(userId);
         this.updateChuanyunSelfWorkHourList(updateList);
     }
 
     /**
      * 根据用户Id更新氚云每周工时列表
-     * @param userId    用户ID
+     *
+     * @param userId 用户ID
      */
-    public void updateChuanyunWeekMemberHourListByUserId(String userId){
-        List<ChuanyunWeekMemberHourDO> updateList=chuanyunWeekMemberHourDao.findByUserId(userId);
+    public void updateChuanyunWeekMemberHourListByUserId(String userId) {
+        List<ChuanyunWeekMemberHourDO> updateList = chuanyunWeekMemberHourDao.findByUserId(userId);
         this.updateChuanyunWeekMemberHourList(updateList);
     }
 
     /**
      * 根据用户Id更新氚云每月工时列表
-     * @param userId    用户ID
+     *
+     * @param userId 用户ID
      */
-    public void updateChuanyunSelfCostListByUserId(String userId){
-        List<ChuanyunSelfCostDO> updateList=chuanyunSelfCostDao.findByUserId(userId);
+    public void updateChuanyunSelfCostListByUserId(String userId) {
+        List<ChuanyunSelfCostDO> updateList = chuanyunSelfCostDao.findByUserId(userId);
         this.updateChuanyunSelfCostList(updateList);
     }
 
     /**
      * 根据标准日工时列表更新
-     * @param updateList    更新列表
+     *
+     * @param updateList 更新列表
      */
-    public void updateChuanyunSelfWorkHourList(List<ChuanyunSelfWorkHourDO> updateList){
+    public void updateChuanyunSelfWorkHourList(List<ChuanyunSelfWorkHourDO> updateList) {
         updateList.forEach(chuanyunSelfWorkHourDO -> {
             try {
                 //
@@ -179,21 +191,21 @@ public class LogUpdateService {
                 dataArcherService.updateSelfWorkHour(chuanyunSelfWorkHourDTO);
 
             } catch (Exception e) {
-                e.printStackTrace();
-                log.warn("更新标准工时异常");
+                log.error("更新标准工时异常", e);
             }
         });
     }
 
     /**
      * 根据标准周工时列表更新
-     * @param updateList    更新列表
+     *
+     * @param updateList 更新列表
      */
-    public void updateChuanyunWeekMemberHourList(List<ChuanyunWeekMemberHourDO> updateList){
+    public void updateChuanyunWeekMemberHourList(List<ChuanyunWeekMemberHourDO> updateList) {
         updateList.forEach(chuanyunWeekMemberHourDO -> {
             //更新氚云
             try {
-                String departmentId=chuanyunUserCompanyDao.findByUserId(chuanyunWeekMemberHourDO.getUserId()).getDepartmentId();
+                String departmentId = chuanyunUserCompanyDao.findByUserId(chuanyunWeekMemberHourDO.getUserId()).getDepartmentId();
                 ChuanyunWeekMemberHourDTO chuanyunWeekMemberHourDTO = new ChuanyunWeekMemberHourDTO();
                 chuanyunWeekMemberHourDTO.setProjectId(chuanyunWeekMemberHourDO.getProjectId());
                 chuanyunWeekMemberHourDTO.setUserId(chuanyunWeekMemberHourDO.getUserId());
@@ -206,16 +218,17 @@ public class LogUpdateService {
                 dataArcherService.updateWeekMemberHour(chuanyunWeekMemberHourDTO);
             } catch (Exception e) {
                 e.printStackTrace();
-                log.warn("更新每周工时异常"+chuanyunWeekMemberHourDO);
+                log.warn("更新每周工时异常" + chuanyunWeekMemberHourDO);
             }
         });
     }
 
     /**
      * 根据标准月工时列表更新
-     * @param updateList    更新列表
+     *
+     * @param updateList 更新列表
      */
-    public void updateChuanyunSelfCostList(List<ChuanyunSelfCostDO> updateList){
+    public void updateChuanyunSelfCostList(List<ChuanyunSelfCostDO> updateList) {
         updateList.forEach(chuanyunSelfCostDO -> {
             try {
                 ChuanyunSelfCostDTO chuanyunSelfCostDTO = new ChuanyunSelfCostDTO();
@@ -232,9 +245,9 @@ public class LogUpdateService {
                 if (!StringUtils.isEmpty(chuanyunSelfCostDO.getProjectId())) {
                     dataArcherService.updateChuanyunSelfCost(chuanyunSelfCostDTO);
                 }
-            }catch (Exception e){
+            } catch (Exception e) {
                 e.printStackTrace();
-                log.warn("更新每月工时异常"+chuanyunSelfCostDO);
+                log.warn("更新每月工时异常" + chuanyunSelfCostDO);
             }
         });
     }