diff --git a/src/main/java/org/springnewfiber/dataadapter/sswj/util/RealTimeSerializer.java b/src/main/java/org/springnewfiber/dataadapter/sswj/util/RealTimeSerializer.java index 459beae..5450c2c 100644 --- a/src/main/java/org/springnewfiber/dataadapter/sswj/util/RealTimeSerializer.java +++ b/src/main/java/org/springnewfiber/dataadapter/sswj/util/RealTimeSerializer.java @@ -17,6 +17,7 @@ import org.springnewfiber.dataadapter.entity.PtReceiveBaseModel; import org.springnewfiber.dataadapter.xf.entity.BaseXfInterfaceEntity; import org.springnewfiber.dataadapter.xf.entity.MonitorChnlDataDto; +import org.springnewfiber.dataadapter.xf.entity.MonitorSewageData; import java.io.IOException; import java.lang.annotation.Annotation; @@ -101,6 +102,11 @@ } PtReceiveBaseModel model = new PtReceiveBaseModel(); Map dataMap = Maps.newHashMap(); + String dataType = null; + if(object instanceof MonitorSewageData) { + dataType = ((MonitorSewageData) object).getType(); + } + final String snType = dataType; ReflectUtil.getFieldMap(object.getClass()).forEach((filedName, filed) -> { try { JsonProperty annotation = filed.getAnnotation(JsonProperty.class); @@ -112,7 +118,11 @@ if (annotation != null) { String name = annotation.value(); MqNodeData data = new MqNodeData(); - data.setSn(filedName); + if(StringUtils.isNotBlank(snType)) { + data.setSn(filedName + "_" + snType); + }else { + data.setSn(filedName); + } data.setKey(name); data.setValue(filed.get(object)); if (dataMap.containsKey(name)) { diff --git a/src/main/java/org/springnewfiber/dataadapter/sswj/util/RealTimeSerializer.java b/src/main/java/org/springnewfiber/dataadapter/sswj/util/RealTimeSerializer.java index 459beae..5450c2c 100644 --- a/src/main/java/org/springnewfiber/dataadapter/sswj/util/RealTimeSerializer.java +++ b/src/main/java/org/springnewfiber/dataadapter/sswj/util/RealTimeSerializer.java @@ -17,6 +17,7 @@ import org.springnewfiber.dataadapter.entity.PtReceiveBaseModel; import org.springnewfiber.dataadapter.xf.entity.BaseXfInterfaceEntity; import org.springnewfiber.dataadapter.xf.entity.MonitorChnlDataDto; +import org.springnewfiber.dataadapter.xf.entity.MonitorSewageData; import java.io.IOException; import java.lang.annotation.Annotation; @@ -101,6 +102,11 @@ } PtReceiveBaseModel model = new PtReceiveBaseModel(); Map dataMap = Maps.newHashMap(); + String dataType = null; + if(object instanceof MonitorSewageData) { + dataType = ((MonitorSewageData) object).getType(); + } + final String snType = dataType; ReflectUtil.getFieldMap(object.getClass()).forEach((filedName, filed) -> { try { JsonProperty annotation = filed.getAnnotation(JsonProperty.class); @@ -112,7 +118,11 @@ if (annotation != null) { String name = annotation.value(); MqNodeData data = new MqNodeData(); - data.setSn(filedName); + if(StringUtils.isNotBlank(snType)) { + data.setSn(filedName + "_" + snType); + }else { + data.setSn(filedName); + } data.setKey(name); data.setValue(filed.get(object)); if (dataMap.containsKey(name)) { diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java b/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java index 3d0f82b..1201461 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java @@ -12,6 +12,7 @@ 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; @@ -31,6 +32,7 @@ SoilData("SoilData","土壤墒情"), WasData("WasData","涵闸监测数据"), WetlogData("WetlogData","渍水实时数据"), + SewageData("SewageData","污水厂实时监测数据"), ; private String code; private String remark; @@ -72,8 +74,10 @@ result = (List) JSONObject.parseArray(data, MonitorWasData.class); } else if (xfDataEnum == XfDataEnum.WetlogData) { result = (List) JSONObject.parseArray(data, MonitorWetlogData.class); + } else if (xfDataEnum == XfDataEnum.SewageData) { + result = (List) JSONObject.parseArray(data, MonitorSewageData.class); } - + return result; } diff --git a/src/main/java/org/springnewfiber/dataadapter/sswj/util/RealTimeSerializer.java b/src/main/java/org/springnewfiber/dataadapter/sswj/util/RealTimeSerializer.java index 459beae..5450c2c 100644 --- a/src/main/java/org/springnewfiber/dataadapter/sswj/util/RealTimeSerializer.java +++ b/src/main/java/org/springnewfiber/dataadapter/sswj/util/RealTimeSerializer.java @@ -17,6 +17,7 @@ import org.springnewfiber.dataadapter.entity.PtReceiveBaseModel; import org.springnewfiber.dataadapter.xf.entity.BaseXfInterfaceEntity; import org.springnewfiber.dataadapter.xf.entity.MonitorChnlDataDto; +import org.springnewfiber.dataadapter.xf.entity.MonitorSewageData; import java.io.IOException; import java.lang.annotation.Annotation; @@ -101,6 +102,11 @@ } PtReceiveBaseModel model = new PtReceiveBaseModel(); Map dataMap = Maps.newHashMap(); + String dataType = null; + if(object instanceof MonitorSewageData) { + dataType = ((MonitorSewageData) object).getType(); + } + final String snType = dataType; ReflectUtil.getFieldMap(object.getClass()).forEach((filedName, filed) -> { try { JsonProperty annotation = filed.getAnnotation(JsonProperty.class); @@ -112,7 +118,11 @@ if (annotation != null) { String name = annotation.value(); MqNodeData data = new MqNodeData(); - data.setSn(filedName); + if(StringUtils.isNotBlank(snType)) { + data.setSn(filedName + "_" + snType); + }else { + data.setSn(filedName); + } data.setKey(name); data.setValue(filed.get(object)); if (dataMap.containsKey(name)) { diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java b/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java index 3d0f82b..1201461 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java @@ -12,6 +12,7 @@ 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; @@ -31,6 +32,7 @@ SoilData("SoilData","土壤墒情"), WasData("WasData","涵闸监测数据"), WetlogData("WetlogData","渍水实时数据"), + SewageData("SewageData","污水厂实时监测数据"), ; private String code; private String remark; @@ -72,8 +74,10 @@ result = (List) JSONObject.parseArray(data, MonitorWasData.class); } else if (xfDataEnum == XfDataEnum.WetlogData) { result = (List) JSONObject.parseArray(data, MonitorWetlogData.class); + } else if (xfDataEnum == XfDataEnum.SewageData) { + result = (List) JSONObject.parseArray(data, MonitorSewageData.class); } - + return result; } 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 9cd505b..80acb86 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java @@ -31,6 +31,7 @@ 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; @@ -95,6 +96,8 @@ DTO = JSONObject.parseArray(data, MonitorWasData.class); } else if (xfDataEnum == XfDataEnum.WetlogData) { DTO = JSONObject.parseArray(data, MonitorWetlogData.class); + } else if (xfDataEnum == XfDataEnum.SewageData) { + DTO = JSONObject.parseArray(data, MonitorSewageData.class); } else { throw new RuntimeException("暂未开发"); } @@ -195,6 +198,9 @@ } else if (xfDataEnum == XfDataEnum.WetlogData) { MonitorWetlogData DTO = JSONObject.parseObject(data, MonitorWetlogData.class); model = RealTimeSerializer.xfObjectToRealMap(DTO); + } else if (xfDataEnum == XfDataEnum.SewageData) { + MonitorSewageData DTO = JSONObject.parseObject(data, MonitorSewageData.class); + model = RealTimeSerializer.xfObjectToRealMap(DTO); } else { throw new RuntimeException("暂未开发"); } diff --git a/src/main/java/org/springnewfiber/dataadapter/sswj/util/RealTimeSerializer.java b/src/main/java/org/springnewfiber/dataadapter/sswj/util/RealTimeSerializer.java index 459beae..5450c2c 100644 --- a/src/main/java/org/springnewfiber/dataadapter/sswj/util/RealTimeSerializer.java +++ b/src/main/java/org/springnewfiber/dataadapter/sswj/util/RealTimeSerializer.java @@ -17,6 +17,7 @@ import org.springnewfiber.dataadapter.entity.PtReceiveBaseModel; import org.springnewfiber.dataadapter.xf.entity.BaseXfInterfaceEntity; import org.springnewfiber.dataadapter.xf.entity.MonitorChnlDataDto; +import org.springnewfiber.dataadapter.xf.entity.MonitorSewageData; import java.io.IOException; import java.lang.annotation.Annotation; @@ -101,6 +102,11 @@ } PtReceiveBaseModel model = new PtReceiveBaseModel(); Map dataMap = Maps.newHashMap(); + String dataType = null; + if(object instanceof MonitorSewageData) { + dataType = ((MonitorSewageData) object).getType(); + } + final String snType = dataType; ReflectUtil.getFieldMap(object.getClass()).forEach((filedName, filed) -> { try { JsonProperty annotation = filed.getAnnotation(JsonProperty.class); @@ -112,7 +118,11 @@ if (annotation != null) { String name = annotation.value(); MqNodeData data = new MqNodeData(); - data.setSn(filedName); + if(StringUtils.isNotBlank(snType)) { + data.setSn(filedName + "_" + snType); + }else { + data.setSn(filedName); + } data.setKey(name); data.setValue(filed.get(object)); if (dataMap.containsKey(name)) { diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java b/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java index 3d0f82b..1201461 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java @@ -12,6 +12,7 @@ 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; @@ -31,6 +32,7 @@ SoilData("SoilData","土壤墒情"), WasData("WasData","涵闸监测数据"), WetlogData("WetlogData","渍水实时数据"), + SewageData("SewageData","污水厂实时监测数据"), ; private String code; private String remark; @@ -72,8 +74,10 @@ result = (List) JSONObject.parseArray(data, MonitorWasData.class); } else if (xfDataEnum == XfDataEnum.WetlogData) { result = (List) JSONObject.parseArray(data, MonitorWetlogData.class); + } else if (xfDataEnum == XfDataEnum.SewageData) { + result = (List) JSONObject.parseArray(data, MonitorSewageData.class); } - + return result; } 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 9cd505b..80acb86 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java @@ -31,6 +31,7 @@ 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; @@ -95,6 +96,8 @@ DTO = JSONObject.parseArray(data, MonitorWasData.class); } else if (xfDataEnum == XfDataEnum.WetlogData) { DTO = JSONObject.parseArray(data, MonitorWetlogData.class); + } else if (xfDataEnum == XfDataEnum.SewageData) { + DTO = JSONObject.parseArray(data, MonitorSewageData.class); } else { throw new RuntimeException("暂未开发"); } @@ -195,6 +198,9 @@ } else if (xfDataEnum == XfDataEnum.WetlogData) { MonitorWetlogData DTO = JSONObject.parseObject(data, MonitorWetlogData.class); model = RealTimeSerializer.xfObjectToRealMap(DTO); + } else if (xfDataEnum == XfDataEnum.SewageData) { + MonitorSewageData DTO = JSONObject.parseObject(data, MonitorSewageData.class); + model = RealTimeSerializer.xfObjectToRealMap(DTO); } else { throw new RuntimeException("暂未开发"); } diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/entity/MonitorSewageData.java b/src/main/java/org/springnewfiber/dataadapter/xf/entity/MonitorSewageData.java new file mode 100644 index 0000000..c867b31 --- /dev/null +++ b/src/main/java/org/springnewfiber/dataadapter/xf/entity/MonitorSewageData.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: leo + * @create: 2022-07-13 + **/ +@Data +public class MonitorSewageData extends BaseXfInterfaceEntity { + + @ApiModelProperty(value = "位置:jsk/进水口、csk/出水口") + private String type; + + @JsonProperty(value ="ph") + @ApiModelProperty(value = "酸碱度") + private BigDecimal ph; + @JsonProperty(value ="q") + @ApiModelProperty(value = "瞬时流量(立方米)") + private BigDecimal q; + @JsonProperty(value ="nh4n") + @ApiModelProperty(value = "氨氮") + private BigDecimal nh3n; + @JsonProperty(value ="codcr") + @ApiModelProperty(value = "化学需氧量") + private BigDecimal codcr; + @JsonProperty(value ="ss") + @ApiModelProperty(value = "悬浮物") + private BigDecimal ss; + @JsonProperty(value ="bod") + @ApiModelProperty(value = "生化需氧量") + private BigDecimal bod; + @JsonProperty(value ="tp") + @ApiModelProperty(value = "总磷") + private BigDecimal tp; + @JsonProperty(value ="tn") + @ApiModelProperty(value = "总氮") + private BigDecimal tn; + +}