From 7c165fbc499ebe5e4d09c2ebea03ff8c7b84e019 Mon Sep 17 00:00:00 2001 From: yang_shj <1069818635@QQ.com> Date: Thu, 20 Jun 2024 17:07:39 +0800 Subject: [PATCH 1/2] =?UTF-8?q?#=E4=BA=91=E6=9C=8D=E5=8A=A1=E5=91=8A?= =?UTF-8?q?=E8=AD=A6=E5=BC=B9=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hnac/hzims/operational/report/service/impl/DeptServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/service/impl/DeptServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/service/impl/DeptServiceImpl.java index 0550817..eda0431 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/service/impl/DeptServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/service/impl/DeptServiceImpl.java @@ -139,7 +139,7 @@ public class DeptServiceImpl implements IDeptService { @Override public List alarmDeptByCurrentUser() { List stations = stationService.list(Wrappers.lambdaQuery() - .eq(StationEntity::getServeType, HomePageConstant.HYDROPOWER_SERVETYPE) + .eq(StationEntity::getType, HomePageConstant.HYDROPOWER) ); if(CollectionUtil.isEmpty(stations)){ return new ArrayList<>(); From ebda84b0c163a44a3454de1135a00715e795d676 Mon Sep 17 00:00:00 2001 From: yang_shj <1069818635@QQ.com> Date: Fri, 21 Jun 2024 14:21:55 +0800 Subject: [PATCH 2/2] =?UTF-8?q?#=E4=B8=8B=E9=99=90=E6=B0=B4=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hnac/hzims/operational/station/entity/StationEntity.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/station/entity/StationEntity.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/station/entity/StationEntity.java index 4d93882..34e6b42 100644 --- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/station/entity/StationEntity.java +++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/station/entity/StationEntity.java @@ -99,6 +99,11 @@ public class StationEntity extends TenantEntity implements Serializable { @TableField(updateStrategy = FieldStrategy.IGNORED) private Double waterLevelMax; + @ApiModelProperty("前池下限水位") + @JsonSerialize(nullsUsing = NullSerializer.class) + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Double downWaterLevel; + @ApiModelProperty("经度(东经)") @JsonSerialize(nullsUsing = NullSerializer.class) private Float lgtd;