From 145c3607701d39ac89ff562f541a13ea9eec8de1 Mon Sep 17 00:00:00 2001 From: haungxing <1203316822@qq.com> Date: Tue, 20 Aug 2024 08:55:09 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E9=A6=96=E9=A1=B5=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=8C=85=E5=90=8D=E9=87=8D=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../constant/HydroelectricConstant.java | 18 ------ .../vo/HydroelectricAreaStationVo.java | 48 --------------- .../Hydroelectric/vo/HydroelectricAreaVo.java | 70 --------------------- .../vo/HydroelectricDeviceGenerateVo.java | 26 -------- .../vo/HydroelectricDevicePowerVo.java | 22 ------- .../Hydroelectric/vo/HydroelectricDeviceVo.java | 72 ---------------------- .../vo/HydroelectricGenerateMonVo.java | 28 --------- .../vo/HydroelectricGenerateYearVo.java | 21 ------- .../Hydroelectric/vo/HydroelectricGroupAreaVo.java | 45 -------------- .../Hydroelectric/vo/HydroelectricGroupVo.java | 70 --------------------- .../Hydroelectric/vo/HydroelectricPowerRainVo.java | 22 ------- .../Hydroelectric/vo/HydroelectricStationVo.java | 68 -------------------- .../constant/HydroelectricConstant.java | 18 ++++++ .../vo/HydroelectricAreaStationVo.java | 48 +++++++++++++++ .../hydroelectric/vo/HydroelectricAreaVo.java | 70 +++++++++++++++++++++ .../vo/HydroelectricDeviceGenerateVo.java | 26 ++++++++ .../vo/HydroelectricDevicePowerVo.java | 22 +++++++ .../hydroelectric/vo/HydroelectricDeviceVo.java | 2 +- .../vo/HydroelectricGenerateMonVo.java | 28 +++++++++ .../vo/HydroelectricGenerateYearVo.java | 21 +++++++ .../hydroelectric/vo/HydroelectricGroupAreaVo.java | 45 ++++++++++++++ .../hydroelectric/vo/HydroelectricGroupVo.java | 70 +++++++++++++++++++++ .../hydroelectric/vo/HydroelectricPowerRainVo.java | 2 +- .../hydroelectric/vo/HydroelectricStationVo.java | 68 ++++++++++++++++++++ 24 files changed, 418 insertions(+), 512 deletions(-) delete mode 100644 hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/Hydroelectric/constant/HydroelectricConstant.java delete mode 100644 hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/Hydroelectric/vo/HydroelectricAreaStationVo.java delete mode 100644 hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/Hydroelectric/vo/HydroelectricAreaVo.java delete mode 100644 hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/Hydroelectric/vo/HydroelectricDeviceGenerateVo.java delete mode 100644 hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/Hydroelectric/vo/HydroelectricDevicePowerVo.java delete mode 100644 hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/Hydroelectric/vo/HydroelectricDeviceVo.java delete mode 100644 hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/Hydroelectric/vo/HydroelectricGenerateMonVo.java delete mode 100644 hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/Hydroelectric/vo/HydroelectricGenerateYearVo.java delete mode 100644 hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/Hydroelectric/vo/HydroelectricGroupAreaVo.java delete mode 100644 hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/Hydroelectric/vo/HydroelectricGroupVo.java delete mode 100644 hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/Hydroelectric/vo/HydroelectricPowerRainVo.java delete mode 100644 hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/Hydroelectric/vo/HydroelectricStationVo.java create mode 100644 hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/hydroelectric/constant/HydroelectricConstant.java create mode 100644 hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/hydroelectric/vo/HydroelectricAreaStationVo.java create mode 100644 hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/hydroelectric/vo/HydroelectricAreaVo.java create mode 100644 hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/hydroelectric/vo/HydroelectricDeviceGenerateVo.java create mode 100644 hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/hydroelectric/vo/HydroelectricDevicePowerVo.java create mode 100644 hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/hydroelectric/vo/HydroelectricGenerateMonVo.java create mode 100644 hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/hydroelectric/vo/HydroelectricGenerateYearVo.java create mode 100644 hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/hydroelectric/vo/HydroelectricGroupAreaVo.java create mode 100644 hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/hydroelectric/vo/HydroelectricGroupVo.java create mode 100644 hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/hydroelectric/vo/HydroelectricStationVo.java diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/Hydroelectric/constant/HydroelectricConstant.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/Hydroelectric/constant/HydroelectricConstant.java deleted file mode 100644 index bd008e2..0000000 --- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/Hydroelectric/constant/HydroelectricConstant.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.hnac.hzims.operational.homePage.hydroelectric.constant; - -/** - * 水电站首页-常量 - * @author ysj - */ -public interface HydroelectricConstant { - - /** - * 水电站 - */ - Integer HYDROPOWER = 0; - - /** - * 代运维 - */ - Integer PROXY_OPEARIONAL = 2; -} \ No newline at end of file diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/Hydroelectric/vo/HydroelectricAreaStationVo.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/Hydroelectric/vo/HydroelectricAreaStationVo.java deleted file mode 100644 index 98cdb14..0000000 --- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/Hydroelectric/vo/HydroelectricAreaStationVo.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.hnac.hzims.operational.homePage.hydroelectric.vo; - -import com.hnac.hzims.hzimsweather.response.weather.Daily; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - * 集团/区域占比 - * @author ysj - */ -@Data -public class HydroelectricAreaStationVo { - - @ApiModelProperty(value = "站点机构") - private Long deptId; - - @ApiModelProperty(value = "机构ID") - private String stationCode; - - @ApiModelProperty(value = "机构名称") - private String stationName; - - @ApiModelProperty(value = "站点实时温度") - private String temp; - - @ApiModelProperty(value = "七日内天气") - private List weather; - - @ApiModelProperty(value = "年发电量") - private Double generateYear; - - @ApiModelProperty(value = "发电完成率") - private Double generateRate; - - @ApiModelProperty(value = "电站利用率") - private Double deviceUse; - - @ApiModelProperty(value = "容量利用率") - private Double capacityUse; - - @ApiModelProperty(value = "区域/集团发电占比") - private Double areaMakeUp; - - @ApiModelProperty(value = "排序") - private Integer sort; -} diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/Hydroelectric/vo/HydroelectricAreaVo.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/Hydroelectric/vo/HydroelectricAreaVo.java deleted file mode 100644 index 14b6f1b..0000000 --- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/Hydroelectric/vo/HydroelectricAreaVo.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.hnac.hzims.operational.homePage.hydroelectric.vo; - -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.NullSerializer; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - * @author ysj - */ -@Data -@ApiModel(value = "水电站首页-区域") -public class HydroelectricAreaVo { - - @ApiModelProperty(value = "机构Id") - @JsonSerialize(nullsUsing = NullSerializer.class) - private Long deptId; - - @ApiModelProperty(value = "机构名称") - private String deptName; - - @ApiModelProperty(value = "站点数量") - @JsonSerialize(nullsUsing = NullSerializer.class) - private Integer count; - - @ApiModelProperty(value = "总装机容量") - @JsonSerialize(nullsUsing = NullSerializer.class) - private Double capacity; - - @ApiModelProperty(value = "电站总负荷") - @JsonSerialize(nullsUsing = NullSerializer.class) - private Double load; - - @ApiModelProperty(value = "容量利用率") - @JsonSerialize(nullsUsing = NullSerializer.class) - private Double capacityRate; - - @ApiModelProperty(value = "年发电量") - @JsonSerialize(nullsUsing = NullSerializer.class) - private Double generateYear; - - @ApiModelProperty(value = "月发电量") - @JsonSerialize(nullsUsing = NullSerializer.class) - private Double generateMon; - - @ApiModelProperty(value = "日发电量") - @JsonSerialize(nullsUsing = NullSerializer.class) - private Double generateDay; - - @ApiModelProperty(value = "今年计划发电量") - @JsonSerialize(nullsUsing = NullSerializer.class) - private Double generatePlanYear; - - @ApiModelProperty(value = "电量完成吕") - @JsonSerialize(nullsUsing = NullSerializer.class) - private Double generateRate; - - @ApiModelProperty(value = "近3年发电对比") - private List recentYears; - - @ApiModelProperty(value = "计划完成完成趋势") - private List completes; - - @ApiModelProperty(value = "电站 ：利用情况 && 天气 && 排名") - private List stations; - -} diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/Hydroelectric/vo/HydroelectricDeviceGenerateVo.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/Hydroelectric/vo/HydroelectricDeviceGenerateVo.java deleted file mode 100644 index 97f5971..0000000 --- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/Hydroelectric/vo/HydroelectricDeviceGenerateVo.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.hnac.hzims.operational.homePage.hydroelectric.vo; - -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.NullSerializer; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author ysj - */ -@Data -@ApiModel(value = "站点首页-设备近30天发电量") -public class HydroelectricDeviceGenerateVo { - - @ApiModelProperty(value = "日期") - private String date; - - @ApiModelProperty(value = "发电量") - @JsonSerialize(nullsUsing = NullSerializer.class) - private Float generate; - - @ApiModelProperty(value = "功率") - @JsonSerialize(nullsUsing = NullSerializer.class) - private Float load; -} \ No newline at end of file diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/Hydroelectric/vo/HydroelectricDevicePowerVo.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/Hydroelectric/vo/HydroelectricDevicePowerVo.java deleted file mode 100644 index 462e92f..0000000 --- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/Hydroelectric/vo/HydroelectricDevicePowerVo.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.hnac.hzims.operational.homePage.hydroelectric.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author ysj - */ -@Data -@ApiModel(value = "站点首页-设备近24小时功率曲线") -public class HydroelectricDevicePowerVo { - - @ApiModelProperty(value = "字符串时间") - private String strHour; - - @ApiModelProperty(value = "小时") - private Integer hour; - - @ApiModelProperty(value = "有功功率") - private String activePower; -} \ No newline at end of file diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/Hydroelectric/vo/HydroelectricDeviceVo.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/Hydroelectric/vo/HydroelectricDeviceVo.java deleted file mode 100644 index f3ce2b7..0000000 --- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/Hydroelectric/vo/HydroelectricDeviceVo.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.hnac.hzims.operational.homePage.Hydroelectric.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - * @author ysj - */ -@Data -@ApiModel(value = "站点首页-设备信息") -public class HydroelectricDeviceVo { - - @ApiModelProperty(value = "设备编号") - private String deivceCode; - - @ApiModelProperty(value = "设备名称") - private String deivceName; - - @ApiModelProperty(value = "开关机状态: 0 - 关机 1 - 开机") - private Boolean state; - - @ApiModelProperty(value = "总装机容量") - private Double installedCapacity; - - @ApiModelProperty(value = "有功功率") - private Double activePower; - - @ApiModelProperty(value = "容量利用率") - private Double capacityRate; - - @ApiModelProperty(value = "无功功率") - private Double reactivePower; - - @ApiModelProperty(value = "导叶开度") - private Double guideOpen; - - @ApiModelProperty(value = "今日发电量") - private Float powerDay; - - @ApiModelProperty(value = "昨日发电量") - private Float powerYesterDay; - - @ApiModelProperty(value = "当年发电量") - private Float powerYear; - - @ApiModelProperty(value = "去年发电量") - private Float powerYesterYear; - - @ApiModelProperty(value = "当月发电量") - private Float powerMon; - - @ApiModelProperty(value = "本次开机时间") - private String startDownTime; - - @ApiModelProperty(value = "本次开机时长") - private Double startupDownDuration; - - @ApiModelProperty(value = "年停机时长") - private Double shutDownDurationYear; - - @ApiModelProperty(value = "年开机时长") - private Double startupDurationYear; - - @ApiModelProperty(value = "设备近24小时有功功率") - private List powers; - - @ApiModelProperty(value = "设备近30日发电量") - private List generates; -} \ No newline at end of file diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/Hydroelectric/vo/HydroelectricGenerateMonVo.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/Hydroelectric/vo/HydroelectricGenerateMonVo.java deleted file mode 100644 index daeba5e..0000000 --- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/Hydroelectric/vo/HydroelectricGenerateMonVo.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.hnac.hzims.operational.homePage.hydroelectric.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author ysj - */ -@Data -@ApiModel(value = "月发电对象") -public class HydroelectricGenerateMonVo { - - @ApiModelProperty(value = "年份") - private Integer year; - - @ApiModelProperty(value = "月份") - private Integer month; - - @ApiModelProperty(value = "字符串格式月份") - private String strMonth; - - @ApiModelProperty(value = "月发电量") - private Double generate; - - @ApiModelProperty(value = "计划发电量") - private Double planGenerate; -} diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/Hydroelectric/vo/HydroelectricGenerateYearVo.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/Hydroelectric/vo/HydroelectricGenerateYearVo.java deleted file mode 100644 index 319e88d..0000000 --- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/Hydroelectric/vo/HydroelectricGenerateYearVo.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.hnac.hzims.operational.homePage.hydroelectric.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - * @author ysj - */ -@Data -@ApiModel(value = "年发电对象") -public class HydroelectricGenerateYearVo { - - @ApiModelProperty(value = "年份") - private Integer year; - - @ApiModelProperty(value = "月发电量集合:由1-12月组合") - private List generateMons; -} diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/Hydroelectric/vo/HydroelectricGroupAreaVo.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/Hydroelectric/vo/HydroelectricGroupAreaVo.java deleted file mode 100644 index e834cd1..0000000 --- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/Hydroelectric/vo/HydroelectricGroupAreaVo.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.hnac.hzims.operational.homePage.hydroelectric.vo; - -import com.hnac.hzims.hzimsweather.response.weather.Daily; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - * 集团/区域占比 - * @author ysj - */ -@Data -public class HydroelectricGroupAreaVo { - - @ApiModelProperty(value = "站点机构") - private Long deptId; - - @ApiModelProperty(value = "机构名称") - private String deptName; - - @ApiModelProperty(value = "站点实时温度") - private String temp; - - @ApiModelProperty(value = "七日内天气") - private List weather; - - @ApiModelProperty(value = "年发电量") - private Double generateYear; - - @ApiModelProperty(value = "发电完成率") - private Double generateRate; - - @ApiModelProperty(value = "电站利用率") - private Double deviceUse; - - @ApiModelProperty(value = "容量利用率") - private Double capacityUse; - - @ApiModelProperty(value = "区域/集团发电占比") - private Double areaMakeUp; - - @ApiModelProperty(value = "排序") - private Integer sort; -} diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/Hydroelectric/vo/HydroelectricGroupVo.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/Hydroelectric/vo/HydroelectricGroupVo.java deleted file mode 100644 index 66e31e5..0000000 --- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/Hydroelectric/vo/HydroelectricGroupVo.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.hnac.hzims.operational.homePage.hydroelectric.vo; - -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.NullSerializer; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - * @author ysj - */ -@Data -@ApiModel(value = "水电站首页-站点") -public class HydroelectricGroupVo { - - @ApiModelProperty(value = "机构Id") - @JsonSerialize(nullsUsing = NullSerializer.class) - private Long deptId; - - @ApiModelProperty(value = "机构名称") - private String deptName; - - @ApiModelProperty(value = "站点数量") - @JsonSerialize(nullsUsing = NullSerializer.class) - private Integer count; - - @ApiModelProperty(value = "总装机容量") - @JsonSerialize(nullsUsing = NullSerializer.class) - private Double capacity; - - @ApiModelProperty(value = "电站总负荷") - @JsonSerialize(nullsUsing = NullSerializer.class) - private Double load; - - @ApiModelProperty(value = "容量利用率") - @JsonSerialize(nullsUsing = NullSerializer.class) - private Double capacityRate; - - @ApiModelProperty(value = "年发电量") - @JsonSerialize(nullsUsing = NullSerializer.class) - private Double generateYear; - - @ApiModelProperty(value = "月发电量") - @JsonSerialize(nullsUsing = NullSerializer.class) - private Double generateMon; - - @ApiModelProperty(value = "日发电量") - @JsonSerialize(nullsUsing = NullSerializer.class) - private Double generateDay; - - @ApiModelProperty(value = "今年计划发电量") - @JsonSerialize(nullsUsing = NullSerializer.class) - private Double generatePlanYear; - - @ApiModelProperty(value = "电量完成吕") - @JsonSerialize(nullsUsing = NullSerializer.class) - private Double generateRate; - - @ApiModelProperty(value = "近3年发电对比") - private List recentYears; - - @ApiModelProperty(value = "计划完成完成趋势") - private List completes; - - @ApiModelProperty(value = "电站 ：利用情况 && 天气 && 排名") - private List areas; - -} \ No newline at end of file diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/Hydroelectric/vo/HydroelectricPowerRainVo.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/Hydroelectric/vo/HydroelectricPowerRainVo.java deleted file mode 100644 index a2aae0e..0000000 --- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/Hydroelectric/vo/HydroelectricPowerRainVo.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.hnac.hzims.operational.homePage.Hydroelectric.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author ysj - */ -@Data -@ApiModel(value = "站点首页-最近30日发电量/降雨量") -public class HydroelectricPowerRainVo { - - @ApiModelProperty(value = "日期") - private String date; - - @ApiModelProperty(value = "发电量") - private Double generate; - - @ApiModelProperty(value = "降雨") - private Double rain; -} diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/Hydroelectric/vo/HydroelectricStationVo.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/Hydroelectric/vo/HydroelectricStationVo.java deleted file mode 100644 index ad3b959..0000000 --- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/Hydroelectric/vo/HydroelectricStationVo.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.hnac.hzims.operational.homePage.hydroelectric.vo; - -import com.hnac.hzims.hzimsweather.response.weather.Daily; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - * @author ysj - */ -@Data -@ApiModel(value = "水电站首页-站点") -public class HydroelectricStationVo { - - - @ApiModelProperty(value = "站点编号") - private String stationCode; - - @ApiModelProperty(value = "站点名称") - private String stationName; - - @ApiModelProperty(value = "总装机容量") - private Double installedCapacity; - - @ApiModelProperty(value = "总发电负荷") - private Double powerSum; - - @ApiModelProperty(value = "容量利用率") - private Double capacityRate; - - @ApiModelProperty(value = "月计划发电量") - private Double powerMonPlan; - - @ApiModelProperty(value = "月发电量") - private Double powerMon; - - @ApiModelProperty(value = "月发电量完成率") - private Double powerRateMon; - - @ApiModelProperty(value = "年计划发电量") - private Double powerYearPlan; - - @ApiModelProperty(value = "年发电量") - private Double powerYear; - - @ApiModelProperty(value = "年发电完成率") - private Double powerRateYear; - - @ApiModelProperty(value = "今日发电量") - private Double powerDay; - - @ApiModelProperty(value = "昨日发电量") - private Double powerYesterDay; - - @ApiModelProperty(value = "七日内天气") - private List weather; - - @ApiModelProperty(value = "设备集合") - private List devices; - - @ApiModelProperty(value = "降雨/发电量曲线") - private List powerRains; - - @ApiModelProperty(value = "降雨/发电量曲线") - private List generateMons; -} diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/hydroelectric/constant/HydroelectricConstant.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/hydroelectric/constant/HydroelectricConstant.java new file mode 100644 index 0000000..bd008e2 --- /dev/null +++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/hydroelectric/constant/HydroelectricConstant.java @@ -0,0 +1,18 @@ +package com.hnac.hzims.operational.homePage.hydroelectric.constant; + +/** + * 水电站首页-常量 + * @author ysj + */ +public interface HydroelectricConstant { + + /** + * 水电站 + */ + Integer HYDROPOWER = 0; + + /** + * 代运维 + */ + Integer PROXY_OPEARIONAL = 2; +} \ No newline at end of file diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/hydroelectric/vo/HydroelectricAreaStationVo.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/hydroelectric/vo/HydroelectricAreaStationVo.java new file mode 100644 index 0000000..98cdb14 --- /dev/null +++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/hydroelectric/vo/HydroelectricAreaStationVo.java @@ -0,0 +1,48 @@ +package com.hnac.hzims.operational.homePage.hydroelectric.vo; + +import com.hnac.hzims.hzimsweather.response.weather.Daily; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * 集团/区域占比 + * @author ysj + */ +@Data +public class HydroelectricAreaStationVo { + + @ApiModelProperty(value = "站点机构") + private Long deptId; + + @ApiModelProperty(value = "机构ID") + private String stationCode; + + @ApiModelProperty(value = "机构名称") + private String stationName; + + @ApiModelProperty(value = "站点实时温度") + private String temp; + + @ApiModelProperty(value = "七日内天气") + private List weather; + + @ApiModelProperty(value = "年发电量") + private Double generateYear; + + @ApiModelProperty(value = "发电完成率") + private Double generateRate; + + @ApiModelProperty(value = "电站利用率") + private Double deviceUse; + + @ApiModelProperty(value = "容量利用率") + private Double capacityUse; + + @ApiModelProperty(value = "区域/集团发电占比") + private Double areaMakeUp; + + @ApiModelProperty(value = "排序") + private Integer sort; +} diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/hydroelectric/vo/HydroelectricAreaVo.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/hydroelectric/vo/HydroelectricAreaVo.java new file mode 100644 index 0000000..14b6f1b --- /dev/null +++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/hydroelectric/vo/HydroelectricAreaVo.java @@ -0,0 +1,70 @@ +package com.hnac.hzims.operational.homePage.hydroelectric.vo; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.NullSerializer; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @author ysj + */ +@Data +@ApiModel(value = "水电站首页-区域") +public class HydroelectricAreaVo { + + @ApiModelProperty(value = "机构Id") + @JsonSerialize(nullsUsing = NullSerializer.class) + private Long deptId; + + @ApiModelProperty(value = "机构名称") + private String deptName; + + @ApiModelProperty(value = "站点数量") + @JsonSerialize(nullsUsing = NullSerializer.class) + private Integer count; + + @ApiModelProperty(value = "总装机容量") + @JsonSerialize(nullsUsing = NullSerializer.class) + private Double capacity; + + @ApiModelProperty(value = "电站总负荷") + @JsonSerialize(nullsUsing = NullSerializer.class) + private Double load; + + @ApiModelProperty(value = "容量利用率") + @JsonSerialize(nullsUsing = NullSerializer.class) + private Double capacityRate; + + @ApiModelProperty(value = "年发电量") + @JsonSerialize(nullsUsing = NullSerializer.class) + private Double generateYear; + + @ApiModelProperty(value = "月发电量") + @JsonSerialize(nullsUsing = NullSerializer.class) + private Double generateMon; + + @ApiModelProperty(value = "日发电量") + @JsonSerialize(nullsUsing = NullSerializer.class) + private Double generateDay; + + @ApiModelProperty(value = "今年计划发电量") + @JsonSerialize(nullsUsing = NullSerializer.class) + private Double generatePlanYear; + + @ApiModelProperty(value = "电量完成吕") + @JsonSerialize(nullsUsing = NullSerializer.class) + private Double generateRate; + + @ApiModelProperty(value = "近3年发电对比") + private List recentYears; + + @ApiModelProperty(value = "计划完成完成趋势") + private List completes; + + @ApiModelProperty(value = "电站 ：利用情况 && 天气 && 排名") + private List stations; + +} diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/hydroelectric/vo/HydroelectricDeviceGenerateVo.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/hydroelectric/vo/HydroelectricDeviceGenerateVo.java new file mode 100644 index 0000000..97f5971 --- /dev/null +++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/hydroelectric/vo/HydroelectricDeviceGenerateVo.java @@ -0,0 +1,26 @@ +package com.hnac.hzims.operational.homePage.hydroelectric.vo; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.NullSerializer; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author ysj + */ +@Data +@ApiModel(value = "站点首页-设备近30天发电量") +public class HydroelectricDeviceGenerateVo { + + @ApiModelProperty(value = "日期") + private String date; + + @ApiModelProperty(value = "发电量") + @JsonSerialize(nullsUsing = NullSerializer.class) + private Float generate; + + @ApiModelProperty(value = "功率") + @JsonSerialize(nullsUsing = NullSerializer.class) + private Float load; +} \ No newline at end of file diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/hydroelectric/vo/HydroelectricDevicePowerVo.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/hydroelectric/vo/HydroelectricDevicePowerVo.java new file mode 100644 index 0000000..462e92f --- /dev/null +++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/hydroelectric/vo/HydroelectricDevicePowerVo.java @@ -0,0 +1,22 @@ +package com.hnac.hzims.operational.homePage.hydroelectric.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author ysj + */ +@Data +@ApiModel(value = "站点首页-设备近24小时功率曲线") +public class HydroelectricDevicePowerVo { + + @ApiModelProperty(value = "字符串时间") + private String strHour; + + @ApiModelProperty(value = "小时") + private Integer hour; + + @ApiModelProperty(value = "有功功率") + private String activePower; +} \ No newline at end of file diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/hydroelectric/vo/HydroelectricDeviceVo.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/hydroelectric/vo/HydroelectricDeviceVo.java index 4eb7c5b..ec21858 100644 --- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/hydroelectric/vo/HydroelectricDeviceVo.java +++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/hydroelectric/vo/HydroelectricDeviceVo.java @@ -19,7 +19,7 @@ public class HydroelectricDeviceVo { @ApiModelProperty(value = "设备名称") private String deivceName; - @ApiModelProperty(value = "开关机状态 : 0 - 关机 1 - 开机") + @ApiModelProperty(value = "开关机状态: 0 - 关机 1 - 开机") private Boolean state; @ApiModelProperty(value = "总装机容量") diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/hydroelectric/vo/HydroelectricGenerateMonVo.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/hydroelectric/vo/HydroelectricGenerateMonVo.java new file mode 100644 index 0000000..daeba5e --- /dev/null +++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/hydroelectric/vo/HydroelectricGenerateMonVo.java @@ -0,0 +1,28 @@ +package com.hnac.hzims.operational.homePage.hydroelectric.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author ysj + */ +@Data +@ApiModel(value = "月发电对象") +public class HydroelectricGenerateMonVo { + + @ApiModelProperty(value = "年份") + private Integer year; + + @ApiModelProperty(value = "月份") + private Integer month; + + @ApiModelProperty(value = "字符串格式月份") + private String strMonth; + + @ApiModelProperty(value = "月发电量") + private Double generate; + + @ApiModelProperty(value = "计划发电量") + private Double planGenerate; +} diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/hydroelectric/vo/HydroelectricGenerateYearVo.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/hydroelectric/vo/HydroelectricGenerateYearVo.java new file mode 100644 index 0000000..319e88d --- /dev/null +++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/hydroelectric/vo/HydroelectricGenerateYearVo.java @@ -0,0 +1,21 @@ +package com.hnac.hzims.operational.homePage.hydroelectric.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @author ysj + */ +@Data +@ApiModel(value = "年发电对象") +public class HydroelectricGenerateYearVo { + + @ApiModelProperty(value = "年份") + private Integer year; + + @ApiModelProperty(value = "月发电量集合:由1-12月组合") + private List generateMons; +} diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/hydroelectric/vo/HydroelectricGroupAreaVo.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/hydroelectric/vo/HydroelectricGroupAreaVo.java new file mode 100644 index 0000000..e834cd1 --- /dev/null +++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/hydroelectric/vo/HydroelectricGroupAreaVo.java @@ -0,0 +1,45 @@ +package com.hnac.hzims.operational.homePage.hydroelectric.vo; + +import com.hnac.hzims.hzimsweather.response.weather.Daily; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * 集团/区域占比 + * @author ysj + */ +@Data +public class HydroelectricGroupAreaVo { + + @ApiModelProperty(value = "站点机构") + private Long deptId; + + @ApiModelProperty(value = "机构名称") + private String deptName; + + @ApiModelProperty(value = "站点实时温度") + private String temp; + + @ApiModelProperty(value = "七日内天气") + private List weather; + + @ApiModelProperty(value = "年发电量") + private Double generateYear; + + @ApiModelProperty(value = "发电完成率") + private Double generateRate; + + @ApiModelProperty(value = "电站利用率") + private Double deviceUse; + + @ApiModelProperty(value = "容量利用率") + private Double capacityUse; + + @ApiModelProperty(value = "区域/集团发电占比") + private Double areaMakeUp; + + @ApiModelProperty(value = "排序") + private Integer sort; +} diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/hydroelectric/vo/HydroelectricGroupVo.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/hydroelectric/vo/HydroelectricGroupVo.java new file mode 100644 index 0000000..66e31e5 --- /dev/null +++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/hydroelectric/vo/HydroelectricGroupVo.java @@ -0,0 +1,70 @@ +package com.hnac.hzims.operational.homePage.hydroelectric.vo; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.NullSerializer; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @author ysj + */ +@Data +@ApiModel(value = "水电站首页-站点") +public class HydroelectricGroupVo { + + @ApiModelProperty(value = "机构Id") + @JsonSerialize(nullsUsing = NullSerializer.class) + private Long deptId; + + @ApiModelProperty(value = "机构名称") + private String deptName; + + @ApiModelProperty(value = "站点数量") + @JsonSerialize(nullsUsing = NullSerializer.class) + private Integer count; + + @ApiModelProperty(value = "总装机容量") + @JsonSerialize(nullsUsing = NullSerializer.class) + private Double capacity; + + @ApiModelProperty(value = "电站总负荷") + @JsonSerialize(nullsUsing = NullSerializer.class) + private Double load; + + @ApiModelProperty(value = "容量利用率") + @JsonSerialize(nullsUsing = NullSerializer.class) + private Double capacityRate; + + @ApiModelProperty(value = "年发电量") + @JsonSerialize(nullsUsing = NullSerializer.class) + private Double generateYear; + + @ApiModelProperty(value = "月发电量") + @JsonSerialize(nullsUsing = NullSerializer.class) + private Double generateMon; + + @ApiModelProperty(value = "日发电量") + @JsonSerialize(nullsUsing = NullSerializer.class) + private Double generateDay; + + @ApiModelProperty(value = "今年计划发电量") + @JsonSerialize(nullsUsing = NullSerializer.class) + private Double generatePlanYear; + + @ApiModelProperty(value = "电量完成吕") + @JsonSerialize(nullsUsing = NullSerializer.class) + private Double generateRate; + + @ApiModelProperty(value = "近3年发电对比") + private List recentYears; + + @ApiModelProperty(value = "计划完成完成趋势") + private List completes; + + @ApiModelProperty(value = "电站 ：利用情况 && 天气 && 排名") + private List areas; + +} \ No newline at end of file diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/hydroelectric/vo/HydroelectricPowerRainVo.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/hydroelectric/vo/HydroelectricPowerRainVo.java index 22df4ec..2fcb5e3 100644 --- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/hydroelectric/vo/HydroelectricPowerRainVo.java +++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/hydroelectric/vo/HydroelectricPowerRainVo.java @@ -8,7 +8,7 @@ import lombok.Data; * @author ysj */ @Data -@ApiModel(value = "站点首页 - 最近30日发电量/降雨量") +@ApiModel(value = "站点首页-最近30日发电量/降雨量") public class HydroelectricPowerRainVo { @ApiModelProperty(value = "日期") diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/hydroelectric/vo/HydroelectricStationVo.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/hydroelectric/vo/HydroelectricStationVo.java new file mode 100644 index 0000000..ad3b959 --- /dev/null +++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/hydroelectric/vo/HydroelectricStationVo.java @@ -0,0 +1,68 @@ +package com.hnac.hzims.operational.homePage.hydroelectric.vo; + +import com.hnac.hzims.hzimsweather.response.weather.Daily; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @author ysj + */ +@Data +@ApiModel(value = "水电站首页-站点") +public class HydroelectricStationVo { + + + @ApiModelProperty(value = "站点编号") + private String stationCode; + + @ApiModelProperty(value = "站点名称") + private String stationName; + + @ApiModelProperty(value = "总装机容量") + private Double installedCapacity; + + @ApiModelProperty(value = "总发电负荷") + private Double powerSum; + + @ApiModelProperty(value = "容量利用率") + private Double capacityRate; + + @ApiModelProperty(value = "月计划发电量") + private Double powerMonPlan; + + @ApiModelProperty(value = "月发电量") + private Double powerMon; + + @ApiModelProperty(value = "月发电量完成率") + private Double powerRateMon; + + @ApiModelProperty(value = "年计划发电量") + private Double powerYearPlan; + + @ApiModelProperty(value = "年发电量") + private Double powerYear; + + @ApiModelProperty(value = "年发电完成率") + private Double powerRateYear; + + @ApiModelProperty(value = "今日发电量") + private Double powerDay; + + @ApiModelProperty(value = "昨日发电量") + private Double powerYesterDay; + + @ApiModelProperty(value = "七日内天气") + private List weather; + + @ApiModelProperty(value = "设备集合") + private List devices; + + @ApiModelProperty(value = "降雨/发电量曲线") + private List powerRains; + + @ApiModelProperty(value = "降雨/发电量曲线") + private List generateMons; +}