diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java b/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java index 2f6a18e..8b5b51b 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java @@ -41,6 +41,7 @@ GqYlData("GqYlData", "港渠实时监测数据"), GqSoilData("GqSoilData", "港渠墒情监测数据"), NyysData("NyysData", "农业用水监测数据"), + NcjcyjData("NcjcyjData", "农村监测预警数据"), ; 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 2f6a18e..8b5b51b 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java @@ -41,6 +41,7 @@ GqYlData("GqYlData", "港渠实时监测数据"), GqSoilData("GqSoilData", "港渠墒情监测数据"), NyysData("NyysData", "农业用水监测数据"), + NcjcyjData("NcjcyjData", "农村监测预警数据"), ; 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 fb6ce30..ab2bb5a 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java @@ -141,6 +141,8 @@ } else if(xfDataEnum == XfDataEnum.NyysData ) { DTO = JSONObject.parseArray(data, NyysData.class); + }else if (xfDataEnum == XfDataEnum.NcjcyjData) { + DTO = JSONObject.parseArray(data, NcjcyjData.class); } else { throw new RuntimeException("暂未开发"); @@ -346,6 +348,9 @@ else if(xfDataEnum == XfDataEnum.NyysData ) { NyysData DTO = JSONObject.parseObject(data, NyysData.class); model = RealTimeSerializer.xfObjectToRealMap(DTO); + }else if (xfDataEnum == XfDataEnum.NcjcyjData) { + NcjcyjData DTO = JSONObject.parseObject(data, NcjcyjData.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 2f6a18e..8b5b51b 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java @@ -41,6 +41,7 @@ GqYlData("GqYlData", "港渠实时监测数据"), GqSoilData("GqSoilData", "港渠墒情监测数据"), NyysData("NyysData", "农业用水监测数据"), + NcjcyjData("NcjcyjData", "农村监测预警数据"), ; 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 fb6ce30..ab2bb5a 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java @@ -141,6 +141,8 @@ } else if(xfDataEnum == XfDataEnum.NyysData ) { DTO = JSONObject.parseArray(data, NyysData.class); + }else if (xfDataEnum == XfDataEnum.NcjcyjData) { + DTO = JSONObject.parseArray(data, NcjcyjData.class); } else { throw new RuntimeException("暂未开发"); @@ -346,6 +348,9 @@ else if(xfDataEnum == XfDataEnum.NyysData ) { NyysData DTO = JSONObject.parseObject(data, NyysData.class); model = RealTimeSerializer.xfObjectToRealMap(DTO); + }else if (xfDataEnum == XfDataEnum.NcjcyjData) { + NcjcyjData DTO = JSONObject.parseObject(data, NcjcyjData.class); + model = RealTimeSerializer.xfObjectToRealMap(DTO); } else { throw new RuntimeException("暂未开发"); diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/entity/NcjcyjData.java b/src/main/java/org/springnewfiber/dataadapter/xf/entity/NcjcyjData.java new file mode 100644 index 0000000..d70d679 --- /dev/null +++ b/src/main/java/org/springnewfiber/dataadapter/xf/entity/NcjcyjData.java @@ -0,0 +1,23 @@ +package org.springnewfiber.dataadapter.xf.entity; + +import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @program: newfiber-data-adapter + * @description: 农村监测预警 + * @author: djt + * @create: 2022-06-14 15:29 + **/ +@Data +public class NcjcyjData extends BaseXfInterfaceEntity{ + @JsonProperty(value ="rate") + @ApiModelProperty(value = "水势") + private String wptn; + @JsonProperty(value ="z") + @ApiModelProperty(value = "水位") + private BigDecimal z; +} diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java b/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java index 2f6a18e..8b5b51b 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java @@ -41,6 +41,7 @@ GqYlData("GqYlData", "港渠实时监测数据"), GqSoilData("GqSoilData", "港渠墒情监测数据"), NyysData("NyysData", "农业用水监测数据"), + NcjcyjData("NcjcyjData", "农村监测预警数据"), ; 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 fb6ce30..ab2bb5a 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java @@ -141,6 +141,8 @@ } else if(xfDataEnum == XfDataEnum.NyysData ) { DTO = JSONObject.parseArray(data, NyysData.class); + }else if (xfDataEnum == XfDataEnum.NcjcyjData) { + DTO = JSONObject.parseArray(data, NcjcyjData.class); } else { throw new RuntimeException("暂未开发"); @@ -346,6 +348,9 @@ else if(xfDataEnum == XfDataEnum.NyysData ) { NyysData DTO = JSONObject.parseObject(data, NyysData.class); model = RealTimeSerializer.xfObjectToRealMap(DTO); + }else if (xfDataEnum == XfDataEnum.NcjcyjData) { + NcjcyjData DTO = JSONObject.parseObject(data, NcjcyjData.class); + model = RealTimeSerializer.xfObjectToRealMap(DTO); } else { throw new RuntimeException("暂未开发"); diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/entity/NcjcyjData.java b/src/main/java/org/springnewfiber/dataadapter/xf/entity/NcjcyjData.java new file mode 100644 index 0000000..d70d679 --- /dev/null +++ b/src/main/java/org/springnewfiber/dataadapter/xf/entity/NcjcyjData.java @@ -0,0 +1,23 @@ +package org.springnewfiber.dataadapter.xf.entity; + +import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @program: newfiber-data-adapter + * @description: 农村监测预警 + * @author: djt + * @create: 2022-06-14 15:29 + **/ +@Data +public class NcjcyjData extends BaseXfInterfaceEntity{ + @JsonProperty(value ="rate") + @ApiModelProperty(value = "水势") + private String wptn; + @JsonProperty(value ="z") + @ApiModelProperty(value = "水位") + private BigDecimal z; +} diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/entity/NyysData.java b/src/main/java/org/springnewfiber/dataadapter/xf/entity/NyysData.java index 5e37fba..f9a98a5 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/entity/NyysData.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/entity/NyysData.java @@ -29,4 +29,7 @@ @ApiModelProperty(value = "水深") @JsonProperty(value ="z") private BigDecimal ZB; + @JsonProperty(value ="q") + @ApiModelProperty(value = "瞬时流量(立方米/秒)") + private BigDecimal Q1; }