统计数据添加日志

epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml

@@ -159,7 +159,7 @@
                 )
             ) a
         ORDER BY
-            a.project_total DESC
+            a.project_total DESC, a.type ASC
     </select>
 
     <select id="selectIncrTrendDaily" resultType="com.epmet.project.dto.result.ProjectIncrTrendResultDTO">

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

@@ -113,13 +113,21 @@ public class StatsProjectServiceImpl implements StatsProjectService {
         //5:机关层级日月统计
         if (null != dimAgencyList && dimAgencyList.size() > NumConstant.ZERO) {
             //5.1:执行机关日数据统计
+            try {
                 log.info("StatsProjectServiceImpl.customerAgencyStats-开始执行机关日统计方法，方法名:agencyDateProjectStats,客户Id:" + customerId);
                 agencyDateProjectStats(customerId, dimId, dimAgencyList, projectList, processList);
+            } catch (Exception e) {
+                log.error(String.format(ProjectConstant.STATS_FAILED_PREFIX, "agencyDateProjectStats", customerId, dimId.getDateId(), e.getMessage()));
+            }
 
             //5.2:执行机关月数据统计
             //if (Calendar.getInstance().get(Calendar.DATE) == 1) {
+            try {
                 log.info("StatsProjectServiceImpl.customerAgencyStats-开始执行机关月统计方法，方法名:agencyMonthProjectStats,客户Id:" + customerId);
                 agencyMonthProjectStats(customerId, dimId, dimAgencyList);
+            } catch (Exception e) {
+                log.error(String.format(ProjectConstant.STATS_FAILED_PREFIX, "agencyMonthProjectStats", customerId, dimId.getMonthId(), e.getMessage()));
+            }
             //}
         }
 
@@ -397,13 +405,21 @@ public class StatsProjectServiceImpl implements StatsProjectService {
         //5:网格层级日月统计
         if (null != dimGridList && dimGridList.size() > NumConstant.ZERO) {
             //5.1:执行网格日数据统计
+            try {
                 log.info("StatsProjectServiceImpl.customerGridStats-开始执行机关日统计方法，方法名:gridDateProjectStats,客户Id:" + customerId);
                 gridDateProjectStats(customerId, dimId, dimGridList, projectList, processList);
+            } catch (Exception e) {
+                log.error(String.format(ProjectConstant.STATS_FAILED_PREFIX, "gridDateProjectStats", customerId, dimId.getDateId(), e.getMessage()));
+            }
 
             //5.2:执行网格月数据统计
             //if (Calendar.getInstance().get(Calendar.DATE) == 1) {
+            try {
                 log.info("StatsProjectServiceImpl.customerGridStats-开始执行机关月统计方法，方法名:gridMonthProjectStats,客户Id:" + customerId);
                 gridMonthProjectStats(customerId, dimId, dimGridList);
+            } catch (Exception e) {
+                log.error(String.format(ProjectConstant.STATS_FAILED_PREFIX, "gridMonthProjectStats", customerId, dimId.getMonthId(), e.getMessage()));
+            }
             //}
         }
 
@@ -636,7 +652,7 @@ public class StatsProjectServiceImpl implements StatsProjectService {
         try {
             DateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
             Calendar calendar = Calendar.getInstance();
-            //calendar.set(Calendar.HOUR_OF_DAY, -24);
+            calendar.set(Calendar.HOUR_OF_DAY, -24);
             String str = sdf.format(calendar.getTime());
             date = sdf.parse(str);
         } catch (Exception e) {