代码优化

epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/constant/ProjectConstant.java

@@ -6,7 +6,7 @@ package com.epmet.project.constant;
  **/
 public interface ProjectConstant {
 
-    String DATE = "date";
+    String DAY = "day";
     String MONTH = "month";
 
     /**

epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/project/ProjectController.java

@@ -72,7 +72,7 @@ public class ProjectController {
     @PostMapping("incrtrend")
     public Result<List<ProjectIncrTrendResultDTO>> incrTrend(@LoginUser TokenDto tokenDto, @RequestBody ProjectIncrTrendFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, ProjectIncrTrendFormDTO.ProjectIncr.class);
-        if (!ProjectConstant.DATE.equals(formDTO.getType()) && !ProjectConstant.MONTH.equals(formDTO.getType())) {
+        if (!ProjectConstant.DAY.equals(formDTO.getType()) && !ProjectConstant.MONTH.equals(formDTO.getType())) {
             throw new RenException(ProjectConstant.TYPE_EXCEPTION);
         }
         return new Result<List<ProjectIncrTrendResultDTO>>().ok(projectService.getProjectIncrTrend(tokenDto, formDTO));

epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java

@@ -133,7 +133,7 @@ public class ProjectServiceImpl implements ProjectService {
         String agencyId = getLoginUserDetails(tokenDto);
 
         //2:查询机关过去九十天日统计数据(sql降序取前九十条)
-        if (ProjectConstant.DATE.equals(formDTO.getType())) {
+        if (ProjectConstant.DAY.equals(formDTO.getType())) {
             resultList = projectDao.selectIncrTrendDaily(agencyId);
         }
 

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java

@@ -71,10 +71,11 @@ public class StatsProjectServiceImpl implements StatsProjectService {
             if (!CollectionUtils.isEmpty(customerIdList)) {
                 for (String customerId : customerIdList) {
                     try {
+                        log.debug("for循环统计机关-项目-日月数据，当前统计的客户Id:" + customerId);
                         //遍历统计每一个客户数据
                         customerAgencyStats(customerId);
                     } catch (Exception e) {
-                        log.error("项目-机关-数据统计程序错误，对应客户Id:"+customerId, e);
+                        log.error("项目-机关-数据统计程序错误，对应客户Id:" + customerId, e);
                         log.error("Error creating model JSON", e);
                     }
                 }
@@ -92,11 +93,13 @@ public class StatsProjectServiceImpl implements StatsProjectService {
         DimIdGenerator.DimIdBean dimId = DimIdGenerator.getDimIdBean(date);
 
         //2:根据客户Id查询机关维度表数据
+        log.debug("StatsProjectServiceImpl.customerAgencyStats-根据客户Id查询机关维度数据，当前客户Id:" + customerId);
         DimAgencyDTO dimAgencyDTO = new DimAgencyDTO();
         dimAgencyDTO.setCustomerId(customerId);
         List<DimAgencyDTO> dimAgencyList = dimAgencyService.getDimAgencyList(dimAgencyDTO);
 
         //3:根据客户Id查询项目业务表已结案数据(查询传入日期及之前的数据)
+        log.debug("StatsProjectServiceImpl.customerAgencyStats-根据客户Id查询项目业务表结案数据，当前客户Id:"+customerId);
         ProjectEntity projectEntity = new ProjectEntity();
         projectEntity.setCustomerId(customerId);
         projectEntity.setCreatedTime(date);
@@ -104,16 +107,19 @@ public class StatsProjectServiceImpl implements StatsProjectService {
         List<ProjectEntity> projectList = projectService.getProjectList(projectEntity);
 
         //4:查询项目处理进展表中有效数据(创建日期截取yyyy-mm-dd格式字段值)(查询传入日期及之前的数据)
+        log.debug("StatsProjectServiceImpl.customerAgencyStats-根据客户Id查询项目进展表业务数据，当前客户Id:"+customerId);
         List<ProjectProcessEntity> processList = projectProcessService.getProcessList(projectEntity);
 
         //5:机关层级日月统计
         if (null != dimAgencyList && dimAgencyList.size() > NumConstant.ZERO) {
             //5.1:执行机关日数据统计
+            log.debug("StatsProjectServiceImpl.customerAgencyStats-开始执行机关日统计方法，方法名:agencyDateProjectStats,客户Id:"+customerId);
             agencyDateProjectStats(customerId, dimId, dimAgencyList, projectList, processList);
 
             //5.2:执行机关月数据统计
             //if (Calendar.getInstance().get(Calendar.DATE) == 1) {
-                agencyMonthProjectStats(customerId, dimId, dimAgencyList);
+            log.debug("StatsProjectServiceImpl.customerAgencyStats-开始执行机关月统计方法，方法名:agencyMonthProjectStats,客户Id:"+customerId);
+            agencyMonthProjectStats(customerId, dimId, dimAgencyList);
             //}
         }
 
@@ -350,7 +356,7 @@ public class StatsProjectServiceImpl implements StatsProjectService {
                         //遍历统计每一个客户数据
                         customerGridStats(customerId);
                     } catch (Exception e) {
-                        log.error("项目-网格-数据统计程序错误，对应客户Id:"+customerId, e);
+                        log.error("项目-网格-数据统计程序错误，对应客户Id:" + customerId, e);
                         log.error("Error creating model JSON", e);
                     }
                 }
@@ -387,11 +393,12 @@ public class StatsProjectServiceImpl implements StatsProjectService {
 
             //5.2:执行网格月数据统计
             //if (Calendar.getInstance().get(Calendar.DATE) == 1) {
-                gridMonthProjectStats(customerId, dimId, dimGridList);
+            gridMonthProjectStats(customerId, dimId, dimGridList);
             //}
         }
 
     }
+
     /**
      * @param customerId
      * @return