预处理实体类调整

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>

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatIntegrityDPO.java

@@ -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;
-}

pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatOnlineRateDPO.java

@@ -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;
-}

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.harmonic.pojo.po.day.RStatAssesDPO;
-import com.njcn.prepare.harmonic.pojo.po.RStatOnlineRateDPO;
 
 public interface RStatAssesDMapper extends MppBaseMapper<RStatAssesDPO> {
 }

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.harmonic.pojo.po.day.RStatComassesDPO;
-import com.njcn.prepare.harmonic.pojo.po.RStatComassesDPO;
 
 public interface RStatComassesDMapper extends MppBaseMapper<RStatComassesDPO> {
 }

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> {
 }

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> {
 }

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> {
 }

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> {
 }

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.harmonic.pojo.po.day.RStatDataHarmphasicIDPO;
-import com.njcn.prepare.harmonic.pojo.po.RStatDataVDPO;
 
 public interface RStatDataHarmphasicIDMapper extends MppBaseMapper<RStatDataHarmphasicIDPO> {
 }

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> {
 }

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.harmonic.pojo.po.day.RStatDataHarmpowerPDPO;
-import com.njcn.prepare.harmonic.pojo.po.RStatDataVDPO;
 
 public interface RStatDataHarmpowerPDMapper extends MppBaseMapper<RStatDataHarmpowerPDPO> {
 }

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> {
 }

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> {
 }

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> {
 }

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> {
 }

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> {
 }

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> {
 }

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.harmonic.pojo.po.day.RStatDataVDPO;
-import com.njcn.prepare.harmonic.pojo.po.RStatDataVDPO;
 
 public interface RStatDataVDMapper extends MppBaseMapper<RStatDataVDPO> {
 }

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> {
 }

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.harmonic.pojo.po.day.RStatLimitRateDPO;
-import com.njcn.prepare.harmonic.pojo.po.RStatLimitTargetDPO;
 
 public interface RStatLimitRateDMapper extends MppBaseMapper<RStatLimitRateDPO> {
 }

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> {
 }

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.device.pq.pojo.po.RStatOnlinerateD;
-import com.njcn.prepare.harmonic.pojo.po.RStatOnlineRateDPO;
 
-public interface RStatOnlineRateDMapper extends MppBaseMapper<RStatOnlineRateDPO> {
+public interface RStatOnlineRateDMapper extends MppBaseMapper<RStatOnlinerateD> {
 }

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;
 

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;
 

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;

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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.harmonic.pojo.po.day.RStatLimitRateDPO;
-import com.njcn.energy.pojo.po.EleEvtParm;
 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;
 

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;

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;

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;

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<RStatIntegrityD> list = new ArrayList<>();
-        List<RStatIntegrityDPO> list = new ArrayList<>();
         for (LineDetail lineDetail :lineDetailList){
             int dataCount = getDataCount(lineDetail.getId(),time);
-            RStatIntegrityDPO integrityDpo = new RStatIntegrityDPO();
+            RStatIntegrityD integrityDpo = new RStatIntegrityD();
-            integrityDpo.setTime(dateOut);
+            integrityDpo.setTimeId(dateTime);
-            integrityDpo.setLineId(lineDetail.getId());
+            integrityDpo.setLineIndex(lineDetail.getId());
             integrityDpo.setDueTime(DAY_MINUTE/lineDetail.getTimeInterval());
             integrityDpo.setRealTime(dataCount);
             list.add(integrityDpo);

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;

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;

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.setTimeId(dateTime);
-            onlineRateDpo.setDevId(pqsCommunicate.getDevId());
+            onlineRateDpo.setDevIndex(pqsCommunicate.getDevId());
             onlineRateDpo.setOnlineMin(onLineRate.getOnLineMinute());
             onlineRateDpo.setOfflineMin(onLineRate.getOffLineMinute());
             list.add(onlineRateDpo);

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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.harmonic.pojo.po.day.RStatDataVDPO;
-import com.njcn.prepare.harmonic.pojo.po.RStatDataVDPO;
 
 import java.util.List;
 

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.harmonic.pojo.po.day.RStatLimitRateDPO;
-import com.njcn.prepare.harmonic.pojo.po.RStatLimitRateDPO;
 
 import java.util.List;