1.调整了不使用的代码

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

@@ -83,15 +83,14 @@ public class LogCheckService {
         long start = System.currentTimeMillis();
         log.info("开始核对标准化周工时");
         List<ChuanyunWeekMemberHourDO> list = chuanyunWeekMemberHourDao.getWeekMemberHourByUserId(userId);
-        List<ChuanyunWeekMemberHourDO> oldlist = chuanyunWeekMemberHourDao.findByUserId(userId);
-        Map<String, Integer> map = new HashMap<>(list.size()+oldlist.size());
+        List<ChuanyunWeekMemberHourDO> oldList = chuanyunWeekMemberHourDao.findByUserId(userId);
+        Map<String, Integer> map = new HashMap<>(list.size()+oldList.size());
 
-        if (list.size()!=oldlist.size()){
+        if (list.size()!=oldList.size()){
             for (ChuanyunWeekMemberHourDO chuanyunWeekMemberHourDO : list){
                 map.put(chuanyunWeekMemberHourDO.getUserId()+chuanyunWeekMemberHourDO.getProjectId()+chuanyunWeekMemberHourDO.getProjectType()+chuanyunWeekMemberHourDO.getYear()+chuanyunWeekMemberHourDO.getWeek(),1);
             }
-            for (ChuanyunWeekMemberHourDO chuanyunWeekMemberHourDO : oldlist){
-//                if (!chuanyunWeekMemberHourDO.getProjectType().equals("生产项目")){
+            for (ChuanyunWeekMemberHourDO chuanyunWeekMemberHourDO : oldList){
                     Integer count = map.get(chuanyunWeekMemberHourDO.getUserId()+chuanyunWeekMemberHourDO.getProjectId()+chuanyunWeekMemberHourDO.getProjectType()+chuanyunWeekMemberHourDO.getYear()+chuanyunWeekMemberHourDO.getWeek());
                     if (count==null){
                         chuanyunWeekMemberHourDao.delete(chuanyunWeekMemberHourDO);
@@ -110,7 +109,6 @@ public class LogCheckService {
                         }
                         log.info(chuanyunWeekMemberHourDO.getUserId()+"删除项目"+chuanyunWeekMemberHourDO.getProjectId()+"时间为"+chuanyunWeekMemberHourDO.getYear()+"年"+chuanyunWeekMemberHourDO.getWeek()+"周工时");
                     }
-//                }
             }
         }
         log.info("核对耗时" + (System.currentTimeMillis() - start) + "毫秒");
@@ -140,7 +138,6 @@ public class LogCheckService {
                 map.put(chuanyunSelfWorkHourDO.getUserId()+chuanyunSelfWorkHourDO.getProjectId()+chuanyunSelfWorkHourDO.getProjectType()+chuanyunSelfWorkHourDO.getDayLogDate().withDayOfMonth(1),1);
             }
             for (ChuanyunSelfCostDO chuanyunSelfCostDO : costDOList){
-//                if (!chuanyunSelfCostDO.getProjectType().equals("生产项目")){
                     Integer count = map.get(chuanyunSelfCostDO.getUserId()+chuanyunSelfCostDO.getProjectId()+chuanyunSelfCostDO.getProjectType()+chuanyunSelfCostDO.getDayLogDate().withDayOfMonth(1));
                     if (count==null){
                         chuanyunSelfCostDao.delete(chuanyunSelfCostDO);
@@ -158,72 +155,12 @@ public class LogCheckService {
                         }
                         log.info(chuanyunSelfCostDO.getUserId()+"删除项目"+chuanyunSelfCostDO.getProjectId()+"时间为"+chuanyunSelfCostDO.getDayLogDate()+"月工时");
                     }
-//                }
             }
         }
         log.info("核对耗时" + (System.currentTimeMillis() - start) + "毫秒");
     }
 
     /**
-     * 根据projectId核对一下内容：
-     * 每日工时统计的每个项目的总工时（可用ChuanyunProjectCostDao中方法）,与系统中保存的每个项目工时进行比较
-     * 完成核对后，更新数据库中多余的每个项目工时
-     * 完成核对后，更新氚云中多余的每个项目工时
-     *
-     * @param projectId 项目ID
-     * @throws Exception 项目Id为空异常
-     */
-    public void checkProjectWorkHour(String projectId) throws Exception {
-        //@TODO
-        //***
-        //@TODO
-        updateChuanyunProjectWorkHour();
-        updateManateeProjectWorkHour();
-    }
-//
-//    /**
-//     * 更新氚云每周工时数据
-//     */
-//    private void updateChuanyunWeekWorkHour() {
-//        //@TODO
-//    }
-//
-//    /**
-//     * 更新Manatee数据库每周工时数据
-//     */
-//    private void updateManateeWeekWorkHour() {
-//        //@TODO
-//    }
-//
-//    /**
-//     * 更新氚云每月工时数据
-//     */
-//    private void updateChuanyunMonthWorkHour() {
-//        //@TODO
-//    }
-//
-//    /**
-//     * 更新Manatee数据库每月工时数据
-//     */
-//    private void updateManateeMonthWorkHour() {
-//        //@TODO
-//    }
-//
-    /**
-     * 更新氚云每个项目时数据
-     */
-    private void updateChuanyunProjectWorkHour() {
-        //@TODO
-    }
-
-    /**
-     * 更新Manatee数据库每个项目工时数据
-     */
-    private void updateManateeProjectWorkHour() {
-        //@TODO
-    }
-
-    /**
      * 删除多余每日工时
      *
      * @param chuanyunWorkHourList     日志原始工时

src/main/java/com/galaxis/manatee/task/LogCheckTask.java

@@ -1,6 +1,5 @@
 package com.galaxis.manatee.task;
 
-import com.galaxis.manatee.dao.ChuanyunGroupProjectDao;
 import com.galaxis.manatee.dao.ChuanyunUserCompanyDao;
 import com.galaxis.manatee.service.LogCheckService;
 import lombok.extern.slf4j.Slf4j;
@@ -18,12 +17,10 @@ public class LogCheckTask {
 
     private final LogCheckService logCheckService;
     private final ChuanyunUserCompanyDao chuanyunUserCompanyDao;
-    private final ChuanyunGroupProjectDao chuanyunGroupProjectDao;
 
-    public LogCheckTask(LogCheckService logCheckService, ChuanyunUserCompanyDao chuanyunUserCompanyDao, ChuanyunGroupProjectDao chuanyunGroupProjectDao) {
+    public LogCheckTask(LogCheckService logCheckService, ChuanyunUserCompanyDao chuanyunUserCompanyDao) {
         this.logCheckService = logCheckService;
         this.chuanyunUserCompanyDao = chuanyunUserCompanyDao;
-        this.chuanyunGroupProjectDao = chuanyunGroupProjectDao;
     }
 
     /**
@@ -33,7 +30,7 @@ public class LogCheckTask {
      * 2.遍历每个用户，核对每周、每月工时准确性
      * 3.遍历每个项目核对每个项目总工时
      */
-//    @Scheduled(fixedDelay = 432000000L)
+    @Scheduled(fixedDelay = 432000000L)
     private void checkLod(){
         chuanyunUserCompanyDao.findAll().forEach(chuanyunUserCompanyDO -> {
             long start=System.currentTimeMillis();
@@ -48,14 +45,5 @@ public class LogCheckTask {
             }
             log.info("修改"+chuanyunUserCompanyDO.getUserName()+"工时信息耗时"+(System.currentTimeMillis()-start));
         });
-        //核对每周、每月、每个项目工时准确性
-        chuanyunGroupProjectDao.findAll().forEach(chuanyunGroupProjectDO -> {
-            try{
-                logCheckService.checkProjectWorkHour(chuanyunGroupProjectDO.getObjectId());
-            }catch (Exception e){
-                log.error(""+chuanyunGroupProjectDO);
-                log.error(e.getMessage());
-            }
-        });
     }
 }