From dcf8740702fcdee90bc6dea8f274d857fe9ddfb1 Mon Sep 17 00:00:00 2001
From: xuyang <748613696@qq.com>
Date: Fri, 31 Mar 2023 11:22:53 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E5=A4=84=E7=90=86=E5=AE=9E=E4=BD=93?=
 =?UTF-8?q?=E7=B1=BB=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pqs-device/pq-device/pq-device-api/pom.xml    |  4 +++
 .../device/pq/pojo/po/RStatIntegrityD.java    |  3 ++
 .../device/pq/pojo/po/RStatOnlinerateD.java   |  5 +--
 .../harmonic/pojo/po/day}/RStatAssesDPO.java  |  2 +-
 .../pojo/po/day}/RStatComassesDPO.java        |  2 +-
 .../pojo/po/day}/RStatDataFlickerDPO.java     |  3 +-
 .../pojo/po/day}/RStatDataFlucDPO.java        |  2 +-
 .../pojo/po/day}/RStatDataHarmphasicIDPO.java |  2 +-
 .../pojo/po/day}/RStatDataHarmphasicVDPO.java |  2 +-
 .../pojo/po/day}/RStatDataHarmpowerPDPO.java  |  3 +-
 .../pojo/po/day}/RStatDataHarmpowerQDPO.java  |  2 +-
 .../pojo/po/day}/RStatDataHarmpowerSDPO.java  |  2 +-
 .../pojo/po/day}/RStatDataHarmrateIDPO.java   |  2 +-
 .../pojo/po/day}/RStatDataHarmrateVDPO.java   |  2 +-
 .../harmonic/pojo/po/day}/RStatDataIDPO.java  |  2 +-
 .../pojo/po/day}/RStatDataInharmIDPO.java     |  2 +-
 .../pojo/po/day}/RStatDataInharmVDPO.java     |  2 +-
 .../pojo/po/day}/RStatDataPltDPO.java         |  2 +-
 .../harmonic/pojo/po/day}/RStatDataVDPO.java  |  2 +-
 .../pojo/po/day}/RStatLimitRateDPO.java       |  2 +-
 .../pojo/po/day}/RStatLimitTargetDPO.java     |  3 +-
 .../harmonic/pojo/po/RStatIntegrityDPO.java   | 36 -------------------
 .../harmonic/pojo/po/RStatOnlineRateDPO.java  | 35 ------------------
 .../mapper/mysql/day/RStatAssesDMapper.java   |  4 +--
 .../mysql/day/RStatComassesDMapper.java       |  4 +--
 .../mysql/day/RStatDataFlickerDMapper.java    |  3 +-
 .../mysql/day/RStatDataFlucDMapper.java       |  2 +-
 .../mysql/day/RStatDataHarmRateIDMapper.java  |  3 +-
 .../mysql/day/RStatDataHarmRateVDMapper.java  |  3 +-
 .../day/RStatDataHarmphasicIDMapper.java      |  4 +--
 .../day/RStatDataHarmphasicVDMapper.java      |  3 +-
 .../mysql/day/RStatDataHarmpowerPDMapper.java |  4 +--
 .../mysql/day/RStatDataHarmpowerQDMapper.java |  3 +-
 .../mysql/day/RStatDataHarmpowerSDMapper.java |  3 +-
 .../mapper/mysql/day/RStatDataIDMapper.java   |  3 +-
 .../mysql/day/RStatDataInHarmIDMapper.java    |  3 +-
 .../mysql/day/RStatDataInHarmVDMapper.java    |  3 +-
 .../mapper/mysql/day/RStatDataPltDMapper.java |  3 +-
 .../mapper/mysql/day/RStatDataVDMapper.java   |  4 +--
 .../mysql/day/RStatIntegrityDMapper.java      |  4 +--
 .../mysql/day/RStatLimitRateDMapper.java      |  4 +--
 .../mysql/day/RStatLimitTargetDMapper.java    |  3 +-
 .../mysql/day/RStatOnlineRateDMapper.java     |  6 ++--
 .../day/RStatDataFlickerDServiceImpl.java     |  3 +-
 .../Impl/day/RStatDataFlucDServiceImpl.java   |  2 +-
 .../day/RStatDataHarmRateIDServiceImpl.java   |  6 +---
 .../day/RStatDataHarmRateVDServiceImpl.java   |  4 +--
 .../day/RStatDataHarmphasicIDServiceImpl.java |  3 +-
 .../day/RStatDataHarmphasicVDServiceImpl.java |  3 +-
 .../day/RStatDataHarmpowerPDServiceImpl.java  |  3 +-
 .../day/RStatDataHarmpowerQDServiceImpl.java  |  3 +-
 .../day/RStatDataHarmpowerSDServiceImpl.java  |  3 +-
 .../Impl/day/RStatDataIDServiceImpl.java      |  3 +-
 .../day/RStatDataInharmIDServiceImpl.java     |  7 +---
 .../day/RStatDataInharmVDServiceImpl.java     |  6 +---
 .../Impl/day/RStatDataPltDServiceImpl.java    |  6 +---
 .../Impl/day/RStatDataVDServiceImpl.java      |  3 +-
 .../Impl/day/RStatLimitRateDServiceImpl.java  |  6 +---
 .../mysql/Impl/line/DayDataServiceImpl.java   |  2 +-
 .../Impl/line/HarmonicGeneralServiceImpl.java |  2 +-
 .../Impl/line/HarmonicMetricServiceImpl.java  |  2 +-
 .../mysql/Impl/line/IntegrityServiceImpl.java | 17 +++++----
 .../mysql/Impl/line/LimitRateService.java     |  2 +-
 .../Impl/line/LimitTargetServiceImpl.java     |  5 ++-
 .../Impl/line/OnlineRateServiceImpl.java      | 17 +++++----
 .../mysql/day/IRStatDataFlickerDService.java  |  2 +-
 .../mysql/day/IRStatDataFlucDService.java     |  2 +-
 .../day/IRStatDataHarmRateIDService.java      |  2 +-
 .../day/IRStatDataHarmRateVDService.java      |  2 +-
 .../day/IRStatDataHarmphasicIDService.java    |  2 +-
 .../day/IRStatDataHarmphasicVDService.java    |  2 +-
 .../day/IRStatDataHarmpowerPDService.java     |  2 +-
 .../day/IRStatDataHarmpowerQDService.java     |  2 +-
 .../day/IRStatDataHarmpowerSDService.java     |  2 +-
 .../mysql/day/IRStatDataIDService.java        |  2 +-
 .../mysql/day/IRStatDataInharmIDService.java  |  2 +-
 .../mysql/day/IRStatDataInharmVDService.java  |  2 +-
 .../mysql/day/IRStatDataPltDService.java      |  2 +-
 .../mysql/day/IRStatDataVDService.java        |  3 +-
 .../mysql/day/IRStatLimitRateDService.java    |  3 +-
 80 files changed, 106 insertions(+), 225 deletions(-)
 rename {pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po => pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day}/RStatAssesDPO.java (95%)
 rename {pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po => pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day}/RStatComassesDPO.java (98%)
 rename {pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po => pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day}/RStatDataFlickerDPO.java (91%)
 rename {pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po => pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day}/RStatDataFlucDPO.java (95%)
 rename {pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po => pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day}/RStatDataHarmphasicIDPO.java (98%)
 rename {pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po => pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day}/RStatDataHarmphasicVDPO.java (98%)
 rename {pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po => pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day}/RStatDataHarmpowerPDPO.java (97%)
 rename {pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po => pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day}/RStatDataHarmpowerQDPO.java (98%)
 rename {pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po => pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day}/RStatDataHarmpowerSDPO.java (98%)
 rename {pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po => pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day}/RStatDataHarmrateIDPO.java (98%)
 rename {pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po => pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day}/RStatDataHarmrateVDPO.java (98%)
 rename {pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po => pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day}/RStatDataIDPO.java (98%)
 rename {pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po => pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day}/RStatDataInharmIDPO.java (98%)
 rename {pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po => pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day}/RStatDataInharmVDPO.java (98%)
 rename {pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po => pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day}/RStatDataPltDPO.java (95%)
 rename {pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po => pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day}/RStatDataVDPO.java (99%)
 rename {pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po => pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day}/RStatLimitRateDPO.java (99%)
 rename {pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po => pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day}/RStatLimitTargetDPO.java (99%)
 delete mode 100644 pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatIntegrityDPO.java
 delete mode 100644 pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatOnlineRateDPO.java

