From 763fddf71d8e116202e0e367f36a82a5e48fd4e9 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Mon, 29 Jun 2020 10:55:36 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=97=A5=E6=9C=9F=E7=BB=B4?=
 =?UTF-8?q?=E5=BA=A6=E5=88=9D=E5=A7=8B=E5=8C=96=EF=BC=8C=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E5=8C=96=E5=88=B0=E4=BB=BB=E5=8A=A1=E6=89=A7=E8=A1=8C=E5=BD=93?=
 =?UTF-8?q?=E5=A4=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/StatsDimServiceImpl.java |  3 ---
 .../service/stats/impl/DimDateServiceImpl.java      | 13 ++++++-------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsDimServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsDimServiceImpl.java
index ff97cf767b..fc0241db68 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsDimServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsDimServiceImpl.java
@@ -154,9 +154,6 @@ public class StatsDimServiceImpl implements StatsDimService {
         List<CustomerDepartmentEntity> departments = departmentService.listDepartmentsByCreatedTime(statsStartTime, statsEndTime);
         if (!CollectionUtils.isEmpty(departments)) {
             dimDepartmentService.initDepartmentDims(departments);
-            lastExecRecord.setExecTime(new Date());
-            // 记录最后一次统计时间
-            lastExecRecordService.updateById(lastExecRecord);
         }
     }
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimDateServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimDateServiceImpl.java
index f6f0d9ee55..15ae161fbb 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimDateServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimDateServiceImpl.java
@@ -115,20 +115,19 @@ public class DimDateServiceImpl extends BaseServiceImpl<DimDateDao, DimDateEntit
 
         Date now = new Date();
 
-        Date targetDate = DateUtils.addDateDays(DateUtils.parse(
-                DateUtils.format(now, DateUtils.DATE_PATTERN_YYYYMMDD),
-                DateUtils.DATE_PATTERN_YYYYMMDD), -1);
+        Date targetDate = DateUtils.integrate(now, DateUtils.DATE_PATTERN_YYYYMMDD);
 
-        Date lastDimDate = null;
+        Date lastExecTime = null;
 
-        if ((lastDimDate = lastExecRecord.getExecTime()) == null) {
+        if ((lastExecTime = lastExecRecord.getExecTime()) == null) {
             // 首次初始化按日维度
             initDimDate(targetDate);
             lastExecRecord.setExecTime(now);
             lastExecRecordService.updateById(lastExecRecord);
         } else {
-            if (targetDate.equals(lastDimDate) || targetDate.after(lastDimDate)) {
-                initDimDate(lastDimDate, targetDate);
+            Date lastDimDate = DateUtils.integrate(lastExecTime, DateUtils.DATE_PATTERN_YYYYMMDD);
+            if (targetDate.after(lastDimDate)) {
+                initDimDate(DateUtils.addDateDays(lastDimDate, 1), targetDate);
                 lastExecRecord.setExecTime(now);
                 lastExecRecordService.updateById(lastExecRecord);
             }