From 826778a2b82b03a42d173e5247748c21092cf435 Mon Sep 17 00:00:00 2001
From: xuyang <748613696@qq.com>
Date: Tue, 11 Apr 2023 15:56:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/njcn/device/pq/pojo/po/RStatOnlinerateD.java | 2 +-
 .../main/java/com/njcn/prepare/harmonic/utils/PublicUtil.java  | 1 -
 .../harmonic/service/mysql/Impl/line/IntegrityServiceImpl.java | 3 ++-
 .../service/mysql/Impl/line/OnlineRateServiceImpl.java         | 3 ++-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/RStatOnlinerateD.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/RStatOnlinerateD.java
index 6380f4d05..9d354161a 100644
--- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/RStatOnlinerateD.java
+++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/RStatOnlinerateD.java
@@ -19,7 +19,7 @@ import lombok.Setter;
 @Getter
 @Setter
 @TableName("r_stat_onlinerate_d")
-public class RStatOnlinerateD extends BaseEntity {
+public class RStatOnlinerateD {
 
     private static final long serialVersionUID = 1L;
     @MppMultiId
diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/utils/PublicUtil.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/utils/PublicUtil.java
index f81e01769..1c7e6e960 100644
--- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/utils/PublicUtil.java
+++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/utils/PublicUtil.java
@@ -120,7 +120,6 @@ public class PublicUtil {
             if(month>=10 && i>=10){
                 date = year +"-"+month+"-"+i;
             }
-            date = date + " 00:00:00";
             list.add(date);
         }
         return list;
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/IntegrityServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/IntegrityServiceImpl.java
index d30892348..debc71fbd 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/IntegrityServiceImpl.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/IntegrityServiceImpl.java
@@ -85,7 +85,8 @@ public class IntegrityServiceImpl extends MppServiceImpl<RStatIntegrityDMapper,
     @Async("asyncExecutor")
     public void dataIntegrity(LineParam lineParam,String time) {
         DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-        LocalDateTime dateTime = LocalDateTime.parse(time,df);
+        String data = time + " 00:00:00";
+        LocalDateTime dateTime = LocalDateTime.parse(data,df);
         List<LineDetail> lineDetailList = new ArrayList<>();
         if (CollUtil.isEmpty(lineParam.getLineIds())){
             List<Overlimit> overLimitList = getAllLinesLimitData();
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/OnlineRateServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/OnlineRateServiceImpl.java
index 8b6b8271d..ed0573a3f 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/OnlineRateServiceImpl.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/OnlineRateServiceImpl.java
@@ -84,7 +84,8 @@ public class OnlineRateServiceImpl extends MppServiceImpl<RStatOnlineRateDMapper
     @Async("asyncExecutor")
     public void onlineRateData(LineParam lineParam,String time) {
         DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-        LocalDateTime dateTime = LocalDateTime.parse(time,df);
+        String data = time + " 00:00:00";
+        LocalDateTime dateTime = LocalDateTime.parse(data,df);
         List<String> lineIdList = lineParam.getLineIds();
         if (CollUtil.isEmpty(lineParam.getLineIds())){
             lineIdList = lineFeignClient.getDeviceList().getData();