From e4a33e04bcb551f14dbf387336ac40eb1e1e21d4 Mon Sep 17 00:00:00 2001 From: yang_shj Date: Wed, 15 Mar 2023 16:24:23 +0800 Subject: [PATCH] =?UTF-8?q?#=E6=95=B0=E6=8D=AE=E5=A1=AB=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/hnac/hzims/operational/census/vo/CompleteDefectVo.java | 3 +++ .../com/hnac/hzims/operational/census/vo/CompleteGenerationVo.java | 5 +++++ .../java/com/hnac/hzims/operational/census/vo/CompleteOtherVo.java | 4 ++++ .../com/hnac/hzims/operational/census/vo/ElectricGenerationVo.java | 3 +++ .../java/com/hnac/hzims/operational/census/vo/ExamineCardVo.java | 4 ++++ .../com/hnac/hzims/operational/census/vo/HydropowerTargetVo.java | 4 ++++ .../com/hnac/hzims/operational/census/vo/InstalledCapacityVo.java | 3 +++ .../java/com/hnac/hzims/operational/census/vo/WaterTargetVo.java | 5 +++++ .../hzims/operational/census/service/impl/TargetServiceImpl.java | 5 +++-- 9 files changed, 34 insertions(+), 2 deletions(-) diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/census/vo/CompleteDefectVo.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/census/vo/CompleteDefectVo.java index 68edd69..02b9f8f 100644 --- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/census/vo/CompleteDefectVo.java +++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/census/vo/CompleteDefectVo.java @@ -1,5 +1,7 @@ package com.hnac.hzims.operational.census.vo; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.NullSerializer; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -21,5 +23,6 @@ public class CompleteDefectVo { private Integer completeCount; @ApiModelProperty("消缺率") + @JsonSerialize(nullsUsing = NullSerializer.class) private Double completeRate; } diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/census/vo/CompleteGenerationVo.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/census/vo/CompleteGenerationVo.java index 4136ab5..bef599a 100644 --- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/census/vo/CompleteGenerationVo.java +++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/census/vo/CompleteGenerationVo.java @@ -1,5 +1,7 @@ package com.hnac.hzims.operational.census.vo; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.NullSerializer; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -15,11 +17,14 @@ public class CompleteGenerationVo { private String stationName; @ApiModelProperty("计划发电量") + @JsonSerialize(nullsUsing = NullSerializer.class) private Double planGeneration; @ApiModelProperty("实际发电量") + @JsonSerialize(nullsUsing = NullSerializer.class) private Double realityGeneration; @ApiModelProperty("完成率") + @JsonSerialize(nullsUsing = NullSerializer.class) private Double completeRate; } diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/census/vo/CompleteOtherVo.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/census/vo/CompleteOtherVo.java index a063268..2de17f7 100644 --- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/census/vo/CompleteOtherVo.java +++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/census/vo/CompleteOtherVo.java @@ -1,5 +1,7 @@ package com.hnac.hzims.operational.census.vo; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.NullSerializer; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -15,8 +17,10 @@ public class CompleteOtherVo { private String stationName; @ApiModelProperty("设备在线率") + @JsonSerialize(nullsUsing = NullSerializer.class) private Double onlineRate; @ApiModelProperty("Fa投入条数") + @JsonSerialize(nullsUsing = NullSerializer.class) private Double faCount; } diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/census/vo/ElectricGenerationVo.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/census/vo/ElectricGenerationVo.java index 0381de7..ba6c97f 100644 --- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/census/vo/ElectricGenerationVo.java +++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/census/vo/ElectricGenerationVo.java @@ -1,5 +1,7 @@ package com.hnac.hzims.operational.census.vo; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.NullSerializer; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -15,6 +17,7 @@ public class ElectricGenerationVo { private String stationName; @ApiModelProperty("发容量") + @JsonSerialize(nullsUsing = NullSerializer.class) private Double electricGeneration; @ApiModelProperty("详情") diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/census/vo/ExamineCardVo.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/census/vo/ExamineCardVo.java index e88a627..192290b 100644 --- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/census/vo/ExamineCardVo.java +++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/census/vo/ExamineCardVo.java @@ -1,5 +1,7 @@ package com.hnac.hzims.operational.census.vo; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.NullSerializer; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -17,8 +19,10 @@ public class ExamineCardVo { private String stationName; @ApiModelProperty("检修卡数量") + @JsonSerialize(nullsUsing = NullSerializer.class) private Integer cardCount; @ApiModelProperty("检修卡总额") + @JsonSerialize(nullsUsing = NullSerializer.class) private Double cardTotal; } diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/census/vo/HydropowerTargetVo.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/census/vo/HydropowerTargetVo.java index 4d322a5..03b0119 100644 --- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/census/vo/HydropowerTargetVo.java +++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/census/vo/HydropowerTargetVo.java @@ -1,5 +1,7 @@ package com.hnac.hzims.operational.census.vo; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.NullSerializer; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -15,8 +17,10 @@ public class HydropowerTargetVo { private String stationName; @ApiModelProperty("发电量") + @JsonSerialize(nullsUsing = NullSerializer.class) private Double electric; @ApiModelProperty("功率") + @JsonSerialize(nullsUsing = NullSerializer.class) private Double power; } diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/census/vo/InstalledCapacityVo.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/census/vo/InstalledCapacityVo.java index 835ce30..71db3ec 100644 --- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/census/vo/InstalledCapacityVo.java +++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/census/vo/InstalledCapacityVo.java @@ -1,5 +1,7 @@ package com.hnac.hzims.operational.census.vo; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.NullSerializer; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -15,6 +17,7 @@ public class InstalledCapacityVo { private String stationName; @ApiModelProperty("装机容量") + @JsonSerialize(nullsUsing = NullSerializer.class) private Double installedCapacity; @ApiModelProperty("详情") diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/census/vo/WaterTargetVo.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/census/vo/WaterTargetVo.java index 86ee588..2eba78e 100644 --- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/census/vo/WaterTargetVo.java +++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/census/vo/WaterTargetVo.java @@ -1,5 +1,8 @@ package com.hnac.hzims.operational.census.vo; +import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.NullSerializer; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -15,8 +18,10 @@ public class WaterTargetVo { private String stationName; @ApiModelProperty("用电量") + @JsonSerialize(nullsUsing = NullSerializer.class) private Double use; @ApiModelProperty("功率") + @JsonSerialize(nullsUsing = NullSerializer.class) private Double load; } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/census/service/impl/TargetServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/census/service/impl/TargetServiceImpl.java index 6d9b388..f07e1a7 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/census/service/impl/TargetServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/census/service/impl/TargetServiceImpl.java @@ -718,7 +718,7 @@ public class TargetServiceImpl implements TargetService { return hydropowerTarget; } Double power = activePowerMap.get(station.getCode()); - hydropowerTarget.setPower(power); + hydropowerTarget.setPower(Optional.ofNullable(power).orElse(0.0)); return hydropowerTarget; }).sorted(Comparator.comparing(HydropowerTargetVo::getPower)).collect(Collectors.toList()); } @@ -786,7 +786,8 @@ public class TargetServiceImpl implements TargetService { water.setUse(0.0); return water; } - water.setUse(pumps.stream().filter(o->o.getDeptId().equals(station.getRefDept())).mapToDouble(WaterPumpRealVo::getActivePower).sum()); + Double use = pumps.stream().filter(o->o.getDeptId().equals(station.getRefDept())).mapToDouble(WaterPumpRealVo::getActivePower).sum(); + water.setUse(Optional.ofNullable(use).orElse(0.0)); return water; }).sorted(Comparator.comparing(WaterTargetVo::getLoad)).collect(Collectors.toList()); }