#数据填报

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;
 }

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;
 }

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;
 }

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("详情")

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;
 }

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;
 }

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("详情")

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;
 }

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());
 		}