代码合并谐波

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

@@ -16,6 +16,7 @@ import java.util.Date;
  * @author clam
  * @version V1.0.0
  */
+
 /**
     * 终端评价详情表
     */

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

@@ -16,6 +16,7 @@ import java.util.Date;
  * @author clam
  * @version V1.0.0
  */
+
 /**
     * 监测点暂态指标超标明细日表
     */

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

@@ -16,6 +16,7 @@ import java.util.Date;
  * @author clam
  * @version V1.0.0
  */
+
 /**
     * 监测点暂态指标超标明细月表
     */

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

@@ -16,6 +16,7 @@ import java.util.Date;
  * @author clam
  * @version V1.0.0
  */
+
 /**
     * 监测点暂态指标超标明细季表
     */

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

@@ -16,6 +16,7 @@ import java.util.Date;
  * @author clam
  * @version V1.0.0
  */
+
 /**
     * 监测点暂态指标超标明细年表
     */

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

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

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

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPassRateM.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/RMpPassRateQ.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/RMpPassRateY.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/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;

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

@@ -20,6 +20,7 @@ import java.util.Date;
  * @author clam
  * @version V1.0.0
  */
+
 /**
     * 谐波畸变率排名
     */

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

@@ -16,6 +16,7 @@ import java.util.Date;
  * @author clam
  * @version V1.0.0
  */
+
 /**
     * 主网运行指标统计-月表,主网监测指标数据质量统计-月表
     */

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

@@ -16,6 +16,7 @@ import java.util.Date;
  * @author clam
  * @version V1.0.0
  */
+
 /**
     * 主网运行指标统计-季表 ,主网监测指标数据质量统计-季表
     */

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

@@ -16,6 +16,7 @@ import java.util.Date;
  * @author clam
  * @version V1.0.0
  */
+
 /**
     * 主网运行指标统计-年表,主网监测指标数据质量统计-年表
     */

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

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

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatLoadTypeM.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/RStatLoadTypeQ.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/RStatLoadTypeY.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/RStatOrgBusbarVoltageM.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/RStatOrgBusbarVoltageQ.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/RStatOrgBusbarVoltageY.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/RStatOrgDPO.java

@@ -16,6 +16,7 @@ import java.util.Date;
  * @author clam
  * @version V1.0.0
  */
+
 /**
     * 区域分类统计日表
     */

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

@@ -16,6 +16,7 @@ import java.util.Date;
  * @author clam
  * @version V1.0.0
  */
+
 /**
     * 区域分类统计月表
     */

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

@@ -20,6 +20,7 @@ import java.util.Date;
  * @author clam
  * @version V1.0.0
  */
+
 /**
     * 单位污区图统计日表
     */

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

@@ -20,6 +20,7 @@ import java.util.Date;
  * @author clam
  * @version V1.0.0
  */
+
 /**
     * 单位污区图统计月表
     */

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

@@ -1,17 +1,16 @@
 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:
@@ -21,6 +20,7 @@ import lombok.NoArgsConstructor;
  * @author clam
  * @version V1.0.0
  */
+
 /**
     * 单位污区图统计季表
     */

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

@@ -1,17 +1,16 @@
 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:
@@ -21,6 +20,7 @@ import lombok.NoArgsConstructor;
  * @author clam
  * @version V1.0.0
  */
+
 /**
     * 单位污区图统计年表
     */

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

@@ -1,17 +1,16 @@
 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:
@@ -21,6 +20,7 @@ import lombok.NoArgsConstructor;
  * @author clam
  * @version V1.0.0
  */
+
 /**
     * 变电站污区图统计日表
     */

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

@@ -1,17 +1,16 @@
 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:
@@ -21,6 +20,7 @@ import lombok.NoArgsConstructor;
  * @author clam
  * @version V1.0.0
  */
+
 /**
     * 变电站污区图统计季表
     */

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

@@ -1,17 +1,16 @@
 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:
@@ -21,6 +20,7 @@ import lombok.NoArgsConstructor;
  * @author clam
  * @version V1.0.0
  */
+
 /**
     * 变电站污区图统计年表
     */

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

@@ -1,11 +1,11 @@
 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;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 /**
  *

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationM.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/RStatSubstationQ.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/RStatSubstationVoltageM.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/RStatSubstationY.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/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;
 

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,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/RSubstationIconVO.java

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

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/distribution/PwOverviewController.java

@@ -8,6 +8,8 @@ import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.harmonic.pojo.param.OverviewParam;
 import com.njcn.harmonic.pojo.vo.OverviewVO;
 import com.njcn.harmonic.service.majornetwork.RStatHarmonicOrgMService;
+import com.njcn.harmonic.service.majornetwork.RStatOrgMService;
+import com.njcn.harmonic.service.specialanalysis.RStatOrgPvPowerQualityService;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -20,6 +22,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <分布式光伏概览>
@@ -35,15 +38,58 @@ import java.util.List;
 public class PwOverviewController extends BaseController {
 
     private final RStatHarmonicOrgMService rStatHarmonicOrgMService;
+    private final RStatOrgPvPowerQualityService rStatOrgPvPowerQualityService;
+    private final RStatOrgMService rStatOrgMService;
 
 
-    @PostMapping("/getAlarmProportion")
+    @PostMapping("/getExcessiveProportion")
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
-    @ApiOperation("告警监测点数占比")
+    @ApiOperation("稳态指标超标占比")
     @ApiImplicitParam(name = "param", value = "条件参数", required = true)
-    public HttpResult<List<OverviewVO.GroupVO>> getAlarmProportion(@RequestBody OverviewParam param) {
+    public HttpResult<List<OverviewVO.ExcessiveVO>> getExcessiveProportion(@RequestBody OverviewParam param) {
-        String methodDescribe = getMethodDescribe("getAlarmProportion");
+        String methodDescribe = getMethodDescribe("getExcessiveProportion");
-        List<OverviewVO.GroupVO> monitorYoY = rStatHarmonicOrgMService.getExcessiveProportion(param);
+        List<OverviewVO.ExcessiveVO> monitorYoY = rStatHarmonicOrgMService.getExcessiveProportion(param);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, monitorYoY, methodDescribe);
     }
+
+    @PostMapping("/getVoltage")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("电压问题")
+    @ApiImplicitParam(name = "param", value = "条件参数", required = true)
+    public HttpResult<List<OverviewVO.IcoVO>> getVoltage(@RequestBody OverviewParam.OverviewVoltageParam param) {
+        String methodDescribe = getMethodDescribe("getVoltage");
+        List<OverviewVO.IcoVO> groupVOS = rStatOrgPvPowerQualityService.getVoltage(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, groupVOS, methodDescribe);
+    }
+
+    @PostMapping("/getPowerFactor")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("功率因数问题")
+    @ApiImplicitParam(name = "param", value = "条件参数", required = true)
+    public HttpResult<List<OverviewVO.NumVO> > getPowerFactor(@RequestBody OverviewParam param) {
+        String methodDescribe = getMethodDescribe("getPowerFactor");
+        List<OverviewVO.NumVO> groupVOS = rStatOrgPvPowerQualityService.getPowerFactor(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, groupVOS, methodDescribe);
+    }
+
+    @PostMapping("/getBackTheTide")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("潮流倒送与重过载问题")
+    @ApiImplicitParam(name = "param", value = "条件参数", required = true)
+    public HttpResult<List<OverviewVO.IcoVO> > getBackTheTide(@RequestBody OverviewParam param) {
+        String methodDescribe = getMethodDescribe("getBackTheTide");
+        List<OverviewVO.IcoVO> groupVOS = rStatOrgPvPowerQualityService.getBackTheTide(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, groupVOS, methodDescribe);
+    }
+
+    @PostMapping("/getExceedMonitor")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("超标监测点数量")
+    @ApiImplicitParam(name = "param", value = "条件参数", required = true)
+    public HttpResult<List<OverviewVO.GroupVO>> getExceedMonitor(@RequestBody OverviewParam.OverviewDateParam param) {
+        String methodDescribe = getMethodDescribe("getExceedMonitor");
+        List<OverviewVO.GroupVO> groupVOS = rStatOrgMService.getExceedMonitor(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, groupVOS, methodDescribe);
+    }
+
 }

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/StatHarmonicOrgMMapper.java

@@ -45,5 +45,6 @@ public interface StatHarmonicOrgMMapper extends BaseMapper<RStatHarmonicOrgM> {
      */
     List<OverviewVO> selectYoY(@Param("param") OverviewParam param,
                                @Param("ids") List<String> ids,
+                               @Param("types") List<String> types,
                                @Param("dataType") String dataType);
 }

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/StatHarmonicOrgMMapper.xml

