合并代码提交

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/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;
 
@@ -25,4 +24,13 @@ public class RStatOrgParam extends StatisticsBizBaseParam {
     @ApiModelProperty(name = "powerrIds",value = "变电站id")
     private List<String> powerrIds;
 
+    @Data
+    public static class  PwRStatOrgParam extends RStatOrgParam{
+
+        @ApiModelProperty(name = "monitorSort", value = "监测点类别")
+        private List<String> monitorSort;
+
+        @ApiModelProperty(name = "voltageLevels", value = "电压等级")
+        private List<String> voltageLevels;
+    }
 }

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/RMpHarmonicVRateReportD.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;
+
 /**
  *
  * 稳态监测点指标日报-日表(主配网表)  /各次谐波电压含有率
@@ -1072,4 +1070,4 @@ public class RMpHarmonicVRateReportD implements Serializable {
     private Double harmonicVoltageContent5095;
 
 
-}
+}

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/RMpInharmonicVRateReportD.java

@@ -1,17 +1,14 @@
 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_v_rate_report_d
  */
 @TableName(value ="r_mp_inharmonic_v_rate_report_d")
@@ -1047,4 +1044,4 @@ public class RMpInharmonicVRateReportD implements Serializable {
     private Double inharmV50Cp95;
 
 
-}
+}

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

@@ -1,17 +1,14 @@
 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_measure_phase_report_d
  */
 @TableName(value ="r_mp_measure_phase_report_d")
@@ -249,4 +246,4 @@ public class RMpMeasurePhaseReportD implements Serializable {
     private Double spFundamentalPowerFactor95;
 
 
-}
+}

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

@@ -1,17 +1,11 @@
 package com.njcn.harmonic.pojo.po;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-import javax.validation.constraints.NotNull;
-
-import java.io.Serializable;
-
-import java.util.Date;
-
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.hibernate.validator.constraints.Length;
+
+import java.io.Serializable;
+import java.util.Date;
 
 /**
 * 【稳态监测点非谐波不带相位指标日报-日表】

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPartHarmonicDetailD.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/RMpPartHarmonicDetailM.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/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/RMpSurplusHarmonicDetailD.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/RMpSurplusHarmonicDetailM.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/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/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/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/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/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/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/PwRStatOrgVO.java

@@ -20,7 +20,7 @@ public class PwRStatOrgVO {
     private String orgName;
 
     @ApiModelProperty(value = "监测点类别")
-    private String measurementTypeClass;
+    private String monitorSort;
 
     @ApiModelProperty(value = "在线监测点数")
     private String allCount;
@@ -34,4 +34,19 @@ public class PwRStatOrgVO {
     @ApiModelProperty(value = "闪变合格率")
     private Float flickerPassRate;
 
+    @Data
+    public static class PwRStatOrgDetailVO extends PwRStatOrgVO {
+
+        @ApiModelProperty(value = "监测点ID")
+        private String measurementPointId;
+
+        @ApiModelProperty(value = "监测点名称")
+        private String measurementPointName;
+
+        @ApiModelProperty(value = "监测点电压等级名称")
+        private String monitorVoltageName;
+
+        @ApiModelProperty(value = "电站名称")
+        private String powerName;
+    }
 }

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/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/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,7 +1,5 @@
 package com.njcn.harmonic.pojo.vo;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -215,4 +213,13 @@ public class RMpPartHarmonicDetailVO {
 
     @ApiModelProperty(value = "闪变超标天数")
     private Integer flickerOverDay;
+
+    @Data
+    public static class PwRMpPartHarmonicDetailDVO extends RMpPartHarmonicDetailVO {
+        /**
+         * 监测点类别
+         */
+        @ApiModelProperty(name = "monitorSort", value = "监测点类别")
+        private String monitorSort;
+    }
 }

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

@@ -1,15 +1,7 @@
 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>

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/RStatOrgVO.java

@@ -46,6 +46,9 @@ public class RStatOrgVO  {
     public static class PwRStatOrgVO extends  RStatOrgVO{
         @ApiModelProperty(value = "单位id")
         private String orgNo;
+
+        @ApiModelProperty(value = "监测点类别")
+        private String monitorSort;
     }
 
 

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

@@ -82,11 +82,7 @@ public class RStatSubstationOrg2VO implements Serializable {
     @ApiModelProperty(name = "eventMeasurementRatioAccrued", value = "累计暂态超标监测点数占比")
     private Integer harmonicMeasurementRatioAccrued;
 
-    /**
-     * 暂态指标类型Id，字典表ID
-     */
-    @ApiModelProperty(name = "eventType", value = "暂态指标类型Id，字典表ID")
-    private String harmonicType;
+
 
     /**
      * 频率偏差
@@ -207,6 +203,14 @@ public class RStatSubstationOrg2VO implements Serializable {
     private Integer sameAccrued8;
     private Float averageOverDay8;
 
+    @Data
+    public static class PwRStatSubstationOrgVO extends RStatSubstationOrg2VO {
+        /**
+         * 监测点类别
+         */
+        @ApiModelProperty(name = "monitorSort", value = "监测点类别")
+        private String monitorSort;
+    }
 
 }
 

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;
 
 /**

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/utils/HarmonicComAssesUtil.java

@@ -26,7 +26,7 @@ import java.util.List;
 @Component
 public class HarmonicComAssesUtil {
     // 日志记录
-    private static final Logger logger = LoggerFactory.getLogger(com.njcn.harmonic.utils.HarmonicComAssesUtil.class);
+    private static final Logger logger = LoggerFactory.getLogger(HarmonicComAssesUtil.class);
     private static final int ST_QT_NUM = 6;//系统评价指标数目
     private static final int GRADE_NUM = 5;//指标分级数目
     private static final int METHOD_NUM = 5;//评估方法数