diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java b/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java index c895063..2f6a18e 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java @@ -40,6 +40,7 @@ GwYsSZData("GwYsSZData"," 雨水管网水质监测数据"), GqYlData("GqYlData", "港渠实时监测数据"), GqSoilData("GqSoilData", "港渠墒情监测数据"), + NyysData("NyysData", "农业用水监测数据"), ; private String code; private String remark; diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java b/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java index c895063..2f6a18e 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java @@ -40,6 +40,7 @@ GwYsSZData("GwYsSZData"," 雨水管网水质监测数据"), GqYlData("GqYlData", "港渠实时监测数据"), GqSoilData("GqSoilData", "港渠墒情监测数据"), + NyysData("NyysData", "农业用水监测数据"), ; private String code; private String remark; diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java b/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java index 9a2a213..fb6ce30 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java @@ -139,6 +139,9 @@ else if(xfDataEnum == XfDataEnum.GqYlData || xfDataEnum == XfDataEnum.GqSoilData) { DTO = JSONObject.parseArray(data, GqYlDataDto.class); } + else if(xfDataEnum == XfDataEnum.NyysData ) { + DTO = JSONObject.parseArray(data, NyysData.class); + } else { throw new RuntimeException("暂未开发"); } @@ -340,6 +343,10 @@ GqYlDataDto dto = JSONObject.parseObject(data, GqYlDataDto.class); model = RealTimeSerializer.xfObjectToRealMap(dto); } + else if(xfDataEnum == XfDataEnum.NyysData ) { + NyysData DTO = JSONObject.parseObject(data, NyysData.class); + model = RealTimeSerializer.xfObjectToRealMap(DTO); + } else { throw new RuntimeException("暂未开发"); } diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java b/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java index c895063..2f6a18e 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java @@ -40,6 +40,7 @@ GwYsSZData("GwYsSZData"," 雨水管网水质监测数据"), GqYlData("GqYlData", "港渠实时监测数据"), GqSoilData("GqSoilData", "港渠墒情监测数据"), + NyysData("NyysData", "农业用水监测数据"), ; private String code; private String remark; diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java b/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java index 9a2a213..fb6ce30 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java @@ -139,6 +139,9 @@ else if(xfDataEnum == XfDataEnum.GqYlData || xfDataEnum == XfDataEnum.GqSoilData) { DTO = JSONObject.parseArray(data, GqYlDataDto.class); } + else if(xfDataEnum == XfDataEnum.NyysData ) { + DTO = JSONObject.parseArray(data, NyysData.class); + } else { throw new RuntimeException("暂未开发"); } @@ -340,6 +343,10 @@ GqYlDataDto dto = JSONObject.parseObject(data, GqYlDataDto.class); model = RealTimeSerializer.xfObjectToRealMap(dto); } + else if(xfDataEnum == XfDataEnum.NyysData ) { + NyysData DTO = JSONObject.parseObject(data, NyysData.class); + model = RealTimeSerializer.xfObjectToRealMap(DTO); + } else { throw new RuntimeException("暂未开发"); } diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/entity/NyysData.java b/src/main/java/org/springnewfiber/dataadapter/xf/entity/NyysData.java new file mode 100644 index 0000000..48c3b23 --- /dev/null +++ b/src/main/java/org/springnewfiber/dataadapter/xf/entity/NyysData.java @@ -0,0 +1,32 @@ +package org.springnewfiber.dataadapter.xf.entity; + +import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +@Data +public class NyysData extends BaseXfInterfaceEntity{ + @JsonProperty(value ="q") + @ApiModelProperty(value = "水表2每小时水量(立方米/小时)") + private BigDecimal SBL2; + @JsonProperty(value ="cq1") + @ApiModelProperty(value = "累计流量2(立方米)") + private BigDecimal CQ2; + @JsonProperty(value ="z") + @ApiModelProperty(value = "瞬时河道水位、潮位(米)") + private BigDecimal Z; + @JsonProperty(value ="zt") + @ApiModelProperty(value = "遥测站状态及报警信息") + private String ZT; + @JsonProperty(value ="va") + @ApiModelProperty(value = "断面平均流速2(米/秒)") + private BigDecimal VJ; + @JsonProperty(value ="vt") + @ApiModelProperty(value = "电源电压") + private BigDecimal VT; + @ApiModelProperty(value = "水深") + @JsonProperty(value ="z") + private BigDecimal ZB; +}