@@ -81,6 +81,12 @@ FROM (
                     #{item}
                 </foreach>
             </if>
+            <if test="types != null and types.size > 0">
+                AND measurement_type_class IN
+                <foreach collection='types' item='item' index="index" open='(' separator=',' close=')'>
+                    #{item}
+                </foreach>
+            </if>
         </where>
 		GROUP BY t.measurement_type_class,t.harmonic_type,yy,mm
 ) ta
@@ -103,6 +109,12 @@ LEFT JOIN (
                     #{item}
                 </foreach>
             </if>
+            <if test="types != null and types.size > 0">
+                AND measurement_type_class IN
+                <foreach collection='types' item='item' index="index" open='(' separator=',' close=')'>
+                    #{item}
+                </foreach>
+            </if>
         </where>
 		GROUP BY t.measurement_type_class,t.harmonic_type,yy,mm
 ) tb
@@ -127,6 +139,12 @@ LEFT JOIN (
                     #{item}
                 </foreach>
             </if>
+            <if test="types != null and types.size > 0">
+                AND measurement_type_class IN
+                <foreach collection='types' item='item' index="index" open='(' separator=',' close=')'>
+                    #{item}
+                </foreach>
+            </if>
         </where>
 		GROUP BY t.measurement_type_class,t.harmonic_type,yy,mm
 ) tc
@@ -147,8 +165,6 @@ ON  ( (tc.yy = ta.yy and tc.mm = ta.mm - 1 and tc.measurement_type_class = ta.me
             </if>
         </where>
 
-
-
     </select>
 
 </mapper>

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/specialanalysis/RStatOrgPvPowerQualityMMapper.java

@@ -3,6 +3,7 @@ package com.njcn.harmonic.mapper.specialanalysis;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.njcn.harmonic.pojo.param.OverviewParam;
 import com.njcn.harmonic.pojo.po.RStatOrgPvPowerQualityMPO;
 import com.njcn.harmonic.pojo.vo.OverviewVO;
 import com.njcn.harmonic.pojo.vo.StreamReverseOrgVO;
@@ -28,7 +29,8 @@ public interface RStatOrgPvPowerQualityMMapper extends BaseMapper<RStatOrgPvPowe
      * @return
      */
     List<OverviewVO.VoltageVO> selectVoltage(@Param("deptCodes") List<String> deptCodes,
-                                             @Param("ids") List<String> ids);
+                                             @Param("ids") List<String> ids,
+                                             @Param("param") OverviewParam param);
 }
 
 

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/specialanalysis/mapping/RStatOrgPvPowerQualityMMapper.xml

@@ -63,13 +63,15 @@
                     #{item}
                 </foreach>
             </if>
-
+            <if test="param!=null and param.year != null and param.year != ''">
-<!--            <if test="param!=null and param.startTime != null and param.startTime !=''">-->
+                and  YEAR(data_date)=#{param.year}
-<!--                AND  data_date >= #{param.startTime}-->
+            </if>
-<!--            </if>-->
+            <if test="param != null and param.month!=null and param.month.size > 0">
-<!--            <if test="param!=null and param.endTime != null and param.endTime != ''">-->
+                AND MONTH(data_date) IN
-<!--                AND  data_date &lt;= #{param.endTime}-->
+                <foreach collection='param.month' item='item' index="index" open='(' separator=',' close=')'>
-<!--            </if>-->
+                    #{item}
+                </foreach>
+            </if>
         </where>
         GROUP BY
             monitoring_object,

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/distribution/impl/PwRStatOrgServiceImpl.java

@@ -14,6 +14,7 @@ import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
 import com.njcn.harmonic.pojo.po.RStatOrgQ;
 import com.njcn.harmonic.pojo.vo.*;
 import com.njcn.harmonic.service.distribution.PwRStatOrgService;
+import com.njcn.harmonic.utils.DeptUtil;
 import com.njcn.system.api.DicDataFeignClient;
 import com.njcn.system.enums.DicDataEnum;
 import com.njcn.system.enums.DicDataTypeEnum;
@@ -60,7 +61,10 @@ public class PwRStatOrgServiceImpl extends ServiceImpl<PwRStatOrgMapper, RStatOr
     @Override
     public List<RStatOrgVO.PwRStatOrgVO> getRStatHarmonicAll(StatSubstationBizBaseParam param) {
         //获取当前部门下所有部门信息
-        List<DeptDTO> deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
+        List<DeptDTO> deptList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
+        List<DeptDTO> deptDTOList = DeptUtil.getDeptSubsetVOList(deptList, param.getId());
+
+
         Map<String, DeptDTO> deptMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getCode, Function.identity()));
         List<String> deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList());
 