diff --git a/pqs-device/pq-device/pq-device-api/pom.xml b/pqs-device/pq-device/pq-device-api/pom.xml
index 298cb18f3..71287e8cc 100644
--- a/pqs-device/pq-device/pq-device-api/pom.xml
+++ b/pqs-device/pq-device/pq-device-api/pom.xml
@@ -22,5 +22,9 @@
             <artifactId>common-device-biz</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.github.jeffreyning</groupId>
+            <artifactId>mybatisplus-plus</artifactId>
+        </dependency>
     </dependencies>
 </project>
diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/RStatIntegrityD.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/RStatIntegrityD.java
index 4923aa97e..ab1d25648 100644
--- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/RStatIntegrityD.java
+++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/RStatIntegrityD.java
@@ -1,6 +1,7 @@
 package com.njcn.device.pq.pojo.po;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
 import com.njcn.db.bo.BaseEntity;
 import java.io.Serializable;
 import java.time.LocalDateTime;
@@ -23,8 +24,10 @@ public class RStatIntegrityD {
 
     private static final long serialVersionUID = 1L;
 
+    @MppMultiId
     private LocalDateTime timeId;
 
+    @MppMultiId
     private String lineIndex;
 
     private Integer dueTime;
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 639934583..6380f4d05 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
@@ -1,6 +1,7 @@
 package com.njcn.device.pq.pojo.po;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
 import com.njcn.db.bo.BaseEntity;
 import java.io.Serializable;
 import java.time.LocalDateTime;
@@ -21,9 +22,9 @@ import lombok.Setter;
 public class RStatOnlinerateD extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
-
+    @MppMultiId
     private LocalDateTime timeId;
-
+    @MppMultiId
     private String devIndex;
 
     private Integer onlineMin;
diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatAssesDPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day/RStatAssesDPO.java
similarity index 95%
rename from pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatAssesDPO.java
rename to pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day/RStatAssesDPO.java
index 59fc8f3bb..40f1c3a31 100644
--- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatAssesDPO.java
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day/RStatAssesDPO.java
@@ -1,4 +1,4 @@
-package com.njcn.prepare.harmonic.pojo.po;
+package com.njcn.harmonic.pojo.po.day;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatComassesDPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day/RStatComassesDPO.java
similarity index 98%
rename from pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatComassesDPO.java
rename to pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day/RStatComassesDPO.java
index d209685f7..dacbf5dea 100644
--- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatComassesDPO.java
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day/RStatComassesDPO.java
@@ -1,4 +1,4 @@
-package com.njcn.prepare.harmonic.pojo.po;
+package com.njcn.harmonic.pojo.po.day;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataFlickerDPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day/RStatDataFlickerDPO.java
similarity index 91%
rename from pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataFlickerDPO.java
rename to pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day/RStatDataFlickerDPO.java
index b1d1b27ad..95574f499 100644
--- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataFlickerDPO.java
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day/RStatDataFlickerDPO.java
@@ -1,7 +1,6 @@
-package com.njcn.prepare.harmonic.pojo.po;
+package com.njcn.harmonic.pojo.po.day;
 
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
 import lombok.Data;
diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataFlucDPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day/RStatDataFlucDPO.java
similarity index 95%
rename from pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataFlucDPO.java
rename to pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day/RStatDataFlucDPO.java
index fe132ea9f..2cd52cf1f 100644
--- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataFlucDPO.java
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day/RStatDataFlucDPO.java
@@ -1,4 +1,4 @@
-package com.njcn.prepare.harmonic.pojo.po;
+package com.njcn.harmonic.pojo.po.day;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataHarmphasicIDPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day/RStatDataHarmphasicIDPO.java
similarity index 98%
rename from pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataHarmphasicIDPO.java
rename to pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day/RStatDataHarmphasicIDPO.java
index 92ba9399f..b32e22b48 100644
--- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataHarmphasicIDPO.java
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day/RStatDataHarmphasicIDPO.java
@@ -1,4 +1,4 @@
-package com.njcn.prepare.harmonic.pojo.po;
+package com.njcn.harmonic.pojo.po.day;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataHarmphasicVDPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day/RStatDataHarmphasicVDPO.java
similarity index 98%
rename from pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataHarmphasicVDPO.java
rename to pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day/RStatDataHarmphasicVDPO.java
index 0181eacfa..297d7a577 100644
--- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataHarmphasicVDPO.java
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day/RStatDataHarmphasicVDPO.java
@@ -1,4 +1,4 @@
-package com.njcn.prepare.harmonic.pojo.po;
+package com.njcn.harmonic.pojo.po.day;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataHarmpowerPDPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day/RStatDataHarmpowerPDPO.java
similarity index 97%
rename from pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataHarmpowerPDPO.java
rename to pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day/RStatDataHarmpowerPDPO.java
index 4c76ad230..a84bfaede 100644
--- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataHarmpowerPDPO.java
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day/RStatDataHarmpowerPDPO.java
@@ -1,10 +1,9 @@
-package com.njcn.prepare.harmonic.pojo.po;
+package com.njcn.harmonic.pojo.po.day;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
 import lombok.Data;
-import org.influxdb.annotation.Column;
 
 import java.io.Serializable;
 import java.util.Date;
diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataHarmpowerQDPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day/RStatDataHarmpowerQDPO.java
similarity index 98%
rename from pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataHarmpowerQDPO.java
rename to pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day/RStatDataHarmpowerQDPO.java
index 3a3670dca..56b036a90 100644
--- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataHarmpowerQDPO.java
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day/RStatDataHarmpowerQDPO.java
@@ -1,4 +1,4 @@
-package com.njcn.prepare.harmonic.pojo.po;
+package com.njcn.harmonic.pojo.po.day;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataHarmpowerSDPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day/RStatDataHarmpowerSDPO.java
similarity index 98%
rename from pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataHarmpowerSDPO.java
rename to pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day/RStatDataHarmpowerSDPO.java
index ee4a7c1f2..56be16689 100644
--- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataHarmpowerSDPO.java
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day/RStatDataHarmpowerSDPO.java
@@ -1,4 +1,4 @@
-package com.njcn.prepare.harmonic.pojo.po;
+package com.njcn.harmonic.pojo.po.day;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataHarmrateIDPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day/RStatDataHarmrateIDPO.java
similarity index 98%
rename from pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataHarmrateIDPO.java
rename to pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day/RStatDataHarmrateIDPO.java
index 2ab255ede..13554b5a4 100644
--- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataHarmrateIDPO.java
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day/RStatDataHarmrateIDPO.java
@@ -1,4 +1,4 @@
-package com.njcn.prepare.harmonic.pojo.po;
+package com.njcn.harmonic.pojo.po.day;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataHarmrateVDPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day/RStatDataHarmrateVDPO.java
similarity index 98%
rename from pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataHarmrateVDPO.java
rename to pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day/RStatDataHarmrateVDPO.java
index af8217445..eb173bb45 100644
--- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataHarmrateVDPO.java
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day/RStatDataHarmrateVDPO.java
@@ -1,4 +1,4 @@
-package com.njcn.prepare.harmonic.pojo.po;
+package com.njcn.harmonic.pojo.po.day;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataIDPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day/RStatDataIDPO.java
similarity index 98%
rename from pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataIDPO.java
rename to pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day/RStatDataIDPO.java
index a709ef67c..f3112f71a 100644
--- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataIDPO.java
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day/RStatDataIDPO.java
@@ -1,4 +1,4 @@
-package com.njcn.prepare.harmonic.pojo.po;
+package com.njcn.harmonic.pojo.po.day;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataInharmIDPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day/RStatDataInharmIDPO.java
similarity index 98%
rename from pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataInharmIDPO.java
rename to pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day/RStatDataInharmIDPO.java
index e0ed40f03..cf10af062 100644
--- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataInharmIDPO.java
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day/RStatDataInharmIDPO.java
@@ -1,4 +1,4 @@
-package com.njcn.prepare.harmonic.pojo.po;
+package com.njcn.harmonic.pojo.po.day;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataInharmVDPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day/RStatDataInharmVDPO.java
similarity index 98%
rename from pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataInharmVDPO.java
rename to pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day/RStatDataInharmVDPO.java
index 00cbe8f1a..d662f0285 100644
--- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataInharmVDPO.java
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day/RStatDataInharmVDPO.java
@@ -1,4 +1,4 @@
-package com.njcn.prepare.harmonic.pojo.po;
+package com.njcn.harmonic.pojo.po.day;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataPltDPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day/RStatDataPltDPO.java
similarity index 95%
rename from pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataPltDPO.java
rename to pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day/RStatDataPltDPO.java
index 2c80c385f..c454907ac 100644
--- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataPltDPO.java
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day/RStatDataPltDPO.java
@@ -1,4 +1,4 @@
-package com.njcn.prepare.harmonic.pojo.po;
+package com.njcn.harmonic.pojo.po.day;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataVDPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day/RStatDataVDPO.java
similarity index 99%
rename from pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataVDPO.java
rename to pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day/RStatDataVDPO.java
index fb98c1a2f..0ba178cf3 100644
--- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataVDPO.java
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day/RStatDataVDPO.java
@@ -1,4 +1,4 @@
-package com.njcn.prepare.harmonic.pojo.po;
+package com.njcn.harmonic.pojo.po.day;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatLimitRateDPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day/RStatLimitRateDPO.java
similarity index 99%
rename from pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatLimitRateDPO.java
rename to pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day/RStatLimitRateDPO.java
index d7b7f5c0d..9524db5eb 100644
--- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatLimitRateDPO.java
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day/RStatLimitRateDPO.java
@@ -1,4 +1,4 @@
-package com.njcn.prepare.harmonic.pojo.po;
+package com.njcn.harmonic.pojo.po.day;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatLimitTargetDPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day/RStatLimitTargetDPO.java
similarity index 99%
rename from pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatLimitTargetDPO.java
rename to pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day/RStatLimitTargetDPO.java
index 9655484b2..d943f960c 100644
--- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatLimitTargetDPO.java
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day/RStatLimitTargetDPO.java
@@ -1,9 +1,8 @@
-package com.njcn.prepare.harmonic.pojo.po;
+package com.njcn.harmonic.pojo.po.day;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
-import com.njcn.harmonic.pojo.po.LimitRate;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatIntegrityDPO.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatIntegrityDPO.java
deleted file mode 100644
index 7496fb0a4..000000000
--- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatIntegrityDPO.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.njcn.prepare.harmonic.pojo.po;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 类的介绍：
- *
- * @author xuyang
- * @version 1.0.0
- * @createTime 2023/3/26 22:04
- */
-@Data
-@TableName(value = "r_stat_integrity_d")
-public class RStatIntegrityDPO implements Serializable {
-
-    @MppMultiId
-    @TableField(value = "time_id")
-    private Date time;
-
-    @MppMultiId
-    @TableField(value = "line_index")
-    private String lineId;
-
-    @TableField(value = "due_time")
-    private Integer dueTime;
-
-    @TableField(value = "real_time")
-    private Integer realTime;
-}
diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatOnlineRateDPO.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatOnlineRateDPO.java
deleted file mode 100644
index bb89582e1..000000000
--- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatOnlineRateDPO.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.njcn.prepare.harmonic.pojo.po;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 类的介绍：
- *
- * @author xuyang
- * @version 1.0.0
- * @createTime 2023/3/26 22:04
- */
-@Data
-@TableName(value = "r_stat_onlinerate_d")
-public class RStatOnlineRateDPO implements Serializable {
-
-    @MppMultiId
-    @TableField(value = "time_id")
-    private Date time;
-
-    @MppMultiId
-    @TableField(value = "dev_index")
-    private String devId;
-
-    @TableField(value = "online_min")
-    private Integer onlineMin;
-
-    @TableField(value = "offline_min")
-    private Integer offlineMin;
-}
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatAssesDMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatAssesDMapper.java
index ec1a0bfd3..56d367f35 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatAssesDMapper.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatAssesDMapper.java
@@ -1,9 +1,7 @@
 package com.njcn.prepare.harmonic.mapper.mysql.day;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
-import com.njcn.prepare.harmonic.pojo.po.RStatAssesDPO;
-import com.njcn.prepare.harmonic.pojo.po.RStatOnlineRateDPO;
+import com.njcn.harmonic.pojo.po.day.RStatAssesDPO;
 
 public interface RStatAssesDMapper extends MppBaseMapper<RStatAssesDPO> {
 }
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatComassesDMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatComassesDMapper.java
index 1398f7528..562867130 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatComassesDMapper.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatComassesDMapper.java
@@ -1,9 +1,7 @@
 package com.njcn.prepare.harmonic.mapper.mysql.day;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
-import com.njcn.prepare.harmonic.pojo.po.RStatAssesDPO;
-import com.njcn.prepare.harmonic.pojo.po.RStatComassesDPO;
+import com.njcn.harmonic.pojo.po.day.RStatComassesDPO;
 
 public interface RStatComassesDMapper extends MppBaseMapper<RStatComassesDPO> {
 }
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataFlickerDMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataFlickerDMapper.java
index f63c4c414..d0a3d8618 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataFlickerDMapper.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataFlickerDMapper.java
@@ -1,8 +1,7 @@
 package com.njcn.prepare.harmonic.mapper.mysql.day;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
-import com.njcn.prepare.harmonic.pojo.po.RStatDataFlickerDPO;
+import com.njcn.harmonic.pojo.po.day.RStatDataFlickerDPO;
 
 public interface RStatDataFlickerDMapper extends MppBaseMapper<RStatDataFlickerDPO> {
 }
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataFlucDMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataFlucDMapper.java
index e821700c2..6be6a232f 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataFlucDMapper.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataFlucDMapper.java
@@ -1,7 +1,7 @@
 package com.njcn.prepare.harmonic.mapper.mysql.day;
 
 import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
-import com.njcn.prepare.harmonic.pojo.po.RStatDataFlucDPO;
+import com.njcn.harmonic.pojo.po.day.RStatDataFlucDPO;
 
 public interface RStatDataFlucDMapper extends MppBaseMapper<RStatDataFlucDPO> {
 }
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataHarmRateIDMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataHarmRateIDMapper.java
index e41637a89..be57f5422 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataHarmRateIDMapper.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataHarmRateIDMapper.java
@@ -1,8 +1,7 @@
 package com.njcn.prepare.harmonic.mapper.mysql.day;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
-import com.njcn.prepare.harmonic.pojo.po.RStatDataHarmrateIDPO;
+import com.njcn.harmonic.pojo.po.day.RStatDataHarmrateIDPO;
 
 public interface RStatDataHarmRateIDMapper extends MppBaseMapper<RStatDataHarmrateIDPO> {
 }
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataHarmRateVDMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataHarmRateVDMapper.java
index 4182e08d2..20761655a 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataHarmRateVDMapper.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataHarmRateVDMapper.java
@@ -1,8 +1,7 @@
 package com.njcn.prepare.harmonic.mapper.mysql.day;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
-import com.njcn.prepare.harmonic.pojo.po.RStatDataHarmrateVDPO;
+import com.njcn.harmonic.pojo.po.day.RStatDataHarmrateVDPO;
 
 public interface RStatDataHarmRateVDMapper extends MppBaseMapper<RStatDataHarmrateVDPO> {
 }
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataHarmphasicIDMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataHarmphasicIDMapper.java
index 7cbef0a01..756f433b1 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataHarmphasicIDMapper.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataHarmphasicIDMapper.java
@@ -1,9 +1,7 @@
 package com.njcn.prepare.harmonic.mapper.mysql.day;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
-import com.njcn.prepare.harmonic.pojo.po.RStatDataHarmphasicIDPO;
-import com.njcn.prepare.harmonic.pojo.po.RStatDataVDPO;
+import com.njcn.harmonic.pojo.po.day.RStatDataHarmphasicIDPO;
 
 public interface RStatDataHarmphasicIDMapper extends MppBaseMapper<RStatDataHarmphasicIDPO> {
 }
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataHarmphasicVDMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataHarmphasicVDMapper.java
index 4d32a03a6..3675df653 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataHarmphasicVDMapper.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataHarmphasicVDMapper.java
@@ -1,8 +1,7 @@
 package com.njcn.prepare.harmonic.mapper.mysql.day;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
-import com.njcn.prepare.harmonic.pojo.po.RStatDataHarmphasicVDPO;
+import com.njcn.harmonic.pojo.po.day.RStatDataHarmphasicVDPO;
 
 public interface RStatDataHarmphasicVDMapper extends MppBaseMapper<RStatDataHarmphasicVDPO> {
 }
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataHarmpowerPDMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataHarmpowerPDMapper.java
index 9130b0590..d7042c858 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataHarmpowerPDMapper.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataHarmpowerPDMapper.java
@@ -1,9 +1,7 @@
 package com.njcn.prepare.harmonic.mapper.mysql.day;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
-import com.njcn.prepare.harmonic.pojo.po.RStatDataHarmpowerPDPO;
-import com.njcn.prepare.harmonic.pojo.po.RStatDataVDPO;
+import com.njcn.harmonic.pojo.po.day.RStatDataHarmpowerPDPO;
 
 public interface RStatDataHarmpowerPDMapper extends MppBaseMapper<RStatDataHarmpowerPDPO> {
 }
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataHarmpowerQDMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataHarmpowerQDMapper.java
index 071c3fd1e..f76d3138d 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataHarmpowerQDMapper.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataHarmpowerQDMapper.java
@@ -1,8 +1,7 @@
 package com.njcn.prepare.harmonic.mapper.mysql.day;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
-import com.njcn.prepare.harmonic.pojo.po.RStatDataHarmpowerQDPO;
+import com.njcn.harmonic.pojo.po.day.RStatDataHarmpowerQDPO;
 
 public interface RStatDataHarmpowerQDMapper extends MppBaseMapper<RStatDataHarmpowerQDPO> {
 }
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataHarmpowerSDMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataHarmpowerSDMapper.java
index 7c2bd74a6..24cd89706 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataHarmpowerSDMapper.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataHarmpowerSDMapper.java
@@ -1,8 +1,7 @@
 package com.njcn.prepare.harmonic.mapper.mysql.day;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
-import com.njcn.prepare.harmonic.pojo.po.RStatDataHarmpowerSDPO;
+import com.njcn.harmonic.pojo.po.day.RStatDataHarmpowerSDPO;
 
 public interface RStatDataHarmpowerSDMapper extends MppBaseMapper<RStatDataHarmpowerSDPO> {
 }
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataIDMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataIDMapper.java
index 22c52e606..7072dcb93 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataIDMapper.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataIDMapper.java
@@ -1,8 +1,7 @@
 package com.njcn.prepare.harmonic.mapper.mysql.day;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
-import com.njcn.prepare.harmonic.pojo.po.RStatDataIDPO;
+import com.njcn.harmonic.pojo.po.day.RStatDataIDPO;
 
 public interface RStatDataIDMapper extends MppBaseMapper<RStatDataIDPO> {
 }
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataInHarmIDMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataInHarmIDMapper.java
index 36e8bfe1f..f6166a61f 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataInHarmIDMapper.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataInHarmIDMapper.java
@@ -1,8 +1,7 @@
 package com.njcn.prepare.harmonic.mapper.mysql.day;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
-import com.njcn.prepare.harmonic.pojo.po.RStatDataInharmIDPO;
+import com.njcn.harmonic.pojo.po.day.RStatDataInharmIDPO;
 
 public interface RStatDataInHarmIDMapper extends MppBaseMapper<RStatDataInharmIDPO> {
 }
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataInHarmVDMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataInHarmVDMapper.java
index 0c85c0f3a..c1097f6ed 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataInHarmVDMapper.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataInHarmVDMapper.java
@@ -1,8 +1,7 @@
 package com.njcn.prepare.harmonic.mapper.mysql.day;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
-import com.njcn.prepare.harmonic.pojo.po.RStatDataInharmVDPO;
+import com.njcn.harmonic.pojo.po.day.RStatDataInharmVDPO;
 
 public interface RStatDataInHarmVDMapper extends MppBaseMapper<RStatDataInharmVDPO> {
 }
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataPltDMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataPltDMapper.java
index 7b9fe3d07..abf101455 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataPltDMapper.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataPltDMapper.java
@@ -1,8 +1,7 @@
 package com.njcn.prepare.harmonic.mapper.mysql.day;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
-import com.njcn.prepare.harmonic.pojo.po.RStatDataPltDPO;
+import com.njcn.harmonic.pojo.po.day.RStatDataPltDPO;
 
 public interface RStatDataPltDMapper extends MppBaseMapper<RStatDataPltDPO> {
 }
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataVDMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataVDMapper.java
index c22e63f40..380587d8e 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataVDMapper.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataVDMapper.java
@@ -1,9 +1,7 @@
 package com.njcn.prepare.harmonic.mapper.mysql.day;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
-import com.njcn.prepare.harmonic.pojo.po.RStatDataFlickerDPO;
-import com.njcn.prepare.harmonic.pojo.po.RStatDataVDPO;
+import com.njcn.harmonic.pojo.po.day.RStatDataVDPO;
 
 public interface RStatDataVDMapper extends MppBaseMapper<RStatDataVDPO> {
 }
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatIntegrityDMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatIntegrityDMapper.java
index 7a2cf4925..72d274462 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatIntegrityDMapper.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatIntegrityDMapper.java
@@ -1,7 +1,7 @@
 package com.njcn.prepare.harmonic.mapper.mysql.day;
 
 import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
-import com.njcn.prepare.harmonic.pojo.po.RStatIntegrityDPO;
+import com.njcn.device.pq.pojo.po.RStatIntegrityD;
 
-public interface RStatIntegrityDMapper extends MppBaseMapper<RStatIntegrityDPO> {
+public interface RStatIntegrityDMapper extends MppBaseMapper<RStatIntegrityD> {
 }
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatLimitRateDMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatLimitRateDMapper.java
index b792d3368..5ab09c1b3 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatLimitRateDMapper.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatLimitRateDMapper.java
@@ -1,9 +1,7 @@
 package com.njcn.prepare.harmonic.mapper.mysql.day;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
-import com.njcn.prepare.harmonic.pojo.po.RStatLimitRateDPO;
-import com.njcn.prepare.harmonic.pojo.po.RStatLimitTargetDPO;
+import com.njcn.harmonic.pojo.po.day.RStatLimitRateDPO;
 
 public interface RStatLimitRateDMapper extends MppBaseMapper<RStatLimitRateDPO> {
 }
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatLimitTargetDMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatLimitTargetDMapper.java
index f3b2dc632..c47717c02 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatLimitTargetDMapper.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatLimitTargetDMapper.java
@@ -1,8 +1,7 @@
 package com.njcn.prepare.harmonic.mapper.mysql.day;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
-import com.njcn.prepare.harmonic.pojo.po.RStatLimitTargetDPO;
+import com.njcn.harmonic.pojo.po.day.RStatLimitTargetDPO;
 
 public interface RStatLimitTargetDMapper extends MppBaseMapper<RStatLimitTargetDPO> {
 }
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatOnlineRateDMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatOnlineRateDMapper.java
index 332327679..c4ed44af3 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatOnlineRateDMapper.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatOnlineRateDMapper.java
@@ -1,9 +1,7 @@
 package com.njcn.prepare.harmonic.mapper.mysql.day;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
-import com.njcn.prepare.harmonic.pojo.po.RStatIntegrityDPO;
-import com.njcn.prepare.harmonic.pojo.po.RStatOnlineRateDPO;
+import com.njcn.device.pq.pojo.po.RStatOnlinerateD;
 
-public interface RStatOnlineRateDMapper extends MppBaseMapper<RStatOnlineRateDPO> {
+public interface RStatOnlineRateDMapper extends MppBaseMapper<RStatOnlinerateD> {
 }
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataFlickerDServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataFlickerDServiceImpl.java
index f12b256d0..83c4f1f17 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataFlickerDServiceImpl.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataFlickerDServiceImpl.java
@@ -1,9 +1,8 @@
 package com.njcn.prepare.harmonic.service.mysql.Impl.day;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
+import com.njcn.harmonic.pojo.po.day.RStatDataFlickerDPO;
 import com.njcn.prepare.harmonic.mapper.mysql.day.RStatDataFlickerDMapper;
-import com.njcn.prepare.harmonic.pojo.po.RStatDataFlickerDPO;
 import com.njcn.prepare.harmonic.service.mysql.day.IRStatDataFlickerDService;
 import org.springframework.stereotype.Service;
 
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataFlucDServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataFlucDServiceImpl.java
index 4d087f88c..1f2870680 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataFlucDServiceImpl.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataFlucDServiceImpl.java
@@ -1,8 +1,8 @@
 package com.njcn.prepare.harmonic.service.mysql.Impl.day;
 
 import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
+import com.njcn.harmonic.pojo.po.day.RStatDataFlucDPO;
 import com.njcn.prepare.harmonic.mapper.mysql.day.RStatDataFlucDMapper;
-import com.njcn.prepare.harmonic.pojo.po.RStatDataFlucDPO;
 import com.njcn.prepare.harmonic.service.mysql.day.IRStatDataFlucDService;
 import org.springframework.stereotype.Service;
 
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataHarmRateIDServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataHarmRateIDServiceImpl.java
index 273565cff..a145c85f5 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataHarmRateIDServiceImpl.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataHarmRateIDServiceImpl.java
@@ -1,13 +1,9 @@
 package com.njcn.prepare.harmonic.service.mysql.Impl.day;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
+import com.njcn.harmonic.pojo.po.day.RStatDataHarmrateIDPO;
 import com.njcn.prepare.harmonic.mapper.mysql.day.RStatDataHarmRateIDMapper;
-import com.njcn.prepare.harmonic.mapper.mysql.day.RStatDataHarmpowerSDMapper;
-import com.njcn.prepare.harmonic.pojo.po.RStatDataHarmpowerSDPO;
-import com.njcn.prepare.harmonic.pojo.po.RStatDataHarmrateIDPO;
 import com.njcn.prepare.harmonic.service.mysql.day.IRStatDataHarmRateIDService;
-import com.njcn.prepare.harmonic.service.mysql.day.IRStatDataHarmpowerSDService;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataHarmRateVDServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataHarmRateVDServiceImpl.java
index 95d013f8c..6a6831d1f 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataHarmRateVDServiceImpl.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataHarmRateVDServiceImpl.java
@@ -1,10 +1,8 @@
 package com.njcn.prepare.harmonic.service.mysql.Impl.day;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
+import com.njcn.harmonic.pojo.po.day.RStatDataHarmrateVDPO;
 import com.njcn.prepare.harmonic.mapper.mysql.day.RStatDataHarmRateVDMapper;
-import com.njcn.prepare.harmonic.pojo.po.RStatDataHarmrateIDPO;
-import com.njcn.prepare.harmonic.pojo.po.RStatDataHarmrateVDPO;
 import com.njcn.prepare.harmonic.service.mysql.day.IRStatDataHarmRateVDService;
 import org.springframework.stereotype.Service;
 
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataHarmphasicIDServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataHarmphasicIDServiceImpl.java
index d9c4f27d5..04d59a43c 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataHarmphasicIDServiceImpl.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataHarmphasicIDServiceImpl.java
@@ -1,9 +1,8 @@
 package com.njcn.prepare.harmonic.service.mysql.Impl.day;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
+import com.njcn.harmonic.pojo.po.day.RStatDataHarmphasicIDPO;
 import com.njcn.prepare.harmonic.mapper.mysql.day.RStatDataHarmphasicIDMapper;
-import com.njcn.prepare.harmonic.pojo.po.RStatDataHarmphasicIDPO;
 import com.njcn.prepare.harmonic.service.mysql.day.IRStatDataHarmphasicIDService;
 import org.springframework.stereotype.Service;
 
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataHarmphasicVDServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataHarmphasicVDServiceImpl.java
index 2ff329113..f462e8594 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataHarmphasicVDServiceImpl.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataHarmphasicVDServiceImpl.java
@@ -1,9 +1,8 @@
 package com.njcn.prepare.harmonic.service.mysql.Impl.day;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
+import com.njcn.harmonic.pojo.po.day.RStatDataHarmphasicVDPO;
 import com.njcn.prepare.harmonic.mapper.mysql.day.RStatDataHarmphasicVDMapper;
-import com.njcn.prepare.harmonic.pojo.po.RStatDataHarmphasicVDPO;
 import com.njcn.prepare.harmonic.service.mysql.day.IRStatDataHarmphasicVDService;
 import org.springframework.stereotype.Service;
 
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataHarmpowerPDServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataHarmpowerPDServiceImpl.java
index 95b586cb2..ced7d05e8 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataHarmpowerPDServiceImpl.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataHarmpowerPDServiceImpl.java
@@ -1,9 +1,8 @@
 package com.njcn.prepare.harmonic.service.mysql.Impl.day;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
+import com.njcn.harmonic.pojo.po.day.RStatDataHarmpowerPDPO;
 import com.njcn.prepare.harmonic.mapper.mysql.day.RStatDataHarmpowerPDMapper;
-import com.njcn.prepare.harmonic.pojo.po.RStatDataHarmpowerPDPO;
 import com.njcn.prepare.harmonic.service.mysql.day.IRStatDataHarmpowerPDService;
 import org.springframework.stereotype.Service;
 
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataHarmpowerQDServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataHarmpowerQDServiceImpl.java
index 9642c5dd3..3b1c7bac7 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataHarmpowerQDServiceImpl.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataHarmpowerQDServiceImpl.java
@@ -1,9 +1,8 @@
 package com.njcn.prepare.harmonic.service.mysql.Impl.day;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
+import com.njcn.harmonic.pojo.po.day.RStatDataHarmpowerQDPO;
 import com.njcn.prepare.harmonic.mapper.mysql.day.RStatDataHarmpowerQDMapper;
-import com.njcn.prepare.harmonic.pojo.po.RStatDataHarmpowerQDPO;
 import com.njcn.prepare.harmonic.service.mysql.day.IRStatDataHarmpowerQDService;
 import org.springframework.stereotype.Service;
 
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataHarmpowerSDServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataHarmpowerSDServiceImpl.java
index 62e05f3c6..445cd599c 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataHarmpowerSDServiceImpl.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataHarmpowerSDServiceImpl.java
@@ -1,9 +1,8 @@
 package com.njcn.prepare.harmonic.service.mysql.Impl.day;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
+import com.njcn.harmonic.pojo.po.day.RStatDataHarmpowerSDPO;
 import com.njcn.prepare.harmonic.mapper.mysql.day.RStatDataHarmpowerSDMapper;
-import com.njcn.prepare.harmonic.pojo.po.RStatDataHarmpowerSDPO;
 import com.njcn.prepare.harmonic.service.mysql.day.IRStatDataHarmpowerSDService;
 import org.springframework.stereotype.Service;
 
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataIDServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataIDServiceImpl.java
index 94ab9f212..9300f9766 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataIDServiceImpl.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataIDServiceImpl.java
@@ -1,9 +1,8 @@
 package com.njcn.prepare.harmonic.service.mysql.Impl.day;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
+import com.njcn.harmonic.pojo.po.day.RStatDataIDPO;
 import com.njcn.prepare.harmonic.mapper.mysql.day.RStatDataIDMapper;
-import com.njcn.prepare.harmonic.pojo.po.RStatDataIDPO;
 import com.njcn.prepare.harmonic.service.mysql.day.IRStatDataIDService;
 import org.springframework.stereotype.Service;
 
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataInharmIDServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataInharmIDServiceImpl.java
index 048337954..5a0319721 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataInharmIDServiceImpl.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataInharmIDServiceImpl.java
@@ -1,13 +1,8 @@
 package com.njcn.prepare.harmonic.service.mysql.Impl.day;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
-import com.njcn.prepare.harmonic.mapper.mysql.day.RStatDataIDMapper;
+import com.njcn.harmonic.pojo.po.day.RStatDataInharmIDPO;
 import com.njcn.prepare.harmonic.mapper.mysql.day.RStatDataInHarmIDMapper;
-import com.njcn.prepare.harmonic.pojo.po.RStatDataHarmrateIDPO;
-import com.njcn.prepare.harmonic.pojo.po.RStatDataIDPO;
-import com.njcn.prepare.harmonic.pojo.po.RStatDataInharmIDPO;
-import com.njcn.prepare.harmonic.service.mysql.day.IRStatDataIDService;
 import com.njcn.prepare.harmonic.service.mysql.day.IRStatDataInharmIDService;
 import org.springframework.stereotype.Service;
 
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataInharmVDServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataInharmVDServiceImpl.java
index 06caaafe5..b5395d7ce 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataInharmVDServiceImpl.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataInharmVDServiceImpl.java
@@ -1,12 +1,8 @@
 package com.njcn.prepare.harmonic.service.mysql.Impl.day;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
-import com.njcn.prepare.harmonic.mapper.mysql.day.RStatDataInHarmIDMapper;
+import com.njcn.harmonic.pojo.po.day.RStatDataInharmVDPO;
 import com.njcn.prepare.harmonic.mapper.mysql.day.RStatDataInHarmVDMapper;
-import com.njcn.prepare.harmonic.pojo.po.RStatDataInharmIDPO;
-import com.njcn.prepare.harmonic.pojo.po.RStatDataInharmVDPO;
-import com.njcn.prepare.harmonic.service.mysql.day.IRStatDataInharmIDService;
 import com.njcn.prepare.harmonic.service.mysql.day.IRStatDataInharmVDService;
 import org.springframework.stereotype.Service;
 
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataPltDServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataPltDServiceImpl.java
index b0ecfb498..b897f117d 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataPltDServiceImpl.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataPltDServiceImpl.java
@@ -1,12 +1,8 @@
 package com.njcn.prepare.harmonic.service.mysql.Impl.day;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
-import com.njcn.prepare.harmonic.mapper.mysql.day.RStatDataFlickerDMapper;
+import com.njcn.harmonic.pojo.po.day.RStatDataPltDPO;
 import com.njcn.prepare.harmonic.mapper.mysql.day.RStatDataPltDMapper;
-import com.njcn.prepare.harmonic.pojo.po.RStatDataFlickerDPO;
-import com.njcn.prepare.harmonic.pojo.po.RStatDataPltDPO;
-import com.njcn.prepare.harmonic.service.mysql.day.IRStatDataFlickerDService;
 import com.njcn.prepare.harmonic.service.mysql.day.IRStatDataPltDService;
 import org.springframework.stereotype.Service;
 
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataVDServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataVDServiceImpl.java
index fcb8cef79..b2b621828 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataVDServiceImpl.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataVDServiceImpl.java
@@ -1,9 +1,8 @@
 package com.njcn.prepare.harmonic.service.mysql.Impl.day;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
+import com.njcn.harmonic.pojo.po.day.RStatDataVDPO;
 import com.njcn.prepare.harmonic.mapper.mysql.day.RStatDataVDMapper;
-import com.njcn.prepare.harmonic.pojo.po.RStatDataVDPO;
 import com.njcn.prepare.harmonic.service.mysql.day.IRStatDataVDService;
 import org.springframework.stereotype.Service;
 
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatLimitRateDServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatLimitRateDServiceImpl.java
index 75fe2866d..9e5ae502e 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatLimitRateDServiceImpl.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatLimitRateDServiceImpl.java
@@ -2,13 +2,9 @@ package com.njcn.prepare.harmonic.service.mysql.Impl.day;
 
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
-import com.njcn.device.pq.pojo.po.AlarmStrategy;
-import com.njcn.energy.pojo.po.EleEvtParm;
+import com.njcn.harmonic.pojo.po.day.RStatLimitRateDPO;
 import com.njcn.prepare.harmonic.mapper.mysql.day.RStatLimitRateDMapper;
-import com.njcn.prepare.harmonic.pojo.po.RStatLimitRateDPO;
 import com.njcn.prepare.harmonic.service.mysql.day.IRStatLimitRateDService;
 import org.springframework.stereotype.Service;
 
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/DayDataServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/DayDataServiceImpl.java
index 600323826..d5638910a 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/DayDataServiceImpl.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/DayDataServiceImpl.java
@@ -1,6 +1,7 @@
 package com.njcn.prepare.harmonic.service.mysql.Impl.line;
 
 import com.njcn.harmonic.pojo.po.*;
+import com.njcn.harmonic.pojo.po.day.*;
 import com.njcn.influxdb.param.InfluxDBPublicParam;
 import com.njcn.influxdb.utils.InfluxDbUtils;
 import com.njcn.prepare.harmonic.constant.InfluxdbPOConverter;
@@ -9,7 +10,6 @@ import com.njcn.prepare.harmonic.pojo.mysql.po.line.RMpFlickerReportDPO;
 import com.njcn.prepare.harmonic.pojo.mysql.po.line.RMpHarmonicPReportDPO;
 import com.njcn.prepare.harmonic.pojo.mysql.po.line.RMpInharmonicIMagReportDPO;
 import com.njcn.prepare.harmonic.pojo.mysql.po.line.RMpPltReportDPO;
-import com.njcn.prepare.harmonic.pojo.po.*;
 import com.njcn.prepare.harmonic.service.mysql.day.*;
 import com.njcn.prepare.harmonic.service.mysql.line.*;
 import lombok.RequiredArgsConstructor;
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/HarmonicGeneralServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/HarmonicGeneralServiceImpl.java
index 4bd29fa33..99af562bc 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/HarmonicGeneralServiceImpl.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/HarmonicGeneralServiceImpl.java
@@ -5,12 +5,12 @@ import cn.hutool.core.date.DateUtil;
 import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
 import com.njcn.device.pq.api.LineFeignClient;
 import com.njcn.device.pq.pojo.po.Overlimit;
+import com.njcn.harmonic.pojo.po.day.RStatComassesDPO;
 import com.njcn.influxdb.utils.InfluxDbUtils;
 import com.njcn.prepare.harmonic.mapper.mysql.day.RStatComassesDMapper;
 import com.njcn.prepare.harmonic.pojo.influxdb.po.DataFlickerPO;
 import com.njcn.prepare.harmonic.pojo.influxdb.po.DataVPO;
 import com.njcn.prepare.harmonic.pojo.param.LineParam;
-import com.njcn.prepare.harmonic.pojo.po.RStatComassesDPO;
 import com.njcn.prepare.harmonic.service.mysql.line.HarmonicGeneralService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/HarmonicMetricServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/HarmonicMetricServiceImpl.java
index 0fada68c8..e3cec45c1 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/HarmonicMetricServiceImpl.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/HarmonicMetricServiceImpl.java
@@ -5,12 +5,12 @@ import cn.hutool.core.date.DateUtil;
 import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
 import com.njcn.device.pq.api.LineFeignClient;
 import com.njcn.device.pq.pojo.po.Overlimit;
+import com.njcn.harmonic.pojo.po.day.RStatAssesDPO;
 import com.njcn.influxdb.utils.InfluxDbUtils;
 import com.njcn.prepare.harmonic.mapper.mysql.day.RStatAssesDMapper;
 import com.njcn.prepare.harmonic.pojo.param.LineParam;
 import com.njcn.prepare.harmonic.pojo.influxdb.po.DataPltPO;
 import com.njcn.prepare.harmonic.pojo.influxdb.po.DataVPO;
-import com.njcn.prepare.harmonic.pojo.po.RStatAssesDPO;
 import com.njcn.prepare.harmonic.service.mysql.line.HarmonicMetricService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
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 ea24eb277..d30892348 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
@@ -6,11 +6,11 @@ import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
 import com.njcn.device.pq.api.LineFeignClient;
 import com.njcn.device.pq.pojo.po.LineDetail;
 import com.njcn.device.pq.pojo.po.Overlimit;
+import com.njcn.device.pq.pojo.po.RStatIntegrityD;
 import com.njcn.influxdb.utils.InfluxDbUtils;
 import com.njcn.prepare.harmonic.mapper.mysql.day.RStatIntegrityDMapper;
 import com.njcn.prepare.harmonic.pojo.influxdb.po.DataVPO;
 import com.njcn.prepare.harmonic.pojo.param.LineParam;
-import com.njcn.prepare.harmonic.pojo.po.RStatIntegrityDPO;
 import com.njcn.prepare.harmonic.service.mysql.line.IntegrityService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -23,6 +23,8 @@ import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
@@ -40,7 +42,7 @@ import static com.njcn.influxdb.param.InfluxDBPublicParam.DAY_MINUTE;
 @Slf4j
 @Service
 @AllArgsConstructor
-public class IntegrityServiceImpl extends MppServiceImpl<RStatIntegrityDMapper, RStatIntegrityDPO> implements IntegrityService{
+public class IntegrityServiceImpl extends MppServiceImpl<RStatIntegrityDMapper, RStatIntegrityD> implements IntegrityService{
 
     private final InfluxDbUtils influxDbUtils;
 
@@ -82,6 +84,8 @@ public class IntegrityServiceImpl extends MppServiceImpl<RStatIntegrityDMapper,
     @Override
     @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);
         List<LineDetail> lineDetailList = new ArrayList<>();
         if (CollUtil.isEmpty(lineParam.getLineIds())){
             List<Overlimit> overLimitList = getAllLinesLimitData();
@@ -90,13 +94,12 @@ public class IntegrityServiceImpl extends MppServiceImpl<RStatIntegrityDMapper,
         }else {
             lineDetailList = lineFeignClient.getLineDetail(lineParam.getLineIds()).getData();
         }
-        Date dateOut = DateUtil.parse(time);
-        List<RStatIntegrityDPO> list = new ArrayList<>();
+        List<RStatIntegrityD> list = new ArrayList<>();
         for (LineDetail lineDetail :lineDetailList){
             int dataCount = getDataCount(lineDetail.getId(),time);
-            RStatIntegrityDPO integrityDpo = new RStatIntegrityDPO();
-            integrityDpo.setTime(dateOut);
-            integrityDpo.setLineId(lineDetail.getId());
+            RStatIntegrityD integrityDpo = new RStatIntegrityD();
+            integrityDpo.setTimeId(dateTime);
+            integrityDpo.setLineIndex(lineDetail.getId());
             integrityDpo.setDueTime(DAY_MINUTE/lineDetail.getTimeInterval());
             integrityDpo.setRealTime(dataCount);
             list.add(integrityDpo);
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/LimitRateService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/LimitRateService.java
index 5e43cba8b..ea8402a97 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/LimitRateService.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/LimitRateService.java
@@ -6,11 +6,11 @@ import com.njcn.device.pq.api.LineFeignClient;
 import com.njcn.device.pq.pojo.po.Overlimit;
 import com.njcn.harmonic.pojo.po.LimitRate;
 import com.njcn.harmonic.pojo.po.LimitRatePO;
+import com.njcn.harmonic.pojo.po.day.RStatLimitRateDPO;
 import com.njcn.influxdb.param.InfluxDBPublicParam;
 import com.njcn.influxdb.utils.InfluxDbUtils;
 import com.njcn.prepare.harmonic.mapper.mysql.line.LimitRatePOMapper;
 import com.njcn.prepare.harmonic.pojo.influxdb.po.*;
-import com.njcn.prepare.harmonic.pojo.po.RStatLimitRateDPO;
 import com.njcn.prepare.harmonic.service.mysql.day.IRStatLimitRateDService;
 import lombok.AllArgsConstructor;
 import lombok.SneakyThrows;
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/LimitTargetServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/LimitTargetServiceImpl.java
index d149bcdc3..98dca09e6 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/LimitTargetServiceImpl.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/LimitTargetServiceImpl.java
@@ -3,14 +3,13 @@ package com.njcn.prepare.harmonic.service.mysql.Impl.line;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
 import com.njcn.harmonic.pojo.po.LimitRate;
+import com.njcn.harmonic.pojo.po.day.RStatLimitRateDPO;
+import com.njcn.harmonic.pojo.po.day.RStatLimitTargetDPO;
 import com.njcn.influxdb.utils.InfluxDbUtils;
 import com.njcn.prepare.harmonic.mapper.mysql.day.RStatLimitTargetDMapper;
 import com.njcn.prepare.harmonic.pojo.param.LineParam;
-import com.njcn.prepare.harmonic.pojo.po.RStatLimitRateDPO;
-import com.njcn.prepare.harmonic.pojo.po.RStatLimitTargetDPO;
 import com.njcn.prepare.harmonic.service.mysql.day.IRStatLimitRateDService;
 import com.njcn.prepare.harmonic.service.mysql.line.LimitTargetService;
 import lombok.AllArgsConstructor;
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 44ac1edcd..8b6b8271d 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
@@ -3,9 +3,9 @@ package com.njcn.prepare.harmonic.service.mysql.Impl.line;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
 import com.njcn.device.pq.api.LineFeignClient;
+import com.njcn.device.pq.pojo.po.RStatOnlinerateD;
 import com.njcn.energy.pojo.constant.ModelState;
 import com.njcn.influxdb.utils.InfluxDbUtils;
 import com.njcn.prepare.harmonic.mapper.mysql.day.RStatOnlineRateDMapper;
@@ -13,7 +13,6 @@ import com.njcn.prepare.harmonic.pojo.dto.OnLineRateDTO;
 import com.njcn.prepare.harmonic.pojo.param.LineParam;
 
 import com.njcn.prepare.harmonic.pojo.influxdb.po.PqsCommunicatePO;
-import com.njcn.prepare.harmonic.pojo.po.RStatOnlineRateDPO;
 import com.njcn.prepare.harmonic.service.mysql.line.OnlineRateService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -27,6 +26,8 @@ import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 
@@ -42,7 +43,7 @@ import static com.njcn.influxdb.param.InfluxDBPublicParam.DAY_MINUTE;
 @Slf4j
 @Service
 @AllArgsConstructor
-public class OnlineRateServiceImpl extends MppServiceImpl<RStatOnlineRateDMapper, RStatOnlineRateDPO> implements OnlineRateService {
+public class OnlineRateServiceImpl extends MppServiceImpl<RStatOnlineRateDMapper, RStatOnlinerateD> implements OnlineRateService {
 
     private final InfluxDbUtils influxDbUtils;
 
@@ -82,6 +83,8 @@ public class OnlineRateServiceImpl extends MppServiceImpl<RStatOnlineRateDMapper
     @Override
     @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);
         List<String> lineIdList = lineParam.getLineIds();
         if (CollUtil.isEmpty(lineParam.getLineIds())){
             lineIdList = lineFeignClient.getDeviceList().getData();
@@ -91,14 +94,14 @@ public class OnlineRateServiceImpl extends MppServiceImpl<RStatOnlineRateDMapper
             List<PqsCommunicatePO> communicateData = getCommunicateData(lineId);
             outCommunicateData.addAll(communicateData);
         }
-        List<RStatOnlineRateDPO> list = new ArrayList<>();
+        List<RStatOnlinerateD> list = new ArrayList<>();
         Date dateOut = DateUtil.parse(time);
         for (PqsCommunicatePO pqsCommunicate : outCommunicateData){
-            RStatOnlineRateDPO onlineRateDpo = new RStatOnlineRateDPO();
+            RStatOnlinerateD onlineRateDpo = new RStatOnlinerateD();
             Date newDate = Date.from(pqsCommunicate.getTime());
             OnLineRateDTO onLineRate = onLineMinute(newDate,dateOut,pqsCommunicate.getType(),pqsCommunicate.getDevId(),time);
-            onlineRateDpo.setTime(dateOut);
-            onlineRateDpo.setDevId(pqsCommunicate.getDevId());
+            onlineRateDpo.setTimeId(dateTime);
+            onlineRateDpo.setDevIndex(pqsCommunicate.getDevId());
             onlineRateDpo.setOnlineMin(onLineRate.getOnLineMinute());
             onlineRateDpo.setOfflineMin(onLineRate.getOffLineMinute());
             list.add(onlineRateDpo);
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataFlickerDService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataFlickerDService.java
index 6234e654f..b29d33fa0 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataFlickerDService.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataFlickerDService.java
@@ -1,6 +1,6 @@
 package com.njcn.prepare.harmonic.service.mysql.day;
 
-import com.njcn.prepare.harmonic.pojo.po.RStatDataFlickerDPO;
+import com.njcn.harmonic.pojo.po.day.RStatDataFlickerDPO;
 
 import java.util.List;
 
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataFlucDService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataFlucDService.java
index da5493e45..5fae92b6a 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataFlucDService.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataFlucDService.java
@@ -1,6 +1,6 @@
 package com.njcn.prepare.harmonic.service.mysql.day;
 
-import com.njcn.prepare.harmonic.pojo.po.RStatDataFlucDPO;
+import com.njcn.harmonic.pojo.po.day.RStatDataFlucDPO;
 
 import java.util.List;
 
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataHarmRateIDService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataHarmRateIDService.java
index 3fca043fa..4290d2cce 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataHarmRateIDService.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataHarmRateIDService.java
@@ -1,6 +1,6 @@
 package com.njcn.prepare.harmonic.service.mysql.day;
 
-import com.njcn.prepare.harmonic.pojo.po.RStatDataHarmrateIDPO;
+import com.njcn.harmonic.pojo.po.day.RStatDataHarmrateIDPO;
 
 import java.util.List;
 
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataHarmRateVDService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataHarmRateVDService.java
index fdb523759..238e0e4d2 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataHarmRateVDService.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataHarmRateVDService.java
@@ -1,6 +1,6 @@
 package com.njcn.prepare.harmonic.service.mysql.day;
 
-import com.njcn.prepare.harmonic.pojo.po.RStatDataHarmrateVDPO;
+import com.njcn.harmonic.pojo.po.day.RStatDataHarmrateVDPO;
 
 import java.util.List;
 
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataHarmphasicIDService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataHarmphasicIDService.java
index 3a615737e..f6db8acd9 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataHarmphasicIDService.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataHarmphasicIDService.java
@@ -1,6 +1,6 @@
 package com.njcn.prepare.harmonic.service.mysql.day;
 
-import com.njcn.prepare.harmonic.pojo.po.RStatDataHarmphasicIDPO;
+import com.njcn.harmonic.pojo.po.day.RStatDataHarmphasicIDPO;
 
 import java.util.List;
 
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataHarmphasicVDService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataHarmphasicVDService.java
index f55e7845f..b236f20f0 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataHarmphasicVDService.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataHarmphasicVDService.java
@@ -1,6 +1,6 @@
 package com.njcn.prepare.harmonic.service.mysql.day;
 
-import com.njcn.prepare.harmonic.pojo.po.RStatDataHarmphasicVDPO;
+import com.njcn.harmonic.pojo.po.day.RStatDataHarmphasicVDPO;
 
 import java.util.List;
 
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataHarmpowerPDService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataHarmpowerPDService.java
index 08c0657e6..5c6173e37 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataHarmpowerPDService.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataHarmpowerPDService.java
@@ -1,6 +1,6 @@
 package com.njcn.prepare.harmonic.service.mysql.day;
 
-import com.njcn.prepare.harmonic.pojo.po.RStatDataHarmpowerPDPO;
+import com.njcn.harmonic.pojo.po.day.RStatDataHarmpowerPDPO;
 
 import java.util.List;
 
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataHarmpowerQDService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataHarmpowerQDService.java
index 06f072349..9ab837bb4 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataHarmpowerQDService.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataHarmpowerQDService.java
@@ -1,6 +1,6 @@
 package com.njcn.prepare.harmonic.service.mysql.day;
 
-import com.njcn.prepare.harmonic.pojo.po.RStatDataHarmpowerQDPO;
+import com.njcn.harmonic.pojo.po.day.RStatDataHarmpowerQDPO;
 
 import java.util.List;
 
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataHarmpowerSDService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataHarmpowerSDService.java
index c7d831a66..1c71d5652 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataHarmpowerSDService.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataHarmpowerSDService.java
@@ -1,6 +1,6 @@
 package com.njcn.prepare.harmonic.service.mysql.day;
 
-import com.njcn.prepare.harmonic.pojo.po.RStatDataHarmpowerSDPO;
+import com.njcn.harmonic.pojo.po.day.RStatDataHarmpowerSDPO;
 
 import java.util.List;
 
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataIDService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataIDService.java
index 7fd867990..296304560 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataIDService.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataIDService.java
@@ -1,6 +1,6 @@
 package com.njcn.prepare.harmonic.service.mysql.day;
 
-import com.njcn.prepare.harmonic.pojo.po.RStatDataIDPO;
+import com.njcn.harmonic.pojo.po.day.RStatDataIDPO;
 
 import java.util.List;
 
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataInharmIDService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataInharmIDService.java
index faafb2064..a7e48e568 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataInharmIDService.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataInharmIDService.java
@@ -1,6 +1,6 @@
 package com.njcn.prepare.harmonic.service.mysql.day;
 
-import com.njcn.prepare.harmonic.pojo.po.RStatDataInharmIDPO;
+import com.njcn.harmonic.pojo.po.day.RStatDataInharmIDPO;
 
 import java.util.List;
 
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataInharmVDService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataInharmVDService.java
index 9a78c5ccf..4ae42d0f6 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataInharmVDService.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataInharmVDService.java
@@ -1,6 +1,6 @@
 package com.njcn.prepare.harmonic.service.mysql.day;
 
-import com.njcn.prepare.harmonic.pojo.po.RStatDataInharmVDPO;
+import com.njcn.harmonic.pojo.po.day.RStatDataInharmVDPO;
 
 import java.util.List;
 
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataPltDService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataPltDService.java
index ee429db36..f85c8ba06 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataPltDService.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataPltDService.java
@@ -1,6 +1,6 @@
 package com.njcn.prepare.harmonic.service.mysql.day;
 
-import com.njcn.prepare.harmonic.pojo.po.RStatDataPltDPO;
+import com.njcn.harmonic.pojo.po.day.RStatDataPltDPO;
 
 import java.util.List;
 
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataVDService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataVDService.java
index 8a4bd543b..cd8b95100 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataVDService.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataVDService.java
@@ -1,7 +1,6 @@
 package com.njcn.prepare.harmonic.service.mysql.day;
 
-import com.njcn.prepare.harmonic.pojo.po.RStatDataFlickerDPO;
-import com.njcn.prepare.harmonic.pojo.po.RStatDataVDPO;
+import com.njcn.harmonic.pojo.po.day.RStatDataVDPO;
 
 import java.util.List;
 
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatLimitRateDService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatLimitRateDService.java
index 99bfefd82..744dc2ea3 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatLimitRateDService.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatLimitRateDService.java
@@ -1,7 +1,6 @@
 package com.njcn.prepare.harmonic.service.mysql.day;
 
-import com.njcn.prepare.harmonic.pojo.po.RStatDataVDPO;
-import com.njcn.prepare.harmonic.pojo.po.RStatLimitRateDPO;
+import com.njcn.harmonic.pojo.po.day.RStatLimitRateDPO;
 
 import java.util.List;