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 1707a43..1721302 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 @@ -1,5 +1,6 @@ package com.hnac.hzims.operational.station.entity; +import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.SqlCondition; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; @@ -80,9 +81,11 @@ public class StationEntity extends TenantEntity implements Serializable { pattern = "yyyy-MM-dd HH:mm:ss" ) @ApiModelProperty("投运时间,用于计算安全运行天数") + @TableField(updateStrategy = FieldStrategy.IGNORED) private LocalDateTime commissionTime; @ApiModelProperty("站点图片,用于展示") + @TableField(updateStrategy = FieldStrategy.IGNORED) private String pic; @ApiModelProperty("类型(1电站2泵站3水厂)") @@ -93,6 +96,7 @@ public class StationEntity extends TenantEntity implements Serializable { @ApiModelProperty("前池最高水位") @JsonSerialize(nullsUsing = NullSerializer.class) + @TableField(updateStrategy = FieldStrategy.IGNORED) private Double waterLevelMax; @ApiModelProperty("经度(东经)") @@ -105,21 +109,27 @@ public class StationEntity extends TenantEntity implements Serializable { @ApiModelProperty("允许监控，1时为允许，其它为不允许") @JsonSerialize(nullsUsing = NullSerializer.class) + @TableField(updateStrategy = FieldStrategy.IGNORED) private Integer enableControl; @ApiModelProperty("备注") + @TableField(updateStrategy = FieldStrategy.IGNORED) private String remark; @ApiModelProperty("联系方式") + @TableField(updateStrategy = FieldStrategy.IGNORED) private String contact; @ApiModelProperty("详细地址") + @TableField(updateStrategy = FieldStrategy.IGNORED) private String address; @ApiModelProperty("公司名称") + @TableField(updateStrategy = FieldStrategy.IGNORED) private String company; @ApiModelProperty("联系人") + @TableField(updateStrategy = FieldStrategy.IGNORED) private String contactor; @ApiModelProperty("站点服务类型：1、云服务; 2、代运维服务") @@ -143,19 +153,24 @@ public class StationEntity extends TenantEntity implements Serializable { @ApiModelProperty("限制水位") @JsonSerialize(nullsUsing = NullSerializer.class) + @TableField(updateStrategy = FieldStrategy.IGNORED) private Double limitWaterLevel; @ApiModelProperty("排序") @JsonSerialize(nullsUsing = NullSerializer.class) + @TableField(updateStrategy = FieldStrategy.IGNORED) private Integer sort; @ApiModelProperty("实时画面绑定账号秘钥") + @TableField(updateStrategy = FieldStrategy.IGNORED) private String secretKey; @ApiModelProperty("是否发送告警短信: 1-发送短信 0-不发送短信") + @TableField(updateStrategy = FieldStrategy.IGNORED) private Integer sendMessageFlag; @ApiModelProperty("站点是否为国外 1：是；0：否") @QueryField(condition = SqlCondition.EQUAL) + @TableField(updateStrategy = FieldStrategy.IGNORED) private Boolean isAbroad; } diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/station/entity/StationPushConfigEntity.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/station/entity/StationPushConfigEntity.java index 1a12028..a2e5571 100644 --- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/station/entity/StationPushConfigEntity.java +++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/station/entity/StationPushConfigEntity.java @@ -12,8 +12,7 @@ import com.baomidou.mybatisplus.annotation.SqlCondition; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; +import lombok.*; import org.springblade.core.mp.support.QueryField; import org.springblade.core.tenant.mp.TenantEntity; @@ -22,6 +21,9 @@ import java.io.Serializable; @Data @ApiModel("站点类型推送FDP配置") @TableName("hzims_station_push_configuration") +@NoArgsConstructor +@AllArgsConstructor +@Builder @EqualsAndHashCode public class StationPushConfigEntity extends TenantEntity implements Serializable { @@ -38,4 +40,8 @@ public class StationPushConfigEntity extends TenantEntity implements Serializabl @NotNull(message = "是否推送不能为空") private Boolean isPush; + @ApiModelProperty("FDP站点类型") + @QueryField(condition = SqlCondition.EQUAL) + private Integer fdpStationType; + } diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/station/feign/IStationPushConfigClient.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/station/feign/IStationPushConfigClient.java new file mode 100644 index 0000000..79b90d3 --- /dev/null +++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/station/feign/IStationPushConfigClient.java @@ -0,0 +1,28 @@ +package com.hnac.hzims.operational.station.feign; + +import com.hnac.hzims.operational.OperationalConstants; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; + +/** + * @ClassName IStationPushConfigClient + * @description: + * @author: hx + * @create: 2023-07-13 20:03 + * @Version 4.0 + **/ +@FeignClient(value = OperationalConstants.APP_NAME) +public interface IStationPushConfigClient { + + String API_PREFIX = "/feign/station/pushConfig"; + String GET_FDP_STATION_TYPE_BY_CODE = API_PREFIX + "/getFdpStationTypeByCode"; + + /** + * 根据站点编码获取FDP站点类型 + * @param stationCode 站点编码 + * @return + */ + @GetMapping(GET_FDP_STATION_TYPE_BY_CODE) + Integer getFdpStationTypeByCode(@RequestParam String stationCode); +} diff --git a/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/plan/PlanContants.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/plan/PlanContants.java index 27051b6..8ee47f8 100644 --- a/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/plan/PlanContants.java +++ b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/plan/PlanContants.java @@ -3,6 +3,7 @@ */ package com.hnac.hzinfo.inspect.plan; +import lombok.AllArgsConstructor; import lombok.Getter; /** @@ -174,4 +175,16 @@ public interface PlanContants { this.flag = flag; } } + + /** + * 是否自动巡检 0-否 1-是 + */ + @AllArgsConstructor + enum AutoVideoEnum { + YES("1"),NO("0"); + @Getter + private String flag; + + + } }