代码合并谐波

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/excel/monitor/ITimes.java

@@ -1,7 +1,6 @@
 package com.njcn.harmonic.pojo.excel.monitor;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/excel/substation/SubstationExcel.java

@@ -1,7 +1,6 @@
 package com.njcn.harmonic.pojo.excel.substation;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/HistoryParam.java

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Pattern;
 
 /**
@@ -41,5 +42,6 @@ public class HistoryParam {
     private Integer valueType;
 
     @ApiModelProperty("接线方式")
+    @NotNull(message = "接线方式不可为空")
     private Integer ptType;
 }

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/OverviewParam.java

@@ -22,4 +22,30 @@ public class OverviewParam {
 
     @ApiModelProperty(name = "month", value = "月份")
     private List<String> month;
+
+    @Data
+    public static class OverviewDateParam {
+        private static final long serialVersionUID = 1L;
+
+        @ApiModelProperty(name = "id", value = "单位id")
+        private String id;
+
+        @ApiModelProperty(name = "startTime", value = "开始时间")
+        private String startTime;
+
+        @ApiModelProperty(name = "endTime", value = "结束时间")
+        private String endTime;
+
+
+    }
+
+    @Data
+    public static class OverviewVoltageParam extends OverviewParam {
+        private static final long serialVersionUID = 1L;
+
+        @ApiModelProperty(name = "type", value = "区分高低压")
+        private Integer type;
+
+
+    }
 }

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/RStatFileVO.java

@@ -1,13 +1,9 @@
 package com.njcn.harmonic.pojo.param;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * <功能描述>

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/RStatOrgParam.java

@@ -3,7 +3,6 @@ package com.njcn.harmonic.pojo.param;
 import com.njcn.common.pojo.param.StatisticsBizBaseParam;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 
 import java.util.List;
 

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

@@ -8,7 +8,7 @@ import lombok.Data;
 import java.util.Date;
 
 /**
- * 
+ *
  * Description:
  * 接口文档访问地址：http://serverIP:port/swagger-ui.html
  * Date: 2022/12/1  9:18【需求编号】
@@ -16,8 +16,9 @@ import java.util.Date;
  * @author clam
  * @version V1.0.0
  */
+
 /**
-    * 终端评价详情表 
+    * 终端评价详情表
     */
 @Data
 @TableName(value = "r_mp_dev_evaluate_detail")
@@ -57,4 +58,4 @@ public class RMpDevEvaluateDetailPO {
      */
     @TableField(value = "dev_effective_rate")
     private Double devEffectiveRate;
-}
+}

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

@@ -8,7 +8,7 @@ import lombok.Data;
 import java.util.Date;
 
 /**
- * 
+ *
  * Description:
  * 接口文档访问地址：http://serverIP:port/swagger-ui.html
  * Date: 2022/12/28  14:58【需求编号】
@@ -16,6 +16,7 @@ import java.util.Date;
  * @author clam
  * @version V1.0.0
  */
+
 /**
     * 监测点暂态指标超标明细日表
     */
@@ -51,4 +52,4 @@ public class RMpEventDetailDPO {
      */
     @TableField(value = "interrupt_times")
     private Integer interruptTimes;
-}
+}

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

@@ -8,7 +8,7 @@ import lombok.Data;
 import java.util.Date;
 
 /**
- * 
+ *
  * Description:
  * 接口文档访问地址：http://serverIP:port/swagger-ui.html
  * Date: 2022/12/28  14:58【需求编号】
@@ -16,6 +16,7 @@ import java.util.Date;
  * @author clam
  * @version V1.0.0
  */
+
 /**
     * 监测点暂态指标超标明细月表
     */
@@ -51,4 +52,4 @@ public class RMpEventDetailMPO {
      */
     @TableField(value = "interrupt_times")
     private Integer interruptTimes;
-}
+}

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

@@ -8,7 +8,7 @@ import lombok.Data;
 import java.util.Date;
 
 /**
- * 
+ *
  * Description:
  * 接口文档访问地址：http://serverIP:port/swagger-ui.html
  * Date: 2022/12/28  14:58【需求编号】
@@ -16,6 +16,7 @@ import java.util.Date;
  * @author clam
  * @version V1.0.0
  */
+
 /**
     * 监测点暂态指标超标明细季表
     */
@@ -51,4 +52,4 @@ public class RMpEventDetailQPO {
      */
     @TableField(value = "interrupt_times")
     private Integer interruptTimes;
-}
+}

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

