diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java b/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java index 1201461..feb66e6 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java @@ -33,6 +33,7 @@ WasData("WasData","涵闸监测数据"), WetlogData("WetlogData","渍水实时数据"), SewageData("SewageData","污水厂实时监测数据"), + WaterQualityData("WaterQualityData","水质站实时监测数据"), ; 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 1201461..feb66e6 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java @@ -33,6 +33,7 @@ WasData("WasData","涵闸监测数据"), WetlogData("WetlogData","渍水实时数据"), SewageData("SewageData","污水厂实时监测数据"), + WaterQualityData("WaterQualityData","水质站实时监测数据"), ; 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 80acb86..c07bfeb 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java @@ -23,18 +23,7 @@ import org.springnewfiber.dataadapter.entity.PtReceiveBaseModel; import org.springnewfiber.dataadapter.sswj.util.RealTimeSerializer; import org.springnewfiber.dataadapter.xf.XfDataEnum; -import org.springnewfiber.dataadapter.xf.entity.BaseXfInterfaceEntity; -import org.springnewfiber.dataadapter.xf.entity.MonitorChnlDataDto; -import org.springnewfiber.dataadapter.xf.entity.MonitorForcastData; -import org.springnewfiber.dataadapter.xf.entity.MonitorLakeData; -import org.springnewfiber.dataadapter.xf.entity.MonitorMeteorologicalData; -import org.springnewfiber.dataadapter.xf.entity.MonitorPptnData; -import org.springnewfiber.dataadapter.xf.entity.MonitorPumpData; -import org.springnewfiber.dataadapter.xf.entity.MonitorRiverData; -import org.springnewfiber.dataadapter.xf.entity.MonitorSewageData; -import org.springnewfiber.dataadapter.xf.entity.MonitorSoilData; -import org.springnewfiber.dataadapter.xf.entity.MonitorWasData; -import org.springnewfiber.dataadapter.xf.entity.MonitorWetlogData; +import org.springnewfiber.dataadapter.xf.entity.*; import org.springnewfiber.dataadapter.xf.enums.EDataAccessType; import org.springnewfiber.dataadapter.xf.service.DataAccessRecordService; @@ -98,6 +87,8 @@ DTO = JSONObject.parseArray(data, MonitorWetlogData.class); } else if (xfDataEnum == XfDataEnum.SewageData) { DTO = JSONObject.parseArray(data, MonitorSewageData.class); + }else if (xfDataEnum == XfDataEnum.WaterQualityData) { + DTO = JSONObject.parseArray(data, WaterQualityData.class); } else { throw new RuntimeException("暂未开发"); } @@ -201,6 +192,9 @@ } else if (xfDataEnum == XfDataEnum.SewageData) { MonitorSewageData DTO = JSONObject.parseObject(data, MonitorSewageData.class); model = RealTimeSerializer.xfObjectToRealMap(DTO); + }else if (xfDataEnum == XfDataEnum.WaterQualityData) { + WaterQualityData DTO = JSONObject.parseObject(data, WaterQualityData.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 1201461..feb66e6 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java @@ -33,6 +33,7 @@ WasData("WasData","涵闸监测数据"), WetlogData("WetlogData","渍水实时数据"), SewageData("SewageData","污水厂实时监测数据"), + WaterQualityData("WaterQualityData","水质站实时监测数据"), ; 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 80acb86..c07bfeb 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java @@ -23,18 +23,7 @@ import org.springnewfiber.dataadapter.entity.PtReceiveBaseModel; import org.springnewfiber.dataadapter.sswj.util.RealTimeSerializer; import org.springnewfiber.dataadapter.xf.XfDataEnum; -import org.springnewfiber.dataadapter.xf.entity.BaseXfInterfaceEntity; -import org.springnewfiber.dataadapter.xf.entity.MonitorChnlDataDto; -import org.springnewfiber.dataadapter.xf.entity.MonitorForcastData; -import org.springnewfiber.dataadapter.xf.entity.MonitorLakeData; -import org.springnewfiber.dataadapter.xf.entity.MonitorMeteorologicalData; -import org.springnewfiber.dataadapter.xf.entity.MonitorPptnData; -import org.springnewfiber.dataadapter.xf.entity.MonitorPumpData; -import org.springnewfiber.dataadapter.xf.entity.MonitorRiverData; -import org.springnewfiber.dataadapter.xf.entity.MonitorSewageData; -import org.springnewfiber.dataadapter.xf.entity.MonitorSoilData; -import org.springnewfiber.dataadapter.xf.entity.MonitorWasData; -import org.springnewfiber.dataadapter.xf.entity.MonitorWetlogData; +import org.springnewfiber.dataadapter.xf.entity.*; import org.springnewfiber.dataadapter.xf.enums.EDataAccessType; import org.springnewfiber.dataadapter.xf.service.DataAccessRecordService; @@ -98,6 +87,8 @@ DTO = JSONObject.parseArray(data, MonitorWetlogData.class); } else if (xfDataEnum == XfDataEnum.SewageData) { DTO = JSONObject.parseArray(data, MonitorSewageData.class); + }else if (xfDataEnum == XfDataEnum.WaterQualityData) { + DTO = JSONObject.parseArray(data, WaterQualityData.class); } else { throw new RuntimeException("暂未开发"); } @@ -201,6 +192,9 @@ } else if (xfDataEnum == XfDataEnum.SewageData) { MonitorSewageData DTO = JSONObject.parseObject(data, MonitorSewageData.class); model = RealTimeSerializer.xfObjectToRealMap(DTO); + }else if (xfDataEnum == XfDataEnum.WaterQualityData) { + WaterQualityData DTO = JSONObject.parseObject(data, WaterQualityData.class); + model = RealTimeSerializer.xfObjectToRealMap(DTO); } else { throw new RuntimeException("暂未开发"); } diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/entity/WaterQualityData.java b/src/main/java/org/springnewfiber/dataadapter/xf/entity/WaterQualityData.java new file mode 100644 index 0000000..c9b3973 --- /dev/null +++ b/src/main/java/org/springnewfiber/dataadapter/xf/entity/WaterQualityData.java @@ -0,0 +1,45 @@ +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-07-14 16:33 + **/ +@Data +public class WaterQualityData extends BaseXfInterfaceEntity { + + @JsonProperty(value ="c") + @ApiModelProperty(value = "水温") + private BigDecimal wt; + @JsonProperty(value ="codmn") + @ApiModelProperty(value = "化学需氧量") + private BigDecimal codmn; + @JsonProperty(value ="tp") + @ApiModelProperty(value = "总磷") + private BigDecimal tp; + @JsonProperty(value ="tn") + @ApiModelProperty(value = "总氮") + private BigDecimal tn; + @JsonProperty(value ="do") + @ApiModelProperty(value = "溶解氧") + private BigDecimal dox; + @JsonProperty(value ="turb") + @ApiModelProperty(value = "浊度") + private BigDecimal turb; + @JsonProperty(value ="cond") + @ApiModelProperty(value = "电导率") + private BigDecimal cond; + @JsonProperty(value ="ph") + @ApiModelProperty(value = "酸碱度") + private BigDecimal ph; + @JsonProperty(value ="nh4n") + @ApiModelProperty(value = "氨氮") + private BigDecimal nh3n; +}