diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/excel/monitor/ITimes.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/excel/monitor/ITimes.java index 1b9a62ed2..c907a4330 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/excel/monitor/ITimes.java +++ b/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; diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/excel/substation/SubstationExcel.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/excel/substation/SubstationExcel.java index cf88b10be..5191bccdc 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/excel/substation/SubstationExcel.java +++ b/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; diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/HistoryParam.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/HistoryParam.java index aec7ef521..eb7fb9aac 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/HistoryParam.java +++ b/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; } diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/OverviewParam.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/OverviewParam.java index 05105ae27..70fd03272 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/OverviewParam.java +++ b/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 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; + + + } } diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/RStatFileVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/RStatFileVO.java index a303afaca..14a482d70 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/RStatFileVO.java +++ b/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; /** * <功能描述> diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/RStatOrgParam.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/RStatOrgParam.java index 06540e17c..5a58b31fd 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/RStatOrgParam.java +++ b/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; diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpDevEvaluateDetailPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpDevEvaluateDetailPO.java index 502495fba..6a46d221d 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpDevEvaluateDetailPO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpDevEvaluateDetailPO.java @@ -8,7 +8,7 @@ import lombok.Data; import java.util.Date; /** - * + * * Description: * 接口文档访问地址：http://serverIP:port/swagger-ui.html * Date: 2022/12/1 9:18【需求编号】 @@ -16,8 +16,9 @@ import java.util.Date; * @author clam * @version V1.0.0 */ + /** - * 终端评价详情表 + * 终端评价详情表 */ @Data @TableName(value = "r_mp_dev_evaluate_detail") @@ -57,4 +58,4 @@ public class RMpDevEvaluateDetailPO { */ @TableField(value = "dev_effective_rate") private Double devEffectiveRate; -} \ No newline at end of file +} diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpEventDetailDPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpEventDetailDPO.java index b0a3fd0ea..bc00d6dce 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpEventDetailDPO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpEventDetailDPO.java @@ -8,7 +8,7 @@ import lombok.Data; import java.util.Date; /** - * + * * Description: * 接口文档访问地址：http://serverIP:port/swagger-ui.html * Date: 2022/12/28 14:58【需求编号】 @@ -16,6 +16,7 @@ import java.util.Date; * @author clam * @version V1.0.0 */ + /** * 监测点暂态指标超标明细日表 */ @@ -51,4 +52,4 @@ public class RMpEventDetailDPO { */ @TableField(value = "interrupt_times") private Integer interruptTimes; -} \ No newline at end of file +} diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpEventDetailMPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpEventDetailMPO.java index 4ca2be35e..05e6aaaa8 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpEventDetailMPO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpEventDetailMPO.java @@ -8,7 +8,7 @@ import lombok.Data; import java.util.Date; /** - * + * * Description: * 接口文档访问地址：http://serverIP:port/swagger-ui.html * Date: 2022/12/28 14:58【需求编号】 @@ -16,6 +16,7 @@ import java.util.Date; * @author clam * @version V1.0.0 */ + /** * 监测点暂态指标超标明细月表 */ @@ -51,4 +52,4 @@ public class RMpEventDetailMPO { */ @TableField(value = "interrupt_times") private Integer interruptTimes; -} \ No newline at end of file +} diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpEventDetailQPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpEventDetailQPO.java index d02e219e8..de8778d35 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpEventDetailQPO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpEventDetailQPO.java @@ -8,7 +8,7 @@ import lombok.Data; import java.util.Date; /** - * + * * Description: * 接口文档访问地址：http://serverIP:port/swagger-ui.html * Date: 2022/12/28 14:58【需求编号】 @@ -16,6 +16,7 @@ import java.util.Date; * @author clam * @version V1.0.0 */ + /** * 监测点暂态指标超标明细季表 */ @@ -51,4 +52,4 @@ public class RMpEventDetailQPO { */ @TableField(value = "interrupt_times") private Integer interruptTimes; -} \ No newline at end of file +} diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpEventDetailYPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpEventDetailYPO.java index cb824b520..95e25cba6 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpEventDetailYPO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpEventDetailYPO.java @@ -8,7 +8,7 @@ import lombok.Data; import java.util.Date; /** - * + * * Description: * 接口文档访问地址：http://serverIP:port/swagger-ui.html * Date: 2022/12/28 14:58【需求编号】 @@ -16,6 +16,7 @@ import java.util.Date; * @author clam * @version V1.0.0 */ + /** * 监测点暂态指标超标明细年表 */ @@ -51,4 +52,4 @@ public class RMpEventDetailYPO { */ @TableField(value = "interrupt_times") private Integer interruptTimes; -} \ No newline at end of file +} diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpHarmonicIMagReportD.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpHarmonicIMagReportD.java index 7e0366801..0a7a19bd1 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpHarmonicIMagReportD.java +++ b/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; -} \ No newline at end of file +} diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpHarmonicIRateReportD.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpHarmonicIRateReportD.java index e1440efd3..3f3e42248 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpHarmonicIRateReportD.java +++ b/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; -} \ No newline at end of file +} diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpInharmonicIRateReportD.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpInharmonicIRateReportD.java index a45c9ecf4..9c2653835 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpInharmonicIRateReportD.java +++ b/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; -} \ No newline at end of file +} diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPassRateM.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPassRateM.java index 6a88e1312..be7e9c8b7 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPassRateM.java +++ b/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; + /** *

- * + * *

* * @author rui.wu diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPassRateQ.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPassRateQ.java index 5e1206950..daedff7f6 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPassRateQ.java +++ b/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; + /** *

- * + * *

* * @author rui.wu diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPassRateY.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPassRateY.java index 57482b04f..be8b96ace 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPassRateY.java +++ b/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; + /** *

- * + * *

* * @author rui.wu diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPvPowerDetailMPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPvPowerDetailMPO.java index c9005ea3c..0e901f817 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPvPowerDetailMPO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPvPowerDetailMPO.java @@ -1,9 +1,7 @@ package com.njcn.harmonic.pojo.po; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; @@ -141,4 +139,4 @@ public class RMpPvPowerDetailMPO implements Serializable { @TableField(exist = false) private static final long serialVersionUID = 1L; -} \ No newline at end of file +} diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpRailwayTractionDetail.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpRailwayTractionDetail.java index 5da1b4e64..f31821c12 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpRailwayTractionDetail.java +++ b/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; + /** *

* 电气化铁路_详细信息表（专项分析） diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpVThd.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpVThd.java index 2e9e57c85..bf7c7ae41 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpVThd.java +++ b/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; -} \ No newline at end of file +} diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpWpPowerDetailM.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpWpPowerDetailM.java index 58abf32c0..798994dbe 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpWpPowerDetailM.java +++ b/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; + /** *

* 风电站_台区电能质量明细_月表 diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpWpPowerDetailQ.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpWpPowerDetailQ.java index 3b2f63950..006c5b7a9 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpWpPowerDetailQ.java +++ b/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; + /** *

* 风电站_台区电能质量明细_季表 diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpWpPowerDetailY.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpWpPowerDetailY.java index 00213d02b..079a5b789 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpWpPowerDetailY.java +++ b/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; + /** *

* 风电站_台区电能质量明细_年表 diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/ROperatingIndexMPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/ROperatingIndexMPO.java index c0235bae4..8295528e9 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/ROperatingIndexMPO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/ROperatingIndexMPO.java @@ -8,7 +8,7 @@ import lombok.Data; import java.util.Date; /** - * + * * Description: * 接口文档访问地址：http://serverIP:port/swagger-ui.html * Date: 2022/11/30 13:59【需求编号】 @@ -16,8 +16,9 @@ import java.util.Date; * @author clam * @version V1.0.0 */ + /** - * 主网运行指标统计-月表,主网监测指标数据质量统计-月表 + * 主网运行指标统计-月表,主网监测指标数据质量统计-月表 */ @Data @TableName(value = "r_operating_index_m") @@ -99,4 +100,4 @@ public class ROperatingIndexMPO { */ @TableField(value = "is_unusual") private Integer isUnusual; -} \ No newline at end of file +} diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/ROperatingIndexQPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/ROperatingIndexQPO.java index aa5a2f572..b8dcaae4f 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/ROperatingIndexQPO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/ROperatingIndexQPO.java @@ -8,7 +8,7 @@ import lombok.Data; import java.util.Date; /** - * + * * Description: * 接口文档访问地址：http://serverIP:port/swagger-ui.html * Date: 2022/11/30 15:58【需求编号】 @@ -16,8 +16,9 @@ import java.util.Date; * @author clam * @version V1.0.0 */ + /** - * 主网运行指标统计-季表 ,主网监测指标数据质量统计-季表 + * 主网运行指标统计-季表 ,主网监测指标数据质量统计-季表 */ @Data @TableName(value = "r_operating_index_q") @@ -99,4 +100,4 @@ public class ROperatingIndexQPO { */ @TableField(value = "is_unusual") private Integer isUnusual; -} \ No newline at end of file +} diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/ROperatingIndexYPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/ROperatingIndexYPO.java index ebe99b926..d18a2fef8 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/ROperatingIndexYPO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/ROperatingIndexYPO.java @@ -8,7 +8,7 @@ import lombok.Data; import java.util.Date; /** - * + * * Description: * 接口文档访问地址：http://serverIP:port/swagger-ui.html * Date: 2022/11/30 15:58【需求编号】 @@ -16,8 +16,9 @@ import java.util.Date; * @author clam * @version V1.0.0 */ + /** - * 主网运行指标统计-年表,主网监测指标数据质量统计-年表 + * 主网运行指标统计-年表,主网监测指标数据质量统计-年表 */ @Data @TableName(value = "r_operating_index_y") @@ -99,4 +100,4 @@ public class ROperatingIndexYPO { */ @TableField(value = "is_unusual") private Integer isUnusual; -} \ No newline at end of file +} diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatFile.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatFile.java index 432cb1e78..d620e1b13 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatFile.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatFile.java @@ -1,18 +1,19 @@ package com.njcn.harmonic.pojo.po; -import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableField; -import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serializable; + /** *

- * + * *

* * @author wr diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatLoadTypeM.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatLoadTypeM.java index 17d01b63a..86533a72b 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatLoadTypeM.java +++ b/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; + /** *

- * + * *

* * @author rui.wu diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatLoadTypeQ.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatLoadTypeQ.java index 927dca5d3..eef08d127 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatLoadTypeQ.java +++ b/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; + /** *

- * + * *

* * @author rui.wu diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatLoadTypeY.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatLoadTypeY.java index ae5ff048b..b6c6b18ac 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatLoadTypeY.java +++ b/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; + /** *

- * + * *

* * @author rui.wu diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgBusbarVoltageM.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgBusbarVoltageM.java index cb1e48b93..48bb2f195 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgBusbarVoltageM.java +++ b/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; + /** *

- * + * *

* * @author rui.wu diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgBusbarVoltageQ.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgBusbarVoltageQ.java index 2f873023e..35db0cf34 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgBusbarVoltageQ.java +++ b/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; + /** *

- * + * *

* * @author rui.wu diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgBusbarVoltageY.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgBusbarVoltageY.java index ba331eb7a..72ef74ce0 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgBusbarVoltageY.java +++ b/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; + /** *

- * + * *

* * @author rui.wu diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgDPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgDPO.java index b90d443fa..241eedcfd 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgDPO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgDPO.java @@ -8,7 +8,7 @@ import lombok.Data; import java.util.Date; /** - * + * * Description: * 接口文档访问地址：http://serverIP:port/swagger-ui.html * Date: 2022/12/13 15:39【需求编号】 @@ -16,6 +16,7 @@ import java.util.Date; * @author clam * @version V1.0.0 */ + /** * 区域分类统计日表 */ @@ -87,4 +88,4 @@ public class RStatOrgDPO { */ @TableField(value = "warn_count") private Integer warnCount; -} \ No newline at end of file +} diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgM.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgM.java index 988796a9b..86738b70e 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgM.java +++ b/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; + /** *

* 区域分类统计月表 diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgMPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgMPO.java index 9e3a288d0..d1a6fe09a 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgMPO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgMPO.java @@ -8,7 +8,7 @@ import lombok.Data; import java.util.Date; /** - * + * * Description: * 接口文档访问地址：http://serverIP:port/swagger-ui.html * Date: 2022/12/14 16:17【需求编号】 @@ -16,6 +16,7 @@ import java.util.Date; * @author clam * @version V1.0.0 */ + /** * 区域分类统计月表 */ @@ -148,4 +149,4 @@ public class RStatOrgMPO { private Integer warnCount; -} \ No newline at end of file +} diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgQ.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgQ.java index 8d8e8ea2a..956a8a997 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgQ.java +++ b/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; + /** *

* 区域分类统计季表 diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgY.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgY.java index 7956b9ed2..a29604a8f 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgY.java +++ b/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; + /** *

* 区域分类统计年表 diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionOrgDPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionOrgDPO.java index 8b95e6cb1..82d5eecae 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionOrgDPO.java +++ b/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; -} \ No newline at end of file +} diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionOrgMPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionOrgMPO.java index dd25158ce..6106d18ee 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionOrgMPO.java +++ b/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; -} \ No newline at end of file +} diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionOrgQPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionOrgQPO.java index 34a71fa21..eb651db42 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionOrgQPO.java +++ b/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; -} \ No newline at end of file +} diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionOrgYPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionOrgYPO.java index 44fc2c38d..8e876bada 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionOrgYPO.java +++ b/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; -} \ No newline at end of file +} diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionSubstationDPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionSubstationDPO.java index 4fc3cc462..f9ee65654 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionSubstationDPO.java +++ b/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; -} \ No newline at end of file +} diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionSubstationQPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionSubstationQPO.java index 2936a93d6..5aec94dab 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionSubstationQPO.java +++ b/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; -} \ No newline at end of file +} diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionSubstationYPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionSubstationYPO.java index e46ffc5ff..d1978e1ee 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionSubstationYPO.java +++ b/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; -} \ No newline at end of file +} diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPwPermeabilityM.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPwPermeabilityM.java index e276aaad3..81386b6c1 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPwPermeabilityM.java +++ b/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; -} \ No newline at end of file +} diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationM.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationM.java index ea73dddc4..f3c89aede 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationM.java +++ b/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; + /** *

- * + * *

* * @author rui.wu diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationQ.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationQ.java index 5d1ee2efe..8213b4d56 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationQ.java +++ b/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; + /** *

- * + * *

* * @author rui.wu diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationVoltageM.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationVoltageM.java index bb0933d4f..9bce4f285 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationVoltageM.java +++ b/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; + /** *

- * + * *

* * @author rui.wu diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationY.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationY.java index 0fe743cd2..f002c4289 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationY.java +++ b/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; + /** *

- * + * *

* * @author rui.wu diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/WfOfOverviewPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/WfOfOverviewPO.java index 6a05df737..5aad7e472 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/WfOfOverviewPO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/WfOfOverviewPO.java @@ -1,7 +1,6 @@ package com.njcn.harmonic.pojo.po; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -64,4 +63,4 @@ public class WfOfOverviewPO implements Serializable { @TableField(exist = false) private static final long serialVersionUID = 1L; -} \ No newline at end of file +} diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/EventDetailVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/EventDetailVO.java index 252a8e184..ba06f5f52 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/EventDetailVO.java +++ b/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 diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/HarmonicDeptVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/HarmonicDeptVO.java index 47e43e6eb..618f45e03 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/HarmonicDeptVO.java +++ b/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; /** * 类的介绍： diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/HarmonicVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/HarmonicVO.java index a01630fd4..28a6b558d 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/HarmonicVO.java +++ b/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; /** * 类的介绍： diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/HistoryDataResultVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/HistoryDataResultVO.java index ec958e1a1..dbe6ce943 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/HistoryDataResultVO.java +++ b/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; /** diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/IntegrityIconVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/IntegrityIconVO.java index 672e8f05a..a4c00db08 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/IntegrityIconVO.java +++ b/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; /** * 类的介绍： diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/OverviewVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/OverviewVO.java index 7bdbc9739..0bf655332 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/OverviewVO.java +++ b/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; + } + } diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/PwRMpBenchmarkLevelVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/PwRMpBenchmarkLevelVO.java index b664fcb07..3f5dc50e1 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/PwRMpBenchmarkLevelVO.java +++ b/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 diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/QueryResultLimitVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/QueryResultLimitVO.java index 997e3e086..2a5809ed8 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/QueryResultLimitVO.java +++ b/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; diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpEmissionChartVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpEmissionChartVO.java index 383ad2ef1..0aa4b156e 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpEmissionChartVO.java +++ b/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; /** * 发射特性-折线图 diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpEmissionIExcessRateMVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpEmissionIExcessRateMVO.java index a832e3a4f..c5cd5fb7b 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpEmissionIExcessRateMVO.java +++ b/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; diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpEmissionIMVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpEmissionIMVO.java index fbad23527..070263480 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpEmissionIMVO.java +++ b/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; diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpEmissionVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpEmissionVO.java index 6f7b85eb0..2753b887d 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpEmissionVO.java +++ b/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; diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpHarmonicReportDVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpHarmonicReportDVO.java index 0f693bec9..8eaf8d47e 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpHarmonicReportDVO.java +++ b/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; diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpInfluenceVExcessRateMVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpInfluenceVExcessRateMVO.java index a33e196c9..2f01aa4e0 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpInfluenceVExcessRateMVO.java +++ b/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; diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpInfluenceVMVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpInfluenceVMVO.java index d995f0ce3..08a9fef40 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpInfluenceVMVO.java +++ b/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; diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpInfluenceVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpInfluenceVO.java index a229495b0..28578f0cd 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpInfluenceVO.java +++ b/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; diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpPartHarmonicDetailIconVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpPartHarmonicDetailIconVO.java index a00b9f6ee..11639678a 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpPartHarmonicDetailIconVO.java +++ b/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; - /** * <功能描述> * diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpPartHarmonicDetailVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpPartHarmonicDetailVO.java index 628f4b8dd..5d2ea744e 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpPartHarmonicDetailVO.java +++ b/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; diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpRailwayTractionDetailVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpRailwayTractionDetailVO.java index d0c4574a8..ea7139cac 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpRailwayTractionDetailVO.java +++ b/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; diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpWpPowerDetailVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpWpPowerDetailVO.java index 22d293675..6a2f37681 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpWpPowerDetailVO.java +++ b/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; /** * 专项分析-风电场-详细数据表 diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatLoadTypeVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatLoadTypeVO.java index 84c7f6c9b..b13f53062 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatLoadTypeVO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatLoadTypeVO.java @@ -1,19 +1,11 @@ package com.njcn.harmonic.pojo.vo; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.io.Serializable; -import java.time.LocalDate; /** *

- * + * *

* * @author rui.wu diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatOrgIndexVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatOrgIndexVO.java index 241f86401..6c4b01171 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatOrgIndexVO.java +++ b/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; /** diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RSubstationIconVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RSubstationIconVO.java index a7877f467..8df2219b2 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RSubstationIconVO.java +++ b/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; /** diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/distribution/PwOverviewController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/distribution/PwOverviewController.java index 72c64c8cb..9a307a063 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/distribution/PwOverviewController.java +++ b/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> getAlarmProportion(@RequestBody OverviewParam param) { - String methodDescribe = getMethodDescribe("getAlarmProportion"); - List monitorYoY = rStatHarmonicOrgMService.getExcessiveProportion(param); + public HttpResult> getExcessiveProportion(@RequestBody OverviewParam param) { + String methodDescribe = getMethodDescribe("getExcessiveProportion"); + List 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> getVoltage(@RequestBody OverviewParam.OverviewVoltageParam param) { + String methodDescribe = getMethodDescribe("getVoltage"); + List 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 > getPowerFactor(@RequestBody OverviewParam param) { + String methodDescribe = getMethodDescribe("getPowerFactor"); + List 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 > getBackTheTide(@RequestBody OverviewParam param) { + String methodDescribe = getMethodDescribe("getBackTheTide"); + List 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> getExceedMonitor(@RequestBody OverviewParam.OverviewDateParam param) { + String methodDescribe = getMethodDescribe("getExceedMonitor"); + List groupVOS = rStatOrgMService.getExceedMonitor(param); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, groupVOS, methodDescribe); + } + } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/StatHarmonicOrgMMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/StatHarmonicOrgMMapper.java index 5e82c27fc..87d958c0b 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/StatHarmonicOrgMMapper.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/StatHarmonicOrgMMapper.java @@ -45,5 +45,6 @@ public interface StatHarmonicOrgMMapper extends BaseMapper { */ List selectYoY(@Param("param") OverviewParam param, @Param("ids") List ids, + @Param("types") List types, @Param("dataType") String dataType); } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/StatHarmonicOrgMMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/StatHarmonicOrgMMapper.xml index a034f21b4..b9fd792c4 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/StatHarmonicOrgMMapper.xml +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/StatHarmonicOrgMMapper.xml @@ -81,6 +81,12 @@ FROM ( #{item} + + AND measurement_type_class IN + + #{item} + + GROUP BY t.measurement_type_class,t.harmonic_type,yy,mm ) ta @@ -103,6 +109,12 @@ LEFT JOIN ( #{item} + + AND measurement_type_class IN + + #{item} + + GROUP BY t.measurement_type_class,t.harmonic_type,yy,mm ) tb @@ -127,6 +139,12 @@ LEFT JOIN ( #{item} + + AND measurement_type_class IN + + #{item} + + 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 - - diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/specialanalysis/RStatOrgPvPowerQualityMMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/specialanalysis/RStatOrgPvPowerQualityMMapper.java index 740992f6c..3648711c8 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/specialanalysis/RStatOrgPvPowerQualityMMapper.java +++ b/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 selectVoltage(@Param("deptCodes") List deptCodes, - @Param("ids") List ids); + @Param("ids") List ids, + @Param("param") OverviewParam param); } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/specialanalysis/mapping/RStatOrgPvPowerQualityMMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/specialanalysis/mapping/RStatOrgPvPowerQualityMMapper.xml index 464f92dae..3b0b5b7e4 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/specialanalysis/mapping/RStatOrgPvPowerQualityMMapper.xml +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/specialanalysis/mapping/RStatOrgPvPowerQualityMMapper.xml @@ -63,13 +63,15 @@ #{item} - - - - - - - + + and YEAR(data_date)=#{param.year} + + + AND MONTH(data_date) IN + + #{item} + + GROUP BY monitoring_object, diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/distribution/impl/PwRStatOrgServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/distribution/impl/PwRStatOrgServiceImpl.java index ddf3d31c9..5f4446973 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/distribution/impl/PwRStatOrgServiceImpl.java +++ b/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 getRStatHarmonicAll(StatSubstationBizBaseParam param) { //获取当前部门下所有部门信息 - List deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); + List deptList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); + List deptDTOList = DeptUtil.getDeptSubsetVOList(deptList, param.getId()); + + Map deptMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getCode, Function.identity())); List deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); @@ -104,12 +108,9 @@ public class PwRStatOrgServiceImpl extends ServiceImpl getRStatOrgIndex(StatSubstationBizBaseParam param) { // 获取当前用户的部门的子部门信息 -// PwPmsMonitorParam pwPmsMonitorParam=new PwPmsMonitorParam(); -// pwPmsMonitorParam.setOrgId(param.getId()); -// pwPmsMonitorParam.setMonitorSort(param.getIds()); -// List data = pwMonitorClient.getPwMonitorList(pwPmsMonitorParam).getData(); - List deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); + List deptList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); + List deptDTOList = DeptUtil.getDeptSubsetVOList(deptList, param.getId()); List deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); //获取配网信息 @@ -224,7 +225,9 @@ public class PwRStatOrgServiceImpl extends ServiceImpl getRStatSubstationOrg(StatSubstationBizBaseParam param) { //获取当前部门下所有部门信息 - List deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); + List deptList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); + List deptDTOList = DeptUtil.getDeptSubsetVOList(deptList, param.getId()); + Map deptMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getCode, Function.identity())); List deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); //初始化 diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/RStatHarmonicOrgMService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/RStatHarmonicOrgMService.java index 112f26c60..742e8d7e2 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/RStatHarmonicOrgMService.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/RStatHarmonicOrgMService.java @@ -60,5 +60,5 @@ public interface RStatHarmonicOrgMService extends IService { * @param param * @return */ - List getExcessiveProportion(OverviewParam param); + List getExcessiveProportion(OverviewParam param); } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/RStatOrgMService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/RStatOrgMService.java index c3238e31c..e8ea194fd 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/RStatOrgMService.java +++ b/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 { * @return */ List getRStatHarmonicMAll(StatisticsBizBaseParam param); + + /** + * 分布式光伏概览-超标监测点数量 + * @param param + * @return + */ + List getExceedMonitor(OverviewParam.OverviewDateParam param); + + } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RMpPartHarmonicDetailMServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RMpPartHarmonicDetailMServiceImpl.java index 953eeca46..56a560664 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RMpPartHarmonicDetailMServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RMpPartHarmonicDetailMServiceImpl.java @@ -100,6 +100,6 @@ public class RMpPartHarmonicDetailMServiceImpl extends ServiceImpl(); } } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicMServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicMServiceImpl.java index d68bbe88d..6f48da80a 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicMServiceImpl.java +++ b/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 deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); + List deptList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); + List deptDTOList = DeptUtil.getDeptSubsetVOList(deptList, param.getId()); List 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 arrayVOList = new ArrayList<>(); //获取当前部门下所有部门信息 - List deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); + List deptList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); + List deptDTOList = DeptUtil.getDeptSubsetVOList(deptList, param.getId()); List 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 deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); + List deptList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); + List deptDTOList = DeptUtil.getDeptSubsetVOList(deptList, param.getId()); List 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 arrayVOList = new ArrayList<>(); //获取当前部门下所有部门信息 - List deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); + List deptList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); + List deptDTOList = DeptUtil.getDeptSubsetVOList(deptList, param.getId()); List 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 deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); + List deptList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); + List deptDTOList = DeptUtil.getDeptSubsetVOList(deptList, param.getId()); List deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); StatSubstationBizBaseParam baseParam = BeanUtil.copyProperties(param, StatSubstationBizBaseParam.class); diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicOrgMServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicOrgMServiceImpl.java index ab6783814..5b77e20c7 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicOrgMServiceImpl.java +++ b/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 getExcessiveProportion(OverviewParam param) { - List info=new ArrayList<>(); + public List getExcessiveProportion(OverviewParam param) { + List info =new ArrayList<>(); //指标类型 List steadyData = dicDataFeignClient.getDicDataByTypeCode (DicDataTypeEnum.STEADY_STATIS.getCode()).getData(); + List 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 steadyTypeMap = steadyTypeData.stream().collect(Collectors.toMap(DictData::getId, Function.identity())); + //监测点类型 List lineData = dicDataFeignClient.getDicDataByTypeCode (DicDataTypeEnum.LINE_SORT.getCode()).getData(); + List lineDataIds = lineData.stream().map(DictData::getId).collect(Collectors.toList()); //获取部门数据 - List deptDTOS = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); - if(CollectionUtil.isNotEmpty(deptDTOS)){ - List collect = deptDTOS.stream().map(DeptDTO::getCode).collect(Collectors.toList()); - //获取配网数据类型 - DictData data = dicDataFeignClient.getDicDataByCode(DicDataEnum.DISTRIBUTION_POINT.getCode()).getData(); - List overviewVOS = statHarmonicOrgMMapper.selectYoY(param, collect, data.getId()); + List deptCodes = getDeptListCode(param.getId()); - Map> overviewVOMap = overviewVOS.stream().collect( - Collectors.groupingBy(OverviewVO::getMonitorSort)); + //获取配网数据类型 + DictData data = dicDataFeignClient.getDicDataByCode(DicDataEnum.DISTRIBUTION_POINT.getCode()).getData(); + List overviewVOS = statHarmonicOrgMMapper.selectYoY(param, deptCodes,lineDataIds, data.getId()); - overviewVOMap.forEach((key,value)->{ - OverviewVO.GroupVO groupVO = new OverviewVO.GroupVO(); + Map> overviewVOMap = overviewVOS.stream().collect( + Collectors.groupingBy(OverviewVO::getMonitorSort)); - Map> listMap = value.stream().collect(Collectors.groupingBy(OverviewVO::getHarmonicType)); - List 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 notDict = lineData.stream().filter(r -> !overviewVOMap.containsKey(r.getId())) - .collect(Collectors.toList()); - if(CollectionUtil.isNotEmpty(notDict)){ - OverviewVO.GroupVO overviewVO; - OverviewVO vo; - for (DictData dictData : notDict) { - overviewVO=new OverviewVO.GroupVO(); - overviewVO.setMonitorSort(dictData.getId()); - List vos=new ArrayList<>(); - for (DictData lineDatum : steadyData) { - vo=new OverviewVO(); - vo.setMonitorSort(dictData.getId()); - vo.setHarmonicType(lineDatum.getId()); - vo.setSumNum("0"); - vo.setYtbSumNum("0"); - vo.setYhbSumNum("0"); - vo.setSameNum("0"); - vo.setRingNum("0"); - vos.add(vo); + overviewVOMap.forEach((key,value)->{ + OverviewVO.ExcessiveVO excessiveVO=new OverviewVO.ExcessiveVO(); + excessiveVO.setMonitorSort(key); + excessiveVO.setHarmonic("0.0"); + excessiveVO.setHarmonicTb("0.0"); + excessiveVO.setVoltage("0.0"); + excessiveVO.setVoltageTb("0.0"); + excessiveVO.setFlicker("0.0"); + excessiveVO.setFlickerTb("0.0"); + for (OverviewVO overviewVO : value) { + if(steadyTypeMap.containsKey(overviewVO.getHarmonicType())){ + DictData dictData = steadyTypeMap.get(overviewVO.getHarmonicType()); + if(DicDataEnum.HARMONIC_VOLTAGE.getCode().equals(dictData.getCode())){ + excessiveVO.setHarmonic(overviewVO.getSumNum()); + excessiveVO.setHarmonicTb(overviewVO.getSameNum()); + } + if(DicDataEnum.FLICKER.getCode().equals(dictData.getCode())){ + excessiveVO.setFlicker(overviewVO.getSumNum()); + 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> excessiveMap= info.stream().collect(Collectors.groupingBy(OverviewVO.ExcessiveVO::getMonitorSort)); + List 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 getDeptListCode(String id){ + //获取部门数据 + Dept data = deptFeignClient.getDeptById(id).getData(); + if(ObjectUtil.isNotNull(data)){ + return Arrays.asList(data.getCode()); + } + return new ArrayList<>(); + } } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicQServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicQServiceImpl.java index bf9ad373b..6e32c44b7 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicQServiceImpl.java +++ b/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 deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); + List deptList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); + List deptDTOList = DeptUtil.getDeptSubsetVOList(deptList, param.getId()); List 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 arrayVOList = new ArrayList<>(); //获取当前部门下所有部门信息 - List deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); + List deptList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); + List deptDTOList = DeptUtil.getDeptSubsetVOList(deptList, param.getId()); List deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); StatSubstationBizBaseParam baseParam = BeanUtil.copyProperties(param, StatSubstationBizBaseParam.class); diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicYServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicYServiceImpl.java index 439724904..0edd78fe0 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicYServiceImpl.java +++ b/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 deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); + List deptList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); + List deptDTOList = DeptUtil.getDeptSubsetVOList(deptList, param.getId()); + List 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 arrayVOList = new ArrayList<>(); //获取当前部门下所有部门信息 - List deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); + List deptList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); + List deptDTOList = DeptUtil.getDeptSubsetVOList(deptList, param.getId()); List deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); StatSubstationBizBaseParam baseParam = BeanUtil.copyProperties(param, StatSubstationBizBaseParam.class); diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatLoadTypeServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatLoadTypeServiceImpl.java index 60dfa4e44..81dd72e2e 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatLoadTypeServiceImpl.java +++ b/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 getRStatLoadType(StatisticsBizBaseParam param) { //获取部门信息 - List data = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); + List deptList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); + List data = DeptUtil.getDeptSubsetVOList(deptList, param.getId()); + + List deptIds = data.stream().map(DeptDTO::getCode).collect(Collectors.toList()); //获取字典信息 List data1 = dicDataFeignClient.getDicDataByTypeCode( diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgBusbarVoltageServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgBusbarVoltageServiceImpl.java index f1e7d28aa..84f3acb8d 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgBusbarVoltageServiceImpl.java +++ b/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 getRStatOrgBusbarVoltage(StatSubstationBizBaseParam param) { //获取部门信息 - List data = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); + List deptList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); + List data = DeptUtil.getDeptSubsetVOList(deptList, param.getId()); + Map deptMap = data.stream().collect(Collectors.toMap(DeptDTO::getCode, Function.identity())); //获取部门id集合 diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgMServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgMServiceImpl.java index 7499115e3..4b08e063d 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgMServiceImpl.java +++ b/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 getRStatHarmonicMAll(StatisticsBizBaseParam param) { - List deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); - //获取部门id集合 + List deptList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); + List deptDTOList = DeptUtil.getDeptSubsetVOList(deptList, param.getId()); List deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); + Map 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 getExceedMonitor(OverviewParam.OverviewDateParam param) { + List info =new ArrayList<>(); + //查询配网信息 + DictData dictData = dicDataFeignClient.getDicDataByCode(DicDataEnum.DISTRIBUTION_POINT.getCode()).getData(); + //获取部门数据 + List subDeptListCode = getSubDeptListCode(param.getId()); + List deptListCode = subDeptListCode.stream().map(DeptDTO::getCode).collect(Collectors.toList()); + Map deptMap = subDeptListCode.stream().collect(Collectors.toMap(DeptDTO::getCode, Function.identity())); + + List list = this.list(new LambdaQueryWrapper() + .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> 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 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 getSubDeptListCode(String deptId){ + List deptDTOList = deptFeignClient.getDeptDescendantIndexes(deptId, WebUtil.filterDeptType()).getData(); + //获取子部门 + List directDeptInfos = deptDTOList.stream() + .filter(deptDTO -> deptDTO.getPid().equals(deptId)) + .collect(Collectors.toList()); + if (CollectionUtil.isEmpty(directDeptInfos)) { + //没有直接子部门，获取当前部门所有信息 + List dept = deptDTOList.stream() + .filter(deptDTO -> deptDTO.getId().equals(deptId)) + .collect(Collectors.toList()); + return dept; + } + return directDeptInfos; + } + } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgQServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgQServiceImpl.java index 6e05a3828..7aba335c8 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgQServiceImpl.java +++ b/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 getRStatHarmonicQAll(StatisticsBizBaseParam param) { - List deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); - //获取部门id集合 + //获取部门信息 + List deptList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); + List deptDTOList = DeptUtil.getDeptSubsetVOList(deptList, param.getId()); List deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); + Map deptMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getCode, Function.identity())); //获取主网id信息 diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgYServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgYServiceImpl.java index e7e36a079..7a6977dbd 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgYServiceImpl.java +++ b/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 getRStatHarmonicYAll(StatisticsBizBaseParam param) { - List deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); - //获取部门id集合 + //获取部门信息 + List deptList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); + List deptDTOList = DeptUtil.getDeptSubsetVOList(deptList, param.getId()); List deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); + Map deptMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getCode, Function.identity())); //获取主网id信息 @@ -112,7 +115,11 @@ public class RStatOrgYServiceImpl extends ServiceImpl getRStatSubstationOrg(StatisticsBizBaseParam param) { // 获取当前用户的部门的子部门信息 - List data = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); + List deptList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); + List data = DeptUtil.getDeptSubsetVOList(deptList, param.getId()); + + + List info = new ArrayList<>(); if (CollectionUtil.isNotEmpty(data)) { // 根据暂态指标枚举查询暂态指标 @@ -356,7 +363,9 @@ public class RStatOrgYServiceImpl extends ServiceImpl getRStatOrgIndex(StatisticsBizBaseParam param) { // 获取当前用户的部门的子部门信息 - List data = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); + List deptList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); + List data = DeptUtil.getDeptSubsetVOList(deptList, param.getId()); + List info = new ArrayList<>(); //获取主网id信息 DictData mainnetData = dicDataFeignClient.getDicDataByCode(DicDataEnum.MAINNET_POINT.getCode()).getData(); diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatSubstationVoltageMServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatSubstationVoltageMServiceImpl.java index db8175bfb..cc662efa0 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatSubstationVoltageMServiceImpl.java +++ b/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 getStatSubstationIcon(StatisticsBizBaseParam param) { //获取当前部门下所有部门信息 - List deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); + List deptList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); + List deptDTOList = DeptUtil.getDeptSubsetVOList(deptList, param.getId()); List deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); + StatSubstationBizBaseParam baseParam= BeanUtil.copyProperties(param,StatSubstationBizBaseParam.class); baseParam.setIds(deptIds); //获取电压信息 diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/RStatOrgPvPowerQualityService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/RStatOrgPvPowerQualityService.java index 1843d678d..b35b6855f 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/RStatOrgPvPowerQualityService.java +++ b/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 getVoltage(OverviewParam param); + List getVoltage(OverviewParam.OverviewVoltageParam param); + + /** + * 分布式光伏概览-功率因数问题 + * @param param + * @return + */ + List getPowerFactor(OverviewParam param); + + /** + * 分布式光伏概览-潮流到送与重过载问题 + * @param param + * @return + */ + List getBackTheTide(OverviewParam param); } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/DistributedPvOverviewServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/DistributedPvOverviewServiceImpl.java index 289d84854..f048940be 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/DistributedPvOverviewServiceImpl.java +++ b/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 getMonitorDtoList(StatisticsBizBaseParam param) { + //分布式光伏-（监测店标签-主配网）等演示完更新 PwPmsMonitorParam pwPmsMonitorParam = new PwPmsMonitorParam(); pwPmsMonitorParam.setOrgId(param.getId()); - return monitorClient.getPwMonitorList(pwPmsMonitorParam).getData(); + return monitorClient.getPwPhotovoltaicMonitorList(pwPmsMonitorParam).getData(); } } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/DistributedPvVolOverServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/DistributedPvVolOverServiceImpl.java index 49451904f..774df8ec2 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/DistributedPvVolOverServiceImpl.java +++ b/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 pwMonitorList = monitorClient.getPwMonitorList(pwPmsMonitorParam).getData(); + List pwMonitorList = monitorClient.getPwPhotovoltaicMonitorList(pwPmsMonitorParam).getData(); if (CollUtil.isEmpty(pwMonitorList)) { return new Page<>(); } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/PermeabilityServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/PermeabilityServiceImpl.java index 650fd60e6..cd4cc5c7e 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/PermeabilityServiceImpl.java +++ b/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 data = deptFeignClient.getDeptDescendantIndexes(id, WebUtil.filterDeptType()).getData(); List data = deptFeignClient.getDirectSonSelf(id).getData(); //获取当前部门和子部门信息 - Map deptMap = data.stream().collect(Collectors.toMap(Dept::getCode, dept -> dept)); - List deptCodes = data.stream().map(Dept::getCode).collect(Collectors.toList()); + //剔除本部 + Map deptMap = data.stream().filter(r-> !r.getId().equals(id)).collect(Collectors.toMap(Dept::getCode, dept -> dept)); + List deptCodes = data.stream().filter(r-> !r.getId().equals(id)).map(Dept::getCode).collect(Collectors.toList()); //获取各渗透率字典 List rateList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.PERMEABILITY_TYPE.getCode()).getData(); //将渗透率字典转换为查询条件 diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/RMpEmissionMServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/RMpEmissionMServiceImpl.java index 89655e136..ebaf650b6 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/RMpEmissionMServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/RMpEmissionMServiceImpl.java @@ -68,8 +68,9 @@ public class RMpEmissionMServiceImpl extends ServiceImpl data = deptFeignClient.getDirectSonSelf(id).getData(); - Map deptMap = data.stream().collect(Collectors.toMap(Dept::getCode, dept -> dept)); - List deptCodes = data.stream().map(Dept::getCode).collect(Collectors.toList()); + //剔除本部门 + Map deptMap = data.stream().filter(r-> !r.getId().equals(id)).collect(Collectors.toMap(Dept::getCode, dept -> dept)); + List deptCodes = data.stream().filter(r-> !r.getId().equals(id)).map(Dept::getCode).collect(Collectors.toList()); //查询风电场信息 // PmsMonitorParam pmsMonitorParam = new PmsMonitorParam(); diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/RMpInfluenceMServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/RMpInfluenceMServiceImpl.java index c484ca14c..9e5141aae 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/RMpInfluenceMServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/RMpInfluenceMServiceImpl.java @@ -62,8 +62,8 @@ public class RMpInfluenceMServiceImpl extends ServiceImpl data = deptFeignClient.getDirectSonSelf(id).getData(); - Map deptMap = data.stream().collect(Collectors.toMap(Dept::getCode, dept -> dept)); - List deptCodes = data.stream().map(Dept::getCode).collect(Collectors.toList()); + Map deptMap = data.stream().filter(r-> !r.getId().equals(id)).collect(Collectors.toMap(Dept::getCode, dept -> dept)); + List deptCodes = data.stream().filter(r-> !r.getId().equals(id)).map(Dept::getCode).collect(Collectors.toList()); //查询风电场信息 // PmsMonitorParam pmsMonitorParam = new PmsMonitorParam(); diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/RMpWpPowerDetailMServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/RMpWpPowerDetailMServiceImpl.java index f56de183b..bedf1f78d 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/RMpWpPowerDetailMServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/RMpWpPowerDetailMServiceImpl.java @@ -55,7 +55,7 @@ public class RMpWpPowerDetailMServiceImpl extends ServiceImpl getWindFarmDetailInfo(PowerQualityParam.PowerQualityInfoParam param) { //获取部门id集合 List deptDTOS = deptFeignClient.getDirectSonSelf(param.getId()).getData(); - List deptIds = deptDTOS.stream().map(Dept::getCode).collect(Collectors.toList()); + List 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 getRailwayDetailInfo(PowerQualityParam param) { //获取部门id集合 List deptDTOS = deptFeignClient.getDirectSonSelf(param.getId()).getData(); - List deptIds = deptDTOS.stream().map(Dept::getCode).collect(Collectors.toList()); + List deptIds = deptDTOS.stream().filter(r-> !r.getId().equals(param.getId())).map(Dept::getCode).collect(Collectors.toList()); //根据部门信息，获取牵引站信息 PmsTractionStationParam stationParam = new PmsTractionStationParam(); diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/RStatOrgPvPowerQualityServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/RStatOrgPvPowerQualityServiceImpl.java index 9a45b3d4c..0b7178cdf 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/RStatOrgPvPowerQualityServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/RStatOrgPvPowerQualityServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.Console; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -66,9 +67,10 @@ public class RStatOrgPvPowerQualityServiceImpl extends ServiceImpl deptDTOMap = deptDTOS.stream().collect + //剔除本部门 + Map deptDTOMap = deptDTOS.stream().filter(r-> !r.getId().equals(param.getId())).collect (Collectors.toMap(Dept::getCode, Function.identity(), (key, key2) -> key2)); - List OrgNOS = deptDTOS.stream().map(Dept::getCode).collect(Collectors.toList()); + List OrgNOS = deptDTOS.stream().filter(r-> !r.getId().equals(param.getId())).map(Dept::getCode).collect(Collectors.toList()); //根据字典Code，取出字典id，拼入sql中 dictDataList.stream().forEach(dictData -> { if (DicDataEnum.EVENT_TYPE_L.getCode().equals(dictData.getCode())) { @@ -132,56 +134,338 @@ public class RStatOrgPvPowerQualityServiceImpl extends ServiceImpl getVoltage(OverviewParam param) { - List vos=new ArrayList<>(); - //获取部门信息 - List deptDTOS = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); + public List getVoltage(OverviewParam.OverviewVoltageParam param) { + List vos=new ArrayList<>(); + + //获取部门信息 + Dept dept = deptFeignClient.getDeptById(param.getId()).getData(); + + if(ObjectUtil.isNotNull(dept)){ + //获取监测对象 + List monitorType = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.MONITOR_OBJ.getCode()).getData(); + Map dictDataMap = monitorType.stream() + .collect(Collectors.toMap(DictData::getId, Function.identity())); + //初始化对象 + OverviewVO.IcoVO vo; + for (DictData dictData : monitorType) { + vo=new OverviewVO.IcoVO(); + vo.setNumOne(0); + vo.setNumTwo(0); + vos.add(vo); + } + - if(CollectionUtil.isNotEmpty(deptDTOS)){ //获取台区电能质量事件类型 List areaType = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.AREA_PQ_EVENT_TYPE.getCode()).getData(); - if(CollectionUtil.isNotEmpty(deptDTOS)){ - List typeID=new ArrayList<>(); - //取出电压相关的字典 - for (DictData dictData : areaType) { + Map areaMap = areaType.stream() + .collect(Collectors.toMap(DictData::getId, Function.identity())); + + List typeID=new ArrayList<>(); + //取出电压相关的字典 + for (DictData dictData : areaType) { + //1：高压 0是低压 + if (param.getType() == 1) { //电压 电压越上限15%以上 - if(DicDataEnum.EVENT_TYPE_T.getCode().equals(dictData.getCode())){ + if (DicDataEnum.EVENT_TYPE_T.getCode().equals(dictData.getCode())) { typeID.add(dictData.getId()); } //电压 电压越上限7%-15% - if(DicDataEnum.EVENT_TYPE_R.getCode().equals(dictData.getCode())){ + if (DicDataEnum.EVENT_TYPE_R.getCode().equals(dictData.getCode())) { typeID.add(dictData.getId()); } + } else { //电压 超标3%-10% - if(DicDataEnum.EVENT_TYPE_Z.getCode().equals(dictData.getCode())){ + if (DicDataEnum.EVENT_TYPE_Z.getCode().equals(dictData.getCode())) { typeID.add(dictData.getId()); } //电压 超标10%以下 - if(DicDataEnum.EVENT_TYPE_X.getCode().equals(dictData.getCode())){ + if (DicDataEnum.EVENT_TYPE_X.getCode().equals(dictData.getCode())) { + typeID.add(dictData.getId()); + } + } + } + //数据库查询 + List voltageVOS = rStatOrgPvPowerQualityMMapper.selectVoltage(Arrays.asList(dept.getCode()), typeID,param); + + Map> voltageMap = voltageVOS.stream().collect( + Collectors.groupingBy(OverviewVO.VoltageVO::getMonitoringObject)); + + if(CollectionUtil.isNotEmpty(voltageMap)){ + //初始化对象 + voltageMap.forEach((key,value)-> { + OverviewVO.IcoVO typeVO = new OverviewVO.IcoVO(); + typeVO.setNumOne(0); + typeVO.setNumTwo(0); + + if (dictDataMap.containsKey(key)) { + DictData dictData = dictDataMap.get(key); + //一类监测点 + if(DicDataEnum.MAIN_CHANGE.getCode().equals(dictData.getCode())){ + getArea(areaMap, value, typeVO,param.getType()); + vos.set(0,typeVO); + } + //二类监测点 + if(DicDataEnum.PHOTOVOLT.getCode().equals(dictData.getCode())){ + getArea(areaMap, value, typeVO,param.getType()); + vos.set(1,typeVO); + } + //三类监测点 + if(DicDataEnum.FEEDER_TENKV.getCode().equals(dictData.getCode())){ + getArea(areaMap, value, typeVO,param.getType()); + vos.set(2,typeVO); + } + } + }); + + } + + } + return vos; + } + + /** + * 电压问题对象赋值 + * @param areaMap 台区事件字典 + * @param value 存在的台区事件 + * @param typeVO 对象赋值 + * @param type 区分高低压 + */ + private void getArea(Map areaMap, List value, OverviewVO.IcoVO typeVO, + Integer type) { + for (OverviewVO.VoltageVO voltageVO : value) { + if (areaMap.containsKey(voltageVO.getAreaPqEventType())) { + DictData areaData = areaMap.get(voltageVO.getAreaPqEventType()); + //1：高压 0是低压 + if(type==1){ + //电压 电压越上限7%-15% + if(DicDataEnum.EVENT_TYPE_R.getCode().equals(areaData.getCode())){ + typeVO.setNumOne(voltageVO.getTotalMonitorNum()); + } + //电压 电压越上限15%以上 + if(DicDataEnum.EVENT_TYPE_T.getCode().equals(areaData.getCode())){ + typeVO.setNumTwo(voltageVO.getTotalMonitorNum()); + + } + }else{ + //电压 超标-3%- -10% + if(DicDataEnum.EVENT_TYPE_Z.getCode().equals(areaData.getCode())){ + typeVO.setNumOne(voltageVO.getTotalMonitorNum()); + } + //电压 超标 -10% + if(DicDataEnum.EVENT_TYPE_X.getCode().equals(areaData.getCode())){ + typeVO.setNumTwo(voltageVO.getTotalMonitorNum()); + + } + } + + } + } + } + + @Override + public List getPowerFactor(OverviewParam param) { + List info=new ArrayList<>(); + + //获取部门信息 + Dept dept = deptFeignClient.getDeptById(param.getId()).getData(); + if(ObjectUtil.isNotNull(dept)){ + //获取监测对象 + List monitorType = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.MONITOR_OBJ.getCode()).getData(); + Map dictDataMap = monitorType.stream() + .collect(Collectors.toMap(DictData::getId, Function.identity())); + + //初始化对象 + OverviewVO.NumVO vo; + for (DictData dictData : monitorType) { + vo=new OverviewVO.NumVO(); + vo.setNumOne(0); + vo.setNumTwo(0); + vo.setNumThree(0); + info.add(vo); + } + + //获取台区电能质量事件类型 + List areaType = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.AREA_PQ_EVENT_TYPE.getCode()).getData(); + Map areaMap = areaType.stream() + .collect(Collectors.toMap(DictData::getId, Function.identity())); + + if(CollectionUtil.isNotEmpty(areaType)){ + List typeID=new ArrayList<>(); + //取出电压相关的字典 + for (DictData dictData : areaType) { + //功率因数 低功率因数0.8-0.9 + if(DicDataEnum.EVENT_TYPE_L.getCode().equals(dictData.getCode())){ + typeID.add(dictData.getId()); + } + //功率因数 低功率因数0.7-0.8 + if(DicDataEnum.EVENT_TYPE_P.getCode().equals(dictData.getCode())){ + typeID.add(dictData.getId()); + } + //功率因数 低功率因数0.7以下 + if(DicDataEnum.EVENT_TYPE_O.getCode().equals(dictData.getCode())){ typeID.add(dictData.getId()); } } //数据库查询 - List deptCodes = deptDTOS.stream().map(DeptDTO::getCode).collect(Collectors.toList()); - List voltageVOS = rStatOrgPvPowerQualityMMapper.selectVoltage(deptCodes, typeID); - if(CollectionUtil.isNotEmpty(voltageVOS)){ - Map> voltageMap = voltageVOS.stream().collect( - Collectors.groupingBy(OverviewVO.VoltageVO::getMonitoringObject)); + List factorVOS = rStatOrgPvPowerQualityMMapper.selectVoltage(Arrays.asList(dept.getCode()), typeID,param); + Map> voltageMap = factorVOS.stream().collect( + Collectors.groupingBy(OverviewVO.VoltageVO::getMonitoringObject)); + + if(CollectionUtil.isNotEmpty(voltageMap)){ + //初始化对象 + voltageMap.forEach((key,value)->{ + OverviewVO.NumVO numVO = new OverviewVO.NumVO(); + numVO.setNumOne(0); + numVO.setNumTwo(0); + numVO.setNumThree(0); + if (dictDataMap.containsKey(key)) { + DictData dictData = dictDataMap.get(key); + //一类监测点 + if(DicDataEnum.MAIN_CHANGE.getCode().equals(dictData.getCode())){ + getAreaFactor(areaMap, value, numVO); + info.set(0,numVO); + } + //二类监测点 + if(DicDataEnum.PHOTOVOLT.getCode().equals(dictData.getCode())){ + getAreaFactor(areaMap, value, numVO); + info.set(1,numVO); + } + //三类监测点 + if(DicDataEnum.FEEDER_TENKV.getCode().equals(dictData.getCode())){ + getAreaFactor(areaMap, value, numVO); + info.set(2,numVO); + } + } + }); + } + } + } + return info; + } + + /** + * 功率因数 + * @param areaMap + * @param value + * @param numVO + */ + private void getAreaFactor(Map areaMap, List value, OverviewVO.NumVO numVO) { + for (OverviewVO.VoltageVO voltageVO : value) { + if (areaMap.containsKey(voltageVO.getAreaPqEventType())) { + DictData areaData = areaMap.get(voltageVO.getAreaPqEventType()); + //功率因数 低功率因数0.8-0.9 + if(DicDataEnum.EVENT_TYPE_L.getCode().equals(areaData.getCode())){ + numVO.setNumOne(voltageVO.getTotalMonitorNum()); + } + //功率因数 低功率因数0.7-0.8 + if(DicDataEnum.EVENT_TYPE_P.getCode().equals(areaData.getCode())){ + numVO.setNumTwo(voltageVO.getTotalMonitorNum()); + } + //功率因数 低功率因数0.7以下 + if(DicDataEnum.EVENT_TYPE_O.getCode().equals(areaData.getCode())){ + numVO.setNumThree(voltageVO.getTotalMonitorNum()); + } + } + } + } + + @Override + public List getBackTheTide(OverviewParam param) { + List vos=new ArrayList<>(); + //获取部门信息 + Dept dept = deptFeignClient.getDeptById(param.getId()).getData(); + if(ObjectUtil.isNotNull(dept)) { + //获取监测对象 + List monitorType = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.MONITOR_OBJ.getCode()).getData(); + Map dictDataMap = monitorType.stream() + .collect(Collectors.toMap(DictData::getId, Function.identity())); + + //初始化对象 + OverviewVO.IcoVO vo; + for (DictData dictData : monitorType) { + vo = new OverviewVO.IcoVO(); + vo.setNumOne(0); + vo.setNumTwo(0); + vos.add(vo); + } + //获取台区电能质量事件类型 + List areaType = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.AREA_PQ_EVENT_TYPE.getCode()).getData(); + Map areaMap = areaType.stream() + .collect(Collectors.toMap(DictData::getId, Function.identity())); + + if (CollectionUtil.isNotEmpty(areaType)) { + List typeID = new ArrayList<>(); + //取出电压相关的字典 + for (DictData dictData : areaType) { + //潮流倒送 + if (DicDataEnum.EVENT_TYPE_U.getCode().equals(dictData.getCode())) { + typeID.add(dictData.getId()); + } + //重过载 + if (DicDataEnum.EVENT_TYPE_C.getCode().equals(dictData.getCode())) { + typeID.add(dictData.getId()); + } + + } + //数据库查询 + List voltageVOS = rStatOrgPvPowerQualityMMapper.selectVoltage(Arrays.asList(dept.getCode()), typeID, param); + Map> voltageMap = voltageVOS.stream().collect( + Collectors.groupingBy(OverviewVO.VoltageVO::getMonitoringObject)); + + if (CollectionUtil.isNotEmpty(voltageMap)) { + //初始化对象 + voltageMap.forEach((key, value) -> { + OverviewVO.IcoVO typeVO = new OverviewVO.IcoVO(); + typeVO.setNumOne(0); + typeVO.setNumTwo(0); + if (dictDataMap.containsKey(key)) { + DictData dictData = dictDataMap.get(key); + //一类监测点 + if (DicDataEnum.MAIN_CHANGE.getCode().equals(dictData.getCode())) { + getAreaBackTheTide(areaMap, value, typeVO); + vos.set(0, typeVO); + } + //二类监测点 + if (DicDataEnum.PHOTOVOLT.getCode().equals(dictData.getCode())) { + getAreaBackTheTide(areaMap, value, typeVO); + vos.set(1, typeVO); + } + //三类监测点 + if (DicDataEnum.FEEDER_TENKV.getCode().equals(dictData.getCode())) { + getAreaBackTheTide(areaMap, value, typeVO); + vos.set(2, typeVO); + } + } + }); + } + } + } + return vos; + } + + /** + * 潮流倒送对象赋值 + * @param areaMap + * @param value + * @param typeVO + */ + private void getAreaBackTheTide(Map areaMap, List value, OverviewVO.IcoVO typeVO) { + for (OverviewVO.VoltageVO voltageVO : value) { + if (areaMap.containsKey(voltageVO.getAreaPqEventType())) { + DictData areaData = areaMap.get(voltageVO.getAreaPqEventType()); + //潮流倒送 + if (DicDataEnum.EVENT_TYPE_U.getCode().equals(areaData.getCode())) { + typeVO.setNumOne(voltageVO.getTotalMonitorNum()); + } + //重过载 + if (DicDataEnum.EVENT_TYPE_C.getCode().equals(areaData.getCode())) { + typeVO.setNumTwo(voltageVO.getTotalMonitorNum()); } } - } - - - - - - - - return null; } } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/WindFarmIndexOverviewServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/WindFarmIndexOverviewServiceImpl.java index 185abe0c1..b3dd8caae 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/WindFarmIndexOverviewServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/WindFarmIndexOverviewServiceImpl.java @@ -98,7 +98,7 @@ public class WindFarmIndexOverviewServiceImpl implements WindFarmIndexOverview { return Collections.emptyList(); } // 获取单位code - List deptCode = data.stream().map(Dept::getCode).collect(Collectors.toList()); + List deptCode = data.stream().filter(r-> !r.getId().equals(param.getId())).map(Dept::getCode).collect(Collectors.toList()); if (CollUtil.isEmpty(deptCode)) { return Collections.emptyList(); } @@ -108,7 +108,7 @@ public class WindFarmIndexOverviewServiceImpl implements WindFarmIndexOverview { return Collections.emptyList(); } // 将单位信息转换成map集合 - Map dataMap = data.stream().collect(Collectors.toMap(Dept::getCode, Dept::getName)); + Map dataMap = data.stream().filter(r-> !r.getId().equals(param.getId())).collect(Collectors.toMap(Dept::getCode, Dept::getName)); return pos.stream().map(po -> { RStatOrgWfIndexOverviewVO vo = new RStatOrgWfIndexOverviewVO(); vo.setMonitorNum(po.getMonitorNum());