@@ -8,7 +8,7 @@ import lombok.Data;
 import java.util.Date;
 
 /**
- * 
+ *
  * Description:
  * 接口文档访问地址：http://serverIP:port/swagger-ui.html
  * Date: 2022/12/28  14:58【需求编号】
@@ -16,6 +16,7 @@ import java.util.Date;
  * @author clam
  * @version V1.0.0
  */
+
 /**
     * 监测点暂态指标超标明细年表
     */
@@ -51,4 +52,4 @@ public class RMpEventDetailYPO {
      */
     @TableField(value = "interrupt_times")
     private Integer interruptTimes;
-}
+}

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

@@ -1,14 +1,12 @@
 package com.njcn.harmonic.pojo.po;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.util.Date;
-
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
  * 稳态监测点指标日报-日表(主配网表)  /各次谐波电流有效值
  * @author jianghf
@@ -1071,4 +1069,4 @@ public class RMpHarmonicIMagReportD implements Serializable {
     private Double harmonicCurrentEffective5095;
 
 
-}
+}

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

@@ -1,14 +1,12 @@
 package com.njcn.harmonic.pojo.po;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.util.Date;
-
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
  * 稳态监测点指标日报-日表(主网表)  /各次谐波电流含有率
  * @TableName r_mp_harmonic_i_rate_report_d
@@ -1026,4 +1024,4 @@ public class RMpHarmonicIRateReportD implements Serializable {
     private Double i50Cp95;
 
 
-}
+}

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

@@ -1,15 +1,12 @@
 package com.njcn.harmonic.pojo.po;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.util.Date;
-
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
  * 稳态监测点指标日报-日表(主网表)  /各次间谐波电流含有率
  * @TableName r_mp_inharmonic_i_rate_report_d
@@ -1027,4 +1024,4 @@ public class RMpInharmonicIRateReportD implements Serializable {
     private Double inharmI50Cp95;
 
 
-}
+}

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

@@ -1,18 +1,19 @@
 package com.njcn.harmonic.pojo.po;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
-import java.time.LocalDate;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+import java.time.LocalDate;
+
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author rui.wu

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

@@ -1,18 +1,19 @@
 package com.njcn.harmonic.pojo.po;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
-import java.time.LocalDate;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+import java.time.LocalDate;
+
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author rui.wu

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

@@ -1,18 +1,19 @@
 package com.njcn.harmonic.pojo.po;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
-import java.time.LocalDate;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+import java.time.LocalDate;
+
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author rui.wu

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

@@ -1,9 +1,7 @@
 package com.njcn.harmonic.pojo.po;
 
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -141,4 +139,4 @@ public class RMpPvPowerDetailMPO implements Serializable {
 
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
-}
+}

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

@@ -1,15 +1,16 @@
 package com.njcn.harmonic.pojo.po;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
-import java.time.LocalDate;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+import java.time.LocalDate;
+
 /**
  * <p>
  * 电气化铁路_详细信息表（专项分析）

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

@@ -12,7 +12,7 @@ import java.io.Serializable;
 import java.util.Date;
 
 /**
- * 
+ *
  * Description:
  * 接口文档访问地址：http://serverIP:port/swagger-ui.html
  * Date: 2022/10/10  19:59【需求编号】
@@ -20,6 +20,7 @@ import java.util.Date;
  * @author clam
  * @version V1.0.0
  */
+
 /**
     * 谐波畸变率排名
     */
@@ -58,4 +59,4 @@ public class RMpVThd implements Serializable {
     private Double vThd;
 
     private static final long serialVersionUID = 1L;
-}
+}

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

@@ -1,16 +1,17 @@
 package com.njcn.harmonic.pojo.po;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
-import java.time.LocalDate;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+import java.time.LocalDate;
+
 /**
  * <p>
  * 风电站_台区电能质量明细_月表

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

@@ -1,16 +1,17 @@
 package com.njcn.harmonic.pojo.po;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
-import java.time.LocalDate;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+import java.time.LocalDate;
+
 /**
  * <p>
  * 风电站_台区电能质量明细_季表

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

@@ -1,16 +1,17 @@
 package com.njcn.harmonic.pojo.po;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
-import java.time.LocalDate;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+import java.time.LocalDate;
+
 /**
  * <p>
  * 风电站_台区电能质量明细_年表

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

@@ -8,7 +8,7 @@ import lombok.Data;
 import java.util.Date;
 
 /**
- * 
+ *
  * Description:
  * 接口文档访问地址：http://serverIP:port/swagger-ui.html
  * Date: 2022/11/30  13:59【需求编号】
@@ -16,8 +16,9 @@ import java.util.Date;
  * @author clam
  * @version V1.0.0
  */
+
 /**
-    * 主网运行指标统计-月表,主网监测指标数据质量统计-月表 
+    * 主网运行指标统计-月表,主网监测指标数据质量统计-月表
     */
 @Data
 @TableName(value = "r_operating_index_m")
@@ -99,4 +100,4 @@ public class ROperatingIndexMPO {
      */
     @TableField(value = "is_unusual")
     private Integer isUnusual;
-}
+}

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

@@ -8,7 +8,7 @@ import lombok.Data;
 import java.util.Date;
 
 /**
- * 
+ *
  * Description:
  * 接口文档访问地址：http://serverIP:port/swagger-ui.html
  * Date: 2022/11/30  15:58【需求编号】
@@ -16,8 +16,9 @@ import java.util.Date;
  * @author clam
  * @version V1.0.0
  */
+
 /**
-    * 主网运行指标统计-季表 ,主网监测指标数据质量统计-季表 
+    * 主网运行指标统计-季表 ,主网监测指标数据质量统计-季表
     */
 @Data
 @TableName(value = "r_operating_index_q")
@@ -99,4 +100,4 @@ public class ROperatingIndexQPO {
      */
     @TableField(value = "is_unusual")
     private Integer isUnusual;
-}
+}

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

@@ -8,7 +8,7 @@ import lombok.Data;
 import java.util.Date;
 
 /**
- * 
+ *
  * Description:
  * 接口文档访问地址：http://serverIP:port/swagger-ui.html
  * Date: 2022/11/30  15:58【需求编号】
@@ -16,8 +16,9 @@ import java.util.Date;
  * @author clam
  * @version V1.0.0
  */
+
 /**
-    * 主网运行指标统计-年表,主网监测指标数据质量统计-年表 
+    * 主网运行指标统计-年表,主网监测指标数据质量统计-年表
     */
 @Data
 @TableName(value = "r_operating_index_y")
@@ -99,4 +100,4 @@ public class ROperatingIndexYPO {
      */
     @TableField(value = "is_unusual")
     private Integer isUnusual;
-}
+}

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

@@ -1,18 +1,19 @@
 package com.njcn.harmonic.pojo.po;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author wr

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

@@ -1,18 +1,19 @@
 package com.njcn.harmonic.pojo.po;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
-import java.time.LocalDate;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+import java.time.LocalDate;
+
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author rui.wu

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

@@ -1,18 +1,19 @@
 package com.njcn.harmonic.pojo.po;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
-import java.time.LocalDate;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+import java.time.LocalDate;
+
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author rui.wu

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

@@ -1,18 +1,19 @@
 package com.njcn.harmonic.pojo.po;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
-import java.time.LocalDate;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+import java.time.LocalDate;
+
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author rui.wu

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

@@ -1,18 +1,19 @@
 package com.njcn.harmonic.pojo.po;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
-import java.time.LocalDate;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+import java.time.LocalDate;
+
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author rui.wu

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

@@ -1,18 +1,19 @@
 package com.njcn.harmonic.pojo.po;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
-import java.time.LocalDate;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+import java.time.LocalDate;
+
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author rui.wu

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

@@ -1,18 +1,19 @@
 package com.njcn.harmonic.pojo.po;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
-import java.time.LocalDate;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+import java.time.LocalDate;
+
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author rui.wu

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

@@ -8,7 +8,7 @@ import lombok.Data;
 import java.util.Date;
 
 /**
- * 
+ *
  * Description:
  * 接口文档访问地址：http://serverIP:port/swagger-ui.html
  * Date: 2022/12/13  15:39【需求编号】
@@ -16,6 +16,7 @@ import java.util.Date;
  * @author clam
  * @version V1.0.0
  */
+
 /**
     * 区域分类统计日表
     */
@@ -87,4 +88,4 @@ public class RStatOrgDPO {
      */
     @TableField(value = "warn_count")
     private Integer warnCount;
-}
+}

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

@@ -1,15 +1,16 @@
 package com.njcn.harmonic.pojo.po;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
-import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 区域分类统计月表

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

@@ -8,7 +8,7 @@ import lombok.Data;
 import java.util.Date;
 
 /**
- * 
+ *
  * Description:
  * 接口文档访问地址：http://serverIP:port/swagger-ui.html
  * Date: 2022/12/14  16:17【需求编号】
@@ -16,6 +16,7 @@ import java.util.Date;
  * @author clam
  * @version V1.0.0
  */
+
 /**
     * 区域分类统计月表
     */
@@ -148,4 +149,4 @@ public class RStatOrgMPO {
     private Integer warnCount;
 
 
-}
+}

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

@@ -1,15 +1,16 @@
 package com.njcn.harmonic.pojo.po;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
-import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 区域分类统计季表

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

@@ -1,15 +1,16 @@
 package com.njcn.harmonic.pojo.po;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
-import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 区域分类统计年表

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

@@ -12,7 +12,7 @@ import java.io.Serializable;
 import java.util.Date;
 
 /**
- * 
+ *
  * Description:
  * 接口文档访问地址：http://serverIP:port/swagger-ui.html
  * Date: 2022/11/8  13:27【需求编号】
@@ -20,6 +20,7 @@ import java.util.Date;
  * @author clam
  * @version V1.0.0
  */
+
 /**
     * 单位污区图统计日表
     */
@@ -58,4 +59,4 @@ public class RStatPollutionOrgDPO implements Serializable {
     private Double value;
 
     private static final long serialVersionUID = 1L;
-}
+}

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

@@ -12,7 +12,7 @@ import java.io.Serializable;
 import java.util.Date;
 
 /**
- * 
+ *
  * Description:
  * 接口文档访问地址：http://serverIP:port/swagger-ui.html
  * Date: 2022/11/3  10:18【需求编号】
@@ -20,6 +20,7 @@ import java.util.Date;
  * @author clam
  * @version V1.0.0
  */
+
 /**
     * 单位污区图统计月表
     */
@@ -58,4 +59,4 @@ public class RStatPollutionOrgMPO implements Serializable {
     private Double value;
 
     private static final long serialVersionUID = 1L;
-}
+}

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

@@ -1,19 +1,18 @@
 package com.njcn.harmonic.pojo.po;
 
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.io.Serializable;
-import java.util.Date;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
- * 
+ *
  * Description:
  * 接口文档访问地址：http://serverIP:port/swagger-ui.html
  * Date: 2022/11/8  13:27【需求编号】
@@ -21,6 +20,7 @@ import lombok.NoArgsConstructor;
  * @author clam
  * @version V1.0.0
  */
+
 /**
     * 单位污区图统计季表
     */
@@ -59,4 +59,4 @@ public class RStatPollutionOrgQPO implements Serializable {
     private Double value;
 
     private static final long serialVersionUID = 1L;
-}
+}

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

@@ -1,19 +1,18 @@
 package com.njcn.harmonic.pojo.po;
 
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.io.Serializable;
-import java.util.Date;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
- * 
+ *
  * Description:
  * 接口文档访问地址：http://serverIP:port/swagger-ui.html
  * Date: 2022/11/8  13:28【需求编号】
@@ -21,6 +20,7 @@ import lombok.NoArgsConstructor;
  * @author clam
  * @version V1.0.0
  */
+
 /**
     * 单位污区图统计年表
     */
@@ -59,4 +59,4 @@ public class RStatPollutionOrgYPO implements Serializable {
     private Double value;
 
     private static final long serialVersionUID = 1L;
-}
+}

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

@@ -1,19 +1,18 @@
 package com.njcn.harmonic.pojo.po;
 
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.io.Serializable;
-import java.util.Date;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
- * 
+ *
  * Description:
  * 接口文档访问地址：http://serverIP:port/swagger-ui.html
  * Date: 2022/11/8  13:28【需求编号】
@@ -21,6 +20,7 @@ import lombok.NoArgsConstructor;
  * @author clam
  * @version V1.0.0
  */
+
 /**
     * 变电站污区图统计日表
     */
@@ -59,4 +59,4 @@ public class RStatPollutionSubstationDPO implements Serializable {
     private Double value;
 
     private static final long serialVersionUID = 1L;
-}
+}

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

@@ -1,19 +1,18 @@
 package com.njcn.harmonic.pojo.po;
 
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.io.Serializable;
-import java.util.Date;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
- * 
+ *
  * Description:
  * 接口文档访问地址：http://serverIP:port/swagger-ui.html
  * Date: 2022/11/8  13:28【需求编号】
@@ -21,6 +20,7 @@ import lombok.NoArgsConstructor;
  * @author clam
  * @version V1.0.0
  */
+
 /**
     * 变电站污区图统计季表
     */
@@ -59,4 +59,4 @@ public class RStatPollutionSubstationQPO implements Serializable {
     private Double value;
 
     private static final long serialVersionUID = 1L;
-}
+}

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

@@ -1,19 +1,18 @@
 package com.njcn.harmonic.pojo.po;
 
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.io.Serializable;
-import java.util.Date;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
- * 
+ *
  * Description:
  * 接口文档访问地址：http://serverIP:port/swagger-ui.html
  * Date: 2022/11/8  13:28【需求编号】
@@ -21,6 +20,7 @@ import lombok.NoArgsConstructor;
  * @author clam
  * @version V1.0.0
  */
+
 /**
     * 变电站污区图统计年表
     */
@@ -59,4 +59,4 @@ public class RStatPollutionSubstationYPO implements Serializable {
     private Double value;
 
     private static final long serialVersionUID = 1L;
-}
+}

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

@@ -1,14 +1,14 @@
 package com.njcn.harmonic.pojo.po;
 
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.util.Date;
 import lombok.Data;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
- * 
+ *
  * @TableName r_stat_pw_permeability_m
  */
 @TableName(value ="r_stat_pw_permeability_m")
@@ -79,4 +79,4 @@ public class RStatPwPermeabilityM implements Serializable {
     private String permeabilityType;
 
 
-}
+}

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

@@ -1,18 +1,19 @@
 package com.njcn.harmonic.pojo.po;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
-import java.time.LocalDate;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+import java.time.LocalDate;
+
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author rui.wu

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

@@ -1,18 +1,19 @@
 package com.njcn.harmonic.pojo.po;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
-import java.time.LocalDate;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+import java.time.LocalDate;
+
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author rui.wu

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

@@ -1,18 +1,19 @@
 package com.njcn.harmonic.pojo.po;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
-import java.time.LocalDate;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+import java.time.LocalDate;
+
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author rui.wu

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

@@ -1,18 +1,19 @@
 package com.njcn.harmonic.pojo.po;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
-import java.time.LocalDate;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+import java.time.LocalDate;
+
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author rui.wu

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

@@ -1,7 +1,6 @@
 package com.njcn.harmonic.pojo.po;
 
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
@@ -64,4 +63,4 @@ public class WfOfOverviewPO implements Serializable {
 
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
-}
+}

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/EventDetailVO.java

@@ -3,7 +3,6 @@ package com.njcn.harmonic.pojo.vo;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * @author denghuajun

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/HarmonicDeptVO.java

@@ -4,8 +4,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.List;
-import java.util.Objects;
 
 /**
  * 类的介绍：

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/HarmonicVO.java

@@ -4,8 +4,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.List;
-import java.util.Objects;
 
 /**
  * 类的介绍：

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/HistoryDataResultVO.java

@@ -4,8 +4,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalTime;
-import java.util.ArrayList;
 import java.util.List;
 
 /**

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/IntegrityIconVO.java

@@ -6,9 +6,6 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
 
 /**
  * 类的介绍：

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/OverviewVO.java

@@ -4,7 +4,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -39,11 +38,38 @@ public class OverviewVO implements Serializable {
         @ApiModelProperty(name = "monitorSort", value = "监测点类别")
         private String monitorSort;
 
-        @ApiModelProperty(name = "unbalanceAlarm", value = "三项不平横")
+        @ApiModelProperty(name = "subset", value = "子集集合")
         private List<?> subset;
 
     }
 
+    @Data
+    public static class ExcessiveVO {
+        private static final long serialVersionUID = 1L;
+
+        @ApiModelProperty(name = "monitorSort", value = "监测点类别")
+        private String monitorSort;
+
+        @ApiModelProperty(name = "harmonic", value = "谐波电压占比")
+        private String harmonic;
+
+        @ApiModelProperty(name = "harmonicTb", value = "谐波电压同比占比")
+        private String harmonicTb;
+
+        @ApiModelProperty(name = "voltage", value = "电压偏差占比")
+        private String voltage;
+
+        @ApiModelProperty(name = "voltageTb", value = "电压偏差同比占比")
+        private String voltageTb;
+
+        @ApiModelProperty(name = "Flicker", value = "闪变占比")
+        private String flicker;
+
+        @ApiModelProperty(name = "flickerTb", value = "闪变同比占比")
+        private String flickerTb;
+    }
+
+
     @Data
     public static class VoltageVO {
         private static final long serialVersionUID = 1L;
@@ -55,8 +81,42 @@ public class OverviewVO implements Serializable {
         private String areaPqEventType;
 
         @ApiModelProperty(name = "totalMonitorNum", value = "累计监测点")
-        private String totalMonitorNum;
-
+        private Integer totalMonitorNum;
 
     }
+
+    @Data
+    public static class NumVO {
+        private static final long serialVersionUID = 1L;
+
+        private Integer numOne;
+
+        private Integer numTwo;
+
+        private Integer numThree;
+    }
+
+
+
+    @Data
+    public static class IcoVO {
+        private static final long serialVersionUID = 1L;
+
+        private Integer numOne;
+
+        private Integer numTwo;
+
+    }
+
+    @Data
+    public static class StatOrgVO {
+        private static final long serialVersionUID = 1L;
+
+        @ApiModelProperty(value = "监测点类型")
+        private String measurementTypeClass;
+
+        @ApiModelProperty(value = "累计有效接入监测点数")
+        private Integer effectiveMeasurementAccrued;
+    }
+
 }

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/PwRMpBenchmarkLevelVO.java

@@ -4,7 +4,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * @Title PwRMpBenchmarkLevelVO

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/QueryResultLimitVO.java

@@ -1,8 +1,8 @@
 package com.njcn.harmonic.pojo.vo;
 
 import lombok.Data;
-
 import org.influxdb.dto.QueryResult;
+
 import java.io.Serializable;
 import java.util.List;
 

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpEmissionChartVO.java

@@ -1,12 +1,9 @@
 package com.njcn.harmonic.pojo.vo;
 
-import com.njcn.harmonic.pojo.po.RMpEmissionIExcessRateM;
-import com.njcn.harmonic.pojo.po.RMpEmissionIM;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * 发射特性-折线图

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpEmissionIExcessRateMVO.java

@@ -1,6 +1,5 @@
 package com.njcn.harmonic.pojo.vo;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
 import java.io.Serializable;

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpEmissionIMVO.java

@@ -1,6 +1,5 @@
 package com.njcn.harmonic.pojo.vo;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
 import java.io.Serializable;

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpEmissionVO.java

@@ -1,7 +1,5 @@
 package com.njcn.harmonic.pojo.vo;
 
-import com.njcn.harmonic.pojo.po.RMpEmissionIExcessRateM;
-import com.njcn.harmonic.pojo.po.RMpEmissionIM;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpHarmonicReportDVO.java

@@ -3,7 +3,6 @@ package com.njcn.harmonic.pojo.vo;
 import com.njcn.harmonic.pojo.po.*;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.json.JSONObject;
 
 import java.io.Serializable;
 import java.util.Map;

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpInfluenceVExcessRateMVO.java

@@ -1,6 +1,5 @@
 package com.njcn.harmonic.pojo.vo;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
 import java.io.Serializable;

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpInfluenceVMVO.java

@@ -1,6 +1,5 @@
 package com.njcn.harmonic.pojo.vo;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
 import java.io.Serializable;

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpInfluenceVO.java

@@ -1,7 +1,5 @@
 package com.njcn.harmonic.pojo.vo;
 
-import com.njcn.harmonic.pojo.po.RMpInfluenceVExcessRateM;
-import com.njcn.harmonic.pojo.po.RMpInfluenceVM;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpPartHarmonicDetailIconVO.java

@@ -3,8 +3,6 @@ package com.njcn.harmonic.pojo.vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.time.LocalDate;
-
 /**
  * <功能描述>
  *

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpPartHarmonicDetailVO.java

@@ -1,8 +1,5 @@
 package com.njcn.harmonic.pojo.vo;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.njcn.harmonic.pojo.po.RMpPartHarmonicDetailD;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpRailwayTractionDetailVO.java

@@ -1,12 +1,8 @@
 package com.njcn.harmonic.pojo.vo;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
 import java.time.LocalDate;

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpWpPowerDetailVO.java

@@ -4,8 +4,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDate;
-import java.util.List;
 
 /**
  * 专项分析-风电场-详细数据表

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatLoadTypeVO.java

@@ -1,19 +1,11 @@
 package com.njcn.harmonic.pojo.vo;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.time.LocalDate;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author rui.wu

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatOrgIndexVO.java

@@ -3,7 +3,6 @@ package com.njcn.harmonic.pojo.vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
 
 
 /**

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RSubstationIconVO.java

@@ -1,6 +1,5 @@
 package com.njcn.harmonic.pojo.vo;
 
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**