@@ -104,12 +108,9 @@ public class PwRStatOrgServiceImpl extends ServiceImpl<PwRStatOrgMapper, RStatOr
     @Override
     public List<PwRStatOrgVO> getRStatOrgIndex(StatSubstationBizBaseParam param) {
         // 获取当前用户的部门的子部门信息
-//        PwPmsMonitorParam pwPmsMonitorParam=new PwPmsMonitorParam();
-//        pwPmsMonitorParam.setOrgId(param.getId());
-//        pwPmsMonitorParam.setMonitorSort(param.getIds());
-//        List<PwPmsMonitorDTO> data = pwMonitorClient.getPwMonitorList(pwPmsMonitorParam).getData();
 
-        List<DeptDTO> deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
+        List<DeptDTO> deptList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
+        List<DeptDTO> deptDTOList = DeptUtil.getDeptSubsetVOList(deptList, param.getId());
         List<String> deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList());
 
         //获取配网信息
@@ -224,7 +225,9 @@ public class PwRStatOrgServiceImpl extends ServiceImpl<PwRStatOrgMapper, RStatOr
     @Override
     public List<RStatSubstationOrg2VO.PwRStatSubstationOrgVO> getRStatSubstationOrg(StatSubstationBizBaseParam param) {
         //获取当前部门下所有部门信息
-        List<DeptDTO> deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
+        List<DeptDTO> deptList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
+        List<DeptDTO> deptDTOList = DeptUtil.getDeptSubsetVOList(deptList, param.getId());
+
         Map<String, DeptDTO> deptMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getCode, Function.identity()));
         List<String> deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList());
         //初始化

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/RStatHarmonicOrgMService.java

@@ -60,5 +60,5 @@ public interface RStatHarmonicOrgMService extends IService<RStatHarmonicOrgM> {
      * @param param
      * @return
      */
-    List<OverviewVO.GroupVO> getExcessiveProportion(OverviewParam param);
+    List<OverviewVO.ExcessiveVO> getExcessiveProportion(OverviewParam param);
 }

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/RStatOrgMService.java

@@ -1,8 +1,10 @@
 package com.njcn.harmonic.service.majornetwork;
 
 import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.harmonic.pojo.param.OverviewParam;
 import com.njcn.harmonic.pojo.po.RStatOrgM;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.harmonic.pojo.vo.OverviewVO;
 import com.njcn.harmonic.pojo.vo.RStatOrgVO;
 
 import java.util.List;
@@ -24,4 +26,13 @@ public interface RStatOrgMService extends IService<RStatOrgM> {
      * @return
      */
     List<RStatOrgVO> getRStatHarmonicMAll(StatisticsBizBaseParam param);
+
+    /**
+     * 分布式光伏概览-超标监测点数量
+     * @param param
+     * @return
+     */
+    List<OverviewVO.GroupVO> getExceedMonitor(OverviewParam.OverviewDateParam param);
+
+
 }

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RMpPartHarmonicDetailMServiceImpl.java

@@ -100,6 +100,6 @@ public class RMpPartHarmonicDetailMServiceImpl extends ServiceImpl<RMpPartHarmon
             }
             return rMpPartHarmonicDetail;
         }
-        return null;
+        return new ArrayList<>();
     }
 }

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicMServiceImpl.java

@@ -22,6 +22,7 @@ import com.njcn.harmonic.pojo.vo.RIconVO;
 import com.njcn.harmonic.pojo.vo.RStatHarmonicMVO;
 import com.njcn.harmonic.service.majornetwork.RStatHarmonicMService;
 import com.njcn.device.pq.utils.PublicDateUtil;
+import com.njcn.harmonic.utils.DeptUtil;
 import com.njcn.system.api.DicDataFeignClient;
 import com.njcn.system.enums.DicDataEnum;
 import com.njcn.system.enums.DicDataTypeEnum;
@@ -77,7 +78,8 @@ public class RStatHarmonicMServiceImpl extends ServiceImpl<RStatHarmonicMMapper,
 
 
         //获取当前部门下所有部门信息
-        List<DeptDTO> deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
+        List<DeptDTO> deptList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
+        List<DeptDTO> deptDTOList = DeptUtil.getDeptSubsetVOList(deptList, param.getId());
         List<String> deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList());
 
         StatSubstationBizBaseParam baseParam = BeanUtil.copyProperties(param, StatSubstationBizBaseParam.class);
@@ -193,7 +195,8 @@ public class RStatHarmonicMServiceImpl extends ServiceImpl<RStatHarmonicMMapper,
         List<RIconVO> arrayVOList = new ArrayList<>();
 
         //获取当前部门下所有部门信息
-        List<DeptDTO> deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
+        List<DeptDTO> deptList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
+        List<DeptDTO> deptDTOList = DeptUtil.getDeptSubsetVOList(deptList, param.getId());
         List<String> deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList());
 
         StatSubstationBizBaseParam baseParam = BeanUtil.copyProperties(param, StatSubstationBizBaseParam.class);
@@ -280,7 +283,8 @@ public class RStatHarmonicMServiceImpl extends ServiceImpl<RStatHarmonicMMapper,
         DictData mainnetData = dicDataFeignClient.getDicDataByCode(DicDataEnum.MAINNET_POINT.getCode()).getData();
 
         //获取当前部门下所有部门信息
-        List<DeptDTO> deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
+        List<DeptDTO> deptList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
+        List<DeptDTO> deptDTOList = DeptUtil.getDeptSubsetVOList(deptList, param.getId());
         List<String> deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList());
 
         StatSubstationBizBaseParam baseParam = BeanUtil.copyProperties(param, StatSubstationBizBaseParam.class);
@@ -346,7 +350,8 @@ public class RStatHarmonicMServiceImpl extends ServiceImpl<RStatHarmonicMMapper,
         List<RArrayVO> arrayVOList = new ArrayList<>();
 
         //获取当前部门下所有部门信息
-        List<DeptDTO> deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
+        List<DeptDTO> deptList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
+        List<DeptDTO> deptDTOList = DeptUtil.getDeptSubsetVOList(deptList, param.getId());
         List<String> deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList());
 
         StatSubstationBizBaseParam baseParam = BeanUtil.copyProperties(param, StatSubstationBizBaseParam.class);
@@ -442,7 +447,8 @@ public class RStatHarmonicMServiceImpl extends ServiceImpl<RStatHarmonicMMapper,
         DictData distributionData = dicDataFeignClient.getDicDataByCode(DicDataEnum.DISTRIBUTION_POINT.getCode()).getData();
 
         //获取当前部门下所有部门信息
-        List<DeptDTO> deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
+        List<DeptDTO> deptList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
+        List<DeptDTO> deptDTOList = DeptUtil.getDeptSubsetVOList(deptList, param.getId());
         List<String> deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList());
 
         StatSubstationBizBaseParam baseParam = BeanUtil.copyProperties(param, StatSubstationBizBaseParam.class);

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicOrgMServiceImpl.java

@@ -12,7 +12,6 @@ import com.njcn.harmonic.pojo.param.OverviewParam;
 import com.njcn.harmonic.pojo.param.RStatHarmonicMParam;
 import com.njcn.harmonic.pojo.po.RStatHarmonicOrgM;
 import com.njcn.harmonic.mapper.StatHarmonicOrgMMapper;
-import com.njcn.harmonic.pojo.po.RStatHarmonicOrgQ;
 import com.njcn.harmonic.pojo.vo.OverviewVO;
 import com.njcn.harmonic.pojo.vo.RArrayVO;
 import com.njcn.harmonic.pojo.vo.RIconVO;
@@ -26,12 +25,11 @@ import com.njcn.system.enums.DicDataTypeEnum;
 import com.njcn.system.pojo.po.DictData;
 import com.njcn.user.api.DeptFeignClient;
 import com.njcn.user.pojo.dto.DeptDTO;
+import com.njcn.user.pojo.po.Dept;
 import com.njcn.web.utils.WebUtil;
 import lombok.RequiredArgsConstructor;
-import org.checkerframework.checker.units.qual.K;
 import org.springframework.stereotype.Service;
 
-import java.security.Key;
 import java.text.DecimalFormat;
 import java.util.*;
 import java.util.function.Function;
@@ -389,78 +387,83 @@ public class RStatHarmonicOrgMServiceImpl extends ServiceImpl<StatHarmonicOrgMMa
     }
 
     @Override
-    public List<OverviewVO.GroupVO> getExcessiveProportion(OverviewParam param) {
+    public List<OverviewVO.ExcessiveVO> getExcessiveProportion(OverviewParam param) {
-        List<OverviewVO.GroupVO> info=new ArrayList<>();
+        List<OverviewVO.ExcessiveVO> info =new ArrayList<>();
         //指标类型
         List<DictData> steadyData = dicDataFeignClient.getDicDataByTypeCode
                 (DicDataTypeEnum.STEADY_STATIS.getCode()).getData();
+        List<DictData> steadyTypeData = steadyData.stream().filter(dictData ->
+                        DicDataEnum.VOLTAGE_DEV.getCode().equals(dictData.getCode()) ||
+                        DicDataEnum.FLICKER.getCode().equals(dictData.getCode()) ||
+                        DicDataEnum.HARMONIC_VOLTAGE.getCode().equals(dictData.getCode())
+        ).collect(Collectors.toList());
+
+
+        Map<String, DictData> steadyTypeMap = steadyTypeData.stream().collect(Collectors.toMap(DictData::getId, Function.identity()));
+
         //监测点类型
         List<DictData> lineData = dicDataFeignClient.getDicDataByTypeCode
                 (DicDataTypeEnum.LINE_SORT.getCode()).getData();
+        List<String> lineDataIds = lineData.stream().map(DictData::getId).collect(Collectors.toList());
 
         //获取部门数据
-        List<DeptDTO> deptDTOS = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
+        List<String> deptCodes = getDeptListCode(param.getId());
-        if(CollectionUtil.isNotEmpty(deptDTOS)){
-            List<String> collect = deptDTOS.stream().map(DeptDTO::getCode).collect(Collectors.toList());
-            //获取配网数据类型
-            DictData data = dicDataFeignClient.getDicDataByCode(DicDataEnum.DISTRIBUTION_POINT.getCode()).getData();
-            List<OverviewVO> overviewVOS = statHarmonicOrgMMapper.selectYoY(param, collect, data.getId());
 
-            Map<String, List<OverviewVO>> overviewVOMap = overviewVOS.stream().collect(
+        //获取配网数据类型
-                    Collectors.groupingBy(OverviewVO::getMonitorSort));
+        DictData data = dicDataFeignClient.getDicDataByCode(DicDataEnum.DISTRIBUTION_POINT.getCode()).getData();
+        List<OverviewVO> overviewVOS = statHarmonicOrgMMapper.selectYoY(param, deptCodes,lineDataIds, data.getId());
 
-            overviewVOMap.forEach((key,value)->{
+        Map<String, List<OverviewVO>> overviewVOMap = overviewVOS.stream().collect(
-                OverviewVO.GroupVO  groupVO = new OverviewVO.GroupVO();
+                Collectors.groupingBy(OverviewVO::getMonitorSort));
 
-                Map<String, List<OverviewVO>> listMap = value.stream().collect(Collectors.groupingBy(OverviewVO::getHarmonicType));
-                List<DictData> notDict = steadyData.stream().filter(r -> !listMap.containsKey(r.getId()))
-                        .collect(Collectors.toList());
-               //生成默认值
-                if(CollectionUtil.isNotEmpty(notDict)){
-                   groupVO.setMonitorSort(key);
-                   OverviewVO overviewVO;
-                   for (DictData dictData : notDict) {
-                       overviewVO=new OverviewVO();
-                       overviewVO.setMonitorSort(key);
-                       overviewVO.setHarmonicType(dictData.getId());
-                       overviewVO.setSumNum("0");
-                       overviewVO.setYtbSumNum("0");
-                       overviewVO.setYhbSumNum("0");
-                       overviewVO.setSameNum("0");
-                       overviewVO.setRingNum("0");
-                       value.add(overviewVO);
-                   }
-                    groupVO.setSubset(value);
-               }
-                info.add(groupVO);
-            });
 
-            List<DictData> notDict = lineData.stream().filter(r -> !overviewVOMap.containsKey(r.getId()))
+        overviewVOMap.forEach((key,value)->{
-                    .collect(Collectors.toList());
+            OverviewVO.ExcessiveVO excessiveVO=new OverviewVO.ExcessiveVO();
-            if(CollectionUtil.isNotEmpty(notDict)){
+            excessiveVO.setMonitorSort(key);
-                OverviewVO.GroupVO overviewVO;
+            excessiveVO.setHarmonic("0.0");
-                OverviewVO vo;
+            excessiveVO.setHarmonicTb("0.0");
-                for (DictData dictData : notDict) {
+            excessiveVO.setVoltage("0.0");
-                    overviewVO=new OverviewVO.GroupVO();
+            excessiveVO.setVoltageTb("0.0");
-                    overviewVO.setMonitorSort(dictData.getId());
+            excessiveVO.setFlicker("0.0");
-                    List<OverviewVO> vos=new ArrayList<>();
+            excessiveVO.setFlickerTb("0.0");
-                    for (DictData lineDatum : steadyData) {
+            for (OverviewVO overviewVO : value) {
-                        vo=new OverviewVO();
+                if(steadyTypeMap.containsKey(overviewVO.getHarmonicType())){
-                        vo.setMonitorSort(dictData.getId());
+                    DictData dictData = steadyTypeMap.get(overviewVO.getHarmonicType());
-                        vo.setHarmonicType(lineDatum.getId());
+                    if(DicDataEnum.HARMONIC_VOLTAGE.getCode().equals(dictData.getCode())){
-                        vo.setSumNum("0");
+                        excessiveVO.setHarmonic(overviewVO.getSumNum());
-                        vo.setYtbSumNum("0");
+                        excessiveVO.setHarmonicTb(overviewVO.getSameNum());
-                        vo.setYhbSumNum("0");
+                    }
-                        vo.setSameNum("0");
+                    if(DicDataEnum.FLICKER.getCode().equals(dictData.getCode())){
-                        vo.setRingNum("0");
+                        excessiveVO.setFlicker(overviewVO.getSumNum());
-                        vos.add(vo);
+                        excessiveVO.setFlickerTb(overviewVO.getSameNum());
+                    }
+                    if(DicDataEnum.VOLTAGE_DEV.getCode().equals(dictData.getCode())){
+                        excessiveVO.setVoltage(overviewVO.getSumNum());
+                        excessiveVO.setVoltageTb(overviewVO.getSameNum());
                     }
-                    overviewVO.setSubset(vos);
-                   info.add(overviewVO);
                 }
+
+            }
+            info.add(excessiveVO);
+        });
+        Map<String, List<OverviewVO.ExcessiveVO>>  excessiveMap= info.stream().collect(Collectors.groupingBy(OverviewVO.ExcessiveVO::getMonitorSort));
+        List<DictData> notDict = lineData.stream().filter(r -> !excessiveMap.containsKey(r.getId()))
+                .collect(Collectors.toList());
+        if(CollectionUtil.isNotEmpty(notDict)){
+            OverviewVO.ExcessiveVO excessiveVO;
+            for (DictData dictData : notDict) {
+                excessiveVO=new OverviewVO.ExcessiveVO();
+                excessiveVO.setMonitorSort(dictData.getId());
+                excessiveVO.setHarmonic("0.0");
+                excessiveVO.setHarmonicTb("0.0");
+                excessiveVO.setVoltage("0.0");
+                excessiveVO.setVoltageTb("0.0");
+                excessiveVO.setFlicker("0.0");
+                excessiveVO.setFlickerTb("0.0");
+               info.add(excessiveVO);
             }
         }
-        return info;
+        return  info;
     }
 
     /**
@@ -485,4 +488,18 @@ public class RStatHarmonicOrgMServiceImpl extends ServiceImpl<StatHarmonicOrgMMa
         }
         arrayVO.setColumns(statharmonicVO);
     }
+
+    /**
+     * 部门通用方法
+     * @param id
+     * @return
+     */
+    public List<String> getDeptListCode(String id){
+        //获取部门数据
+        Dept data = deptFeignClient.getDeptById(id).getData();
+        if(ObjectUtil.isNotNull(data)){
+            return Arrays.asList(data.getCode());
+        }
+        return new ArrayList<>();
+    }
 }

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicQServiceImpl.java

@@ -10,6 +10,7 @@ import com.njcn.harmonic.pojo.po.RStatHarmonicQ;
 import com.njcn.harmonic.pojo.vo.RArrayVO;
 import com.njcn.harmonic.pojo.vo.RStatHarmonicMVO;
 import com.njcn.harmonic.service.majornetwork.RStatHarmonicQService;
+import com.njcn.harmonic.utils.DeptUtil;
 import com.njcn.system.api.DicDataFeignClient;
 import com.njcn.system.enums.DicDataEnum;
 import com.njcn.system.enums.DicDataTypeEnum;
@@ -57,7 +58,8 @@ public class RStatHarmonicQServiceImpl extends ServiceImpl<RStatHarmonicQMapper,
         DictData mainnetData = dicDataFeignClient.getDicDataByCode(DicDataEnum.MAINNET_POINT.getCode()).getData();
 
         //获取当前部门下所有部门信息
-        List<DeptDTO> deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
+        List<DeptDTO> deptList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
+        List<DeptDTO> deptDTOList = DeptUtil.getDeptSubsetVOList(deptList, param.getId());
         List<String> deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList());
 
         StatSubstationBizBaseParam baseParam = BeanUtil.copyProperties(param, StatSubstationBizBaseParam.class);
@@ -149,7 +151,8 @@ public class RStatHarmonicQServiceImpl extends ServiceImpl<RStatHarmonicQMapper,
         //初始化指标类型（横向）
         List<RArrayVO> arrayVOList = new ArrayList<>();
         //获取当前部门下所有部门信息
-        List<DeptDTO> deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
+        List<DeptDTO> deptList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
+        List<DeptDTO> deptDTOList = DeptUtil.getDeptSubsetVOList(deptList, param.getId());
         List<String> deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList());
 
         StatSubstationBizBaseParam baseParam = BeanUtil.copyProperties(param, StatSubstationBizBaseParam.class);

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicYServiceImpl.java

@@ -10,6 +10,7 @@ import com.njcn.harmonic.pojo.po.RStatHarmonicY;
 import com.njcn.harmonic.pojo.vo.RArrayVO;
 import com.njcn.harmonic.pojo.vo.RStatHarmonicMVO;
 import com.njcn.harmonic.service.majornetwork.RStatHarmonicYService;
+import com.njcn.harmonic.utils.DeptUtil;
 import com.njcn.system.api.DicDataFeignClient;
 import com.njcn.system.enums.DicDataEnum;
 import com.njcn.system.enums.DicDataTypeEnum;
@@ -56,7 +57,9 @@ public class RStatHarmonicYServiceImpl extends ServiceImpl<RStatHarmonicYMapper,
         DictData mainnetData = dicDataFeignClient.getDicDataByCode(DicDataEnum.MAINNET_POINT.getCode()).getData();
 
         //获取当前部门下所有部门信息
-        List<DeptDTO> deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
+        List<DeptDTO> deptList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
+        List<DeptDTO> deptDTOList = DeptUtil.getDeptSubsetVOList(deptList, param.getId());
+
         List<String> deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList());
 
         StatSubstationBizBaseParam baseParam = BeanUtil.copyProperties(param, StatSubstationBizBaseParam.class);
@@ -150,7 +153,8 @@ public class RStatHarmonicYServiceImpl extends ServiceImpl<RStatHarmonicYMapper,
         List<RArrayVO> arrayVOList = new ArrayList<>();
 
         //获取当前部门下所有部门信息
-        List<DeptDTO> deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
+        List<DeptDTO> deptList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
+        List<DeptDTO> deptDTOList = DeptUtil.getDeptSubsetVOList(deptList, param.getId());
         List<String> deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList());
 
         StatSubstationBizBaseParam baseParam = BeanUtil.copyProperties(param, StatSubstationBizBaseParam.class);

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatLoadTypeServiceImpl.java

@@ -13,6 +13,7 @@ import com.njcn.harmonic.pojo.vo.RArrayVO;
 import com.njcn.harmonic.pojo.vo.RStatLoadTypeVO;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.harmonic.service.majornetwork.RStatLoadTypeService;
+import com.njcn.harmonic.utils.DeptUtil;
 import com.njcn.system.api.DicDataFeignClient;
 import com.njcn.system.enums.DicDataTypeEnum;
 import com.njcn.system.pojo.po.DictData;
@@ -49,7 +50,10 @@ public class RStatLoadTypeServiceImpl extends ServiceImpl<RStatLoadTypeMMapper,
     @Override
     public List<RArrayVO> getRStatLoadType(StatisticsBizBaseParam param) {
         //获取部门信息
-        List<DeptDTO> data = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
+        List<DeptDTO> deptList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
+        List<DeptDTO> data = DeptUtil.getDeptSubsetVOList(deptList, param.getId());
+
+
         List<String> deptIds = data.stream().map(DeptDTO::getCode).collect(Collectors.toList());
         //获取字典信息
         List<DictData> data1 = dicDataFeignClient.getDicDataByTypeCode(

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgBusbarVoltageServiceImpl.java

@@ -14,6 +14,7 @@ import com.njcn.harmonic.mapper.majornetwork.RStatOrgBusbarVoltageMMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.harmonic.pojo.vo.RStatOrgBusbarVoltageVO;
 import com.njcn.harmonic.service.majornetwork.RStatOrgBusbarVoltageService;
+import com.njcn.harmonic.utils.DeptUtil;
 import com.njcn.user.api.DeptFeignClient;
 import com.njcn.user.pojo.dto.DeptDTO;
 import com.njcn.web.utils.WebUtil;
@@ -47,7 +48,9 @@ public class RStatOrgBusbarVoltageServiceImpl extends ServiceImpl<RStatOrgBusbar
     @Override
     public List<RStatOrgBusbarVoltageVO> getRStatOrgBusbarVoltage(StatSubstationBizBaseParam param) {
         //获取部门信息
-        List<DeptDTO> data = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
+        List<DeptDTO> deptList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
+        List<DeptDTO> data = DeptUtil.getDeptSubsetVOList(deptList, param.getId());
+
         Map<String, DeptDTO> deptMap = data.stream().collect(Collectors.toMap(DeptDTO::getCode, Function.identity()));
 
         //获取部门id集合

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgMServiceImpl.java

@@ -1,13 +1,17 @@
 package com.njcn.harmonic.service.majornetwork.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.harmonic.pojo.param.OverviewParam;
 import com.njcn.harmonic.pojo.po.RStatOrgM;
 import com.njcn.harmonic.mapper.majornetwork.RStatOrgMMapper;
+import com.njcn.harmonic.pojo.vo.OverviewVO;
 import com.njcn.harmonic.pojo.vo.RStatOrgVO;
 import com.njcn.harmonic.service.majornetwork.RStatOrgMService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.harmonic.utils.DeptUtil;
 import com.njcn.system.api.DicDataFeignClient;
 import com.njcn.system.enums.DicDataEnum;
 import com.njcn.system.pojo.po.DictData;
@@ -15,6 +19,7 @@ import com.njcn.user.api.DeptFeignClient;
 import com.njcn.user.pojo.dto.DeptDTO;
 import com.njcn.web.utils.WebUtil;
 import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
 
 import java.text.DecimalFormat;
@@ -42,9 +47,10 @@ public class RStatOrgMServiceImpl extends ServiceImpl<RStatOrgMMapper, RStatOrgM
 
     @Override
     public List<RStatOrgVO> getRStatHarmonicMAll(StatisticsBizBaseParam param) {
-        List<DeptDTO> deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
+        List<DeptDTO> deptList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
-        //获取部门id集合
+        List<DeptDTO> deptDTOList = DeptUtil.getDeptSubsetVOList(deptList, param.getId());
         List<String> deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList());
+
         Map<String, DeptDTO> deptMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getCode, Function.identity()));
         //获取主网id信息
         DictData mainnetData = dicDataFeignClient.getDicDataByCode(DicDataEnum.MAINNET_POINT.getCode()).getData();
@@ -83,4 +89,67 @@ public class RStatOrgMServiceImpl extends ServiceImpl<RStatOrgMMapper, RStatOrgM
         });
         return newList;
     }
+
+    @Override
+    public List<OverviewVO.GroupVO> getExceedMonitor(OverviewParam.OverviewDateParam param) {
+        List<OverviewVO.GroupVO> info =new ArrayList<>();
+        //查询配网信息
+        DictData dictData = dicDataFeignClient.getDicDataByCode(DicDataEnum.DISTRIBUTION_POINT.getCode()).getData();
+        //获取部门数据
+        List<DeptDTO> subDeptListCode = getSubDeptListCode(param.getId());
+        List<String> deptListCode = subDeptListCode.stream().map(DeptDTO::getCode).collect(Collectors.toList());
+        Map<String, DeptDTO> deptMap = subDeptListCode.stream().collect(Collectors.toMap(DeptDTO::getCode, Function.identity()));
+
+        List<RStatOrgM> list = this.list(new LambdaQueryWrapper<RStatOrgM>()
+                .in(RStatOrgM::getOrgNo, deptListCode)
+                .eq(RStatOrgM::getDataType, dictData.getId())
+                .ge(StringUtils.isNotBlank(param.getStartTime()), RStatOrgM::getDataDate, param.getStartTime())
+                .le(StringUtils.isNotBlank(param.getEndTime()), RStatOrgM::getDataDate, param.getEndTime())
+        );
+
+        //根据部门进行分组
+        Map<String, List<RStatOrgM>> orgNoMap = list.stream().collect(Collectors.groupingBy(RStatOrgM::getOrgNo));
+
+        orgNoMap.forEach((key,value)->{
+            if(deptMap.containsKey(key)){
+                OverviewVO.GroupVO groupVO=new OverviewVO.GroupVO();
+                String name = deptMap.get(key).getName();
+                groupVO.setMonitorSort(name.replace("供电公司","市"));
+                List<OverviewVO.StatOrgVO> statOrgVOS =new ArrayList<>();
+                OverviewVO.StatOrgVO statOrgVO;
+                for (RStatOrgM statOrgM : value) {
+                    statOrgVO=new OverviewVO.StatOrgVO();
+                    statOrgVO.setMeasurementTypeClass(statOrgM.getMeasurementTypeClass());
+                    statOrgVO.setEffectiveMeasurementAccrued(statOrgM.getEffectiveMeasurementAccrued());
+                    statOrgVOS.add(statOrgVO);
+                }
+                groupVO.setSubset(statOrgVOS);
+                info.add(groupVO);
+            }
+        });
+        return info;
+    }
+
+
+    /**
+     * 当前部门下子部门通用方法
+     * @param deptId
+     * @return
+     */
+    public List<DeptDTO> getSubDeptListCode(String deptId){
+        List<DeptDTO> deptDTOList = deptFeignClient.getDeptDescendantIndexes(deptId, WebUtil.filterDeptType()).getData();
+        //获取子部门
+        List<DeptDTO> directDeptInfos = deptDTOList.stream()
+                .filter(deptDTO -> deptDTO.getPid().equals(deptId))
+                .collect(Collectors.toList());
+        if (CollectionUtil.isEmpty(directDeptInfos)) {
+            //没有直接子部门，获取当前部门所有信息
+            List<DeptDTO> dept = deptDTOList.stream()
+                    .filter(deptDTO -> deptDTO.getId().equals(deptId))
+                    .collect(Collectors.toList());
+            return dept;
+        }
+        return directDeptInfos;
+    }
+
 }

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgQServiceImpl.java

@@ -8,6 +8,7 @@ import com.njcn.harmonic.mapper.majornetwork.RStatOrgQMapper;
 import com.njcn.harmonic.pojo.vo.RStatOrgVO;
 import com.njcn.harmonic.service.majornetwork.RStatOrgQService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.harmonic.utils.DeptUtil;
 import com.njcn.system.api.DicDataFeignClient;
 import com.njcn.system.enums.DicDataEnum;
 import com.njcn.system.pojo.po.DictData;
@@ -42,9 +43,11 @@ public class RStatOrgQServiceImpl extends ServiceImpl<RStatOrgQMapper, RStatOrgQ
 
     @Override
     public List<RStatOrgVO> getRStatHarmonicQAll(StatisticsBizBaseParam param) {
-        List<DeptDTO> deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
+        //获取部门信息
-        //获取部门id集合
+        List<DeptDTO> deptList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
+        List<DeptDTO> deptDTOList = DeptUtil.getDeptSubsetVOList(deptList, param.getId());
         List<String> deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList());
+
         Map<String, DeptDTO> deptMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getCode, Function.identity()));
 
         //获取主网id信息

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgYServiceImpl.java

@@ -25,6 +25,7 @@ import com.njcn.harmonic.pojo.po.RStatOrgY;
 import com.njcn.harmonic.pojo.vo.*;
 import com.njcn.harmonic.service.majornetwork.RStatOrgYService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.harmonic.utils.DeptUtil;
 import com.njcn.system.api.DicDataFeignClient;
 import com.njcn.system.enums.DicDataEnum;
 import com.njcn.system.enums.DicDataTypeEnum;
@@ -67,9 +68,11 @@ public class RStatOrgYServiceImpl extends ServiceImpl<RStatOrgYMapper, RStatOrgY
 
     @Override
     public List<RStatOrgVO> getRStatHarmonicYAll(StatisticsBizBaseParam param) {
-        List<DeptDTO> deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
+        //获取部门信息
-        //获取部门id集合
+        List<DeptDTO> deptList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
+        List<DeptDTO> deptDTOList = DeptUtil.getDeptSubsetVOList(deptList, param.getId());
         List<String> deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList());
+
         Map<String, DeptDTO> deptMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getCode, Function.identity()));
 
         //获取主网id信息
@@ -112,7 +115,11 @@ public class RStatOrgYServiceImpl extends ServiceImpl<RStatOrgYMapper, RStatOrgY
     @Override
     public List<RStatSubstationOrg2VO> getRStatSubstationOrg(StatisticsBizBaseParam param) {
         // 获取当前用户的部门的子部门信息
-        List<DeptDTO> data = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
+        List<DeptDTO> deptList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
+        List<DeptDTO> data = DeptUtil.getDeptSubsetVOList(deptList, param.getId());
+
+
+
         List<RStatSubstationOrg2VO> info = new ArrayList<>();
         if (CollectionUtil.isNotEmpty(data)) {
             // 根据暂态指标枚举查询暂态指标
@@ -356,7 +363,9 @@ public class RStatOrgYServiceImpl extends ServiceImpl<RStatOrgYMapper, RStatOrgY
     @Override
     public List<RStatOrgIndexVO.RStatOrgIndexInfoVO> getRStatOrgIndex(StatisticsBizBaseParam param) {
         // 获取当前用户的部门的子部门信息
-        List<DeptDTO> data = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
+        List<DeptDTO> deptList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
+        List<DeptDTO> data = DeptUtil.getDeptSubsetVOList(deptList, param.getId());
+
         List<RStatOrgIndexVO.RStatOrgIndexInfoVO> info = new ArrayList<>();
         //获取主网id信息
         DictData mainnetData = dicDataFeignClient.getDicDataByCode(DicDataEnum.MAINNET_POINT.getCode()).getData();

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatSubstationVoltageMServiceImpl.java

@@ -9,6 +9,7 @@ import com.njcn.harmonic.pojo.vo.RIconVO;
 import com.njcn.harmonic.pojo.vo.RVoltageIconVO;
 import com.njcn.harmonic.service.majornetwork.RStatSubstationVoltageMService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.harmonic.utils.DeptUtil;
 import com.njcn.system.api.DicDataFeignClient;
 import com.njcn.system.enums.DicDataTypeEnum;
 import com.njcn.system.pojo.po.DictData;
@@ -43,8 +44,10 @@ public class RStatSubstationVoltageMServiceImpl extends ServiceImpl<RStatSubstat
     @Override
     public List<RVoltageIconVO> getStatSubstationIcon(StatisticsBizBaseParam param) {
         //获取当前部门下所有部门信息
-        List<DeptDTO> deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
+        List<DeptDTO> deptList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
+        List<DeptDTO> deptDTOList = DeptUtil.getDeptSubsetVOList(deptList, param.getId());
         List<String> deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList());
+
         StatSubstationBizBaseParam baseParam= BeanUtil.copyProperties(param,StatSubstationBizBaseParam.class);
         baseParam.setIds(deptIds);
         //获取电压信息

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/RStatOrgPvPowerQualityService.java

@@ -10,6 +10,7 @@ import com.njcn.harmonic.pojo.vo.RStatOrgPvDetailVO;
 import com.njcn.harmonic.pojo.vo.RStatOrgPvPowerStreamVO;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 分布式光伏_台区电能质量明细
@@ -41,5 +42,19 @@ public interface RStatOrgPvPowerQualityService extends IService<RStatOrgPvPowerQ
      * @param param
      * @return
      */
-    List<OverviewVO.GroupVO> getVoltage(OverviewParam param);
+    List<OverviewVO.IcoVO> getVoltage(OverviewParam.OverviewVoltageParam param);
+
+    /**
+     * 分布式光伏概览-功率因数问题
+     * @param param
+     * @return
+     */
+    List<OverviewVO.NumVO>  getPowerFactor(OverviewParam param);
+
+    /**
+     * 分布式光伏概览-潮流到送与重过载问题
+     * @param param
+     * @return
+     */
+    List<OverviewVO.IcoVO> getBackTheTide(OverviewParam param);
 }

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/DistributedPvOverviewServiceImpl.java

@@ -307,8 +307,9 @@ public class DistributedPvOverviewServiceImpl implements DistributedPvOverviewSe
      * @param param 条件参数
      */
     private List<PwPmsMonitorDTO> getMonitorDtoList(StatisticsBizBaseParam param) {
+        //分布式光伏-（监测店标签-主配网）等演示完更新
         PwPmsMonitorParam pwPmsMonitorParam = new PwPmsMonitorParam();
         pwPmsMonitorParam.setOrgId(param.getId());
-        return monitorClient.getPwMonitorList(pwPmsMonitorParam).getData();
+        return monitorClient.getPwPhotovoltaicMonitorList(pwPmsMonitorParam).getData();
     }
 }

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/DistributedPvVolOverServiceImpl.java

@@ -49,7 +49,7 @@ public class DistributedPvVolOverServiceImpl implements DistributedPvVolOverServ
         // 获取当前单位下的监测点信息
         PwPmsMonitorParam pwPmsMonitorParam = new PwPmsMonitorParam();
         pwPmsMonitorParam.setOrgId(param.getId());
-        List<PwPmsMonitorDTO> pwMonitorList = monitorClient.getPwMonitorList(pwPmsMonitorParam).getData();
+        List<PwPmsMonitorDTO> pwMonitorList = monitorClient.getPwPhotovoltaicMonitorList(pwPmsMonitorParam).getData();
         if (CollUtil.isEmpty(pwMonitorList)) {
             return new Page<>();
         }

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/PermeabilityServiceImpl.java

@@ -52,8 +52,9 @@ public class PermeabilityServiceImpl implements PermeabilityService {
         //获取部门信息
 //        List<DeptDTO> data = deptFeignClient.getDeptDescendantIndexes(id, WebUtil.filterDeptType()).getData();
         List<Dept> data = deptFeignClient.getDirectSonSelf(id).getData(); //获取当前部门和子部门信息
-        Map<String, Dept> deptMap = data.stream().collect(Collectors.toMap(Dept::getCode, dept -> dept));
+        //剔除本部
-        List<String> deptCodes = data.stream().map(Dept::getCode).collect(Collectors.toList());
+        Map<String, Dept> deptMap = data.stream().filter(r-> !r.getId().equals(id)).collect(Collectors.toMap(Dept::getCode, dept -> dept));
+        List<String> deptCodes = data.stream().filter(r-> !r.getId().equals(id)).map(Dept::getCode).collect(Collectors.toList());
         //获取各渗透率字典
         List<DictData> rateList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.PERMEABILITY_TYPE.getCode()).getData();
         //将渗透率字典转换为查询条件

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/RMpEmissionMServiceImpl.java

@@ -68,8 +68,9 @@ public class RMpEmissionMServiceImpl extends ServiceImpl<RMpEmissionMMapper, RMp
         }
         //获取当前部门和子部门信息
         List<Dept> data = deptFeignClient.getDirectSonSelf(id).getData();
-        Map<String, Dept> deptMap = data.stream().collect(Collectors.toMap(Dept::getCode, dept -> dept));
+        //剔除本部门
-        List<String> deptCodes = data.stream().map(Dept::getCode).collect(Collectors.toList());
+        Map<String, Dept> deptMap = data.stream().filter(r-> !r.getId().equals(id)).collect(Collectors.toMap(Dept::getCode, dept -> dept));
+        List<String> deptCodes = data.stream().filter(r-> !r.getId().equals(id)).map(Dept::getCode).collect(Collectors.toList());
 
         //查询风电场信息
 //        PmsMonitorParam pmsMonitorParam = new PmsMonitorParam();

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/RMpInfluenceMServiceImpl.java

@@ -62,8 +62,8 @@ public class RMpInfluenceMServiceImpl extends ServiceImpl<RMpInfluenceMMapper, R
         }
         //获取当前部门和子部门信息
         List<Dept> data = deptFeignClient.getDirectSonSelf(id).getData();
-        Map<String, Dept> deptMap = data.stream().collect(Collectors.toMap(Dept::getCode, dept -> dept));
+        Map<String, Dept> deptMap = data.stream().filter(r-> !r.getId().equals(id)).collect(Collectors.toMap(Dept::getCode, dept -> dept));
-        List<String> deptCodes = data.stream().map(Dept::getCode).collect(Collectors.toList());
+        List<String> deptCodes = data.stream().filter(r-> !r.getId().equals(id)).map(Dept::getCode).collect(Collectors.toList());
 
         //查询风电场信息
 //        PmsMonitorParam pmsMonitorParam = new PmsMonitorParam();

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/RMpWpPowerDetailMServiceImpl.java

@@ -55,7 +55,7 @@ public class RMpWpPowerDetailMServiceImpl extends ServiceImpl<RMpWpPowerDetailMM
     public Page<RMpWpPowerDetailVO> getWindFarmDetailInfo(PowerQualityParam.PowerQualityInfoParam param) {
         //获取部门id集合
         List<Dept> deptDTOS = deptFeignClient.getDirectSonSelf(param.getId()).getData();
-        List<String> deptIds = deptDTOS.stream().map(Dept::getCode).collect(Collectors.toList());
+        List<String> deptIds = deptDTOS.stream().filter(r-> !r.getId().equals(param.getId())).map(Dept::getCode).collect(Collectors.toList());
 
         //根据条件查询单位下面的所有配网监测点
         PmsMonitorParam pmsMonitorParam = new PmsMonitorParam();
@@ -134,7 +134,7 @@ public class RMpWpPowerDetailMServiceImpl extends ServiceImpl<RMpWpPowerDetailMM
     public Page<RMpRailwayTractionDetailVO> getRailwayDetailInfo(PowerQualityParam param) {
         //获取部门id集合
         List<Dept> deptDTOS = deptFeignClient.getDirectSonSelf(param.getId()).getData();
-        List<String> deptIds = deptDTOS.stream().map(Dept::getCode).collect(Collectors.toList());
+        List<String> deptIds = deptDTOS.stream().filter(r-> !r.getId().equals(param.getId())).map(Dept::getCode).collect(Collectors.toList());
 
         //根据部门信息，获取牵引站信息
         PmsTractionStationParam stationParam = new PmsTractionStationParam();