diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java b/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java index 16fb503..4488b4c 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java @@ -33,6 +33,10 @@ WhjkSzqData("WhjkSzqData","公司水质船"), InwamntData("InwamntData","供水厂入水数据-水源地数据"), OutwamntData("OutwamntData","供水厂出水数据"), + GwYsQData("GwYsQData","雨水管网流量监测数据"), + GwYsLData("GwYsLData","雨水管网水位监测数据"), + GwWsQData("GwWsQData","污水管网流量监测数据"), + GwWsLData("GwWsLData"," 污水管网水位监测数据"), ; 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 16fb503..4488b4c 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java @@ -33,6 +33,10 @@ WhjkSzqData("WhjkSzqData","公司水质船"), InwamntData("InwamntData","供水厂入水数据-水源地数据"), OutwamntData("OutwamntData","供水厂出水数据"), + GwYsQData("GwYsQData","雨水管网流量监测数据"), + GwYsLData("GwYsLData","雨水管网水位监测数据"), + GwWsQData("GwWsQData","污水管网流量监测数据"), + GwWsLData("GwWsLData"," 污水管网水位监测数据"), ; 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 c3a3e2f..bebfb26 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java @@ -125,7 +125,15 @@ }else if(xfDataEnum == XfDataEnum.OutwamntData){ List surgeTankDataList = JSONObject.parseArray(data, WrOutwamntRDataDto.class); DTO = surgeTankDataList.stream().map(WrOutwamntRData::dtoToDto).collect(Collectors.toList()); - }else { + } + else if(xfDataEnum == XfDataEnum.GwWsLData + ||xfDataEnum == XfDataEnum.GwWsQData + ||xfDataEnum == XfDataEnum.GwYsLData + ||xfDataEnum == XfDataEnum.GwYsQData){ + DTO = JSONObject.parseArray(data, WsLData.class); +// DTO = surgeTankDataList.stream().map(WrOutwamntRData::dtoToDto).collect(Collectors.toList()); + } + else { throw new RuntimeException("暂未开发"); } } @@ -312,6 +320,14 @@ }else if(xfDataEnum == XfDataEnum.OutwamntData){ WrOutwamntRDataDto surgeTankData = JSONObject.parseObject(data, WrOutwamntRDataDto.class); model = RealTimeSerializer.xfObjectToRealMap(WrOutwamntRData.dtoToDto(surgeTankData)); + } + else if(xfDataEnum == XfDataEnum.GwWsLData + ||xfDataEnum == XfDataEnum.GwWsQData + ||xfDataEnum == XfDataEnum.GwYsLData + ||xfDataEnum == XfDataEnum.GwYsQData){ + WsLData DTO = JSONObject.parseObject(data, WsLData.class); + model = RealTimeSerializer.xfObjectToRealMap(DTO); +// DTO = surgeTankDataList.stream().map(WrOutwamntRData::dtoToDto).collect(Collectors.toList()); }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 16fb503..4488b4c 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java @@ -33,6 +33,10 @@ WhjkSzqData("WhjkSzqData","公司水质船"), InwamntData("InwamntData","供水厂入水数据-水源地数据"), OutwamntData("OutwamntData","供水厂出水数据"), + GwYsQData("GwYsQData","雨水管网流量监测数据"), + GwYsLData("GwYsLData","雨水管网水位监测数据"), + GwWsQData("GwWsQData","污水管网流量监测数据"), + GwWsLData("GwWsLData"," 污水管网水位监测数据"), ; 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 c3a3e2f..bebfb26 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java @@ -125,7 +125,15 @@ }else if(xfDataEnum == XfDataEnum.OutwamntData){ List surgeTankDataList = JSONObject.parseArray(data, WrOutwamntRDataDto.class); DTO = surgeTankDataList.stream().map(WrOutwamntRData::dtoToDto).collect(Collectors.toList()); - }else { + } + else if(xfDataEnum == XfDataEnum.GwWsLData + ||xfDataEnum == XfDataEnum.GwWsQData + ||xfDataEnum == XfDataEnum.GwYsLData + ||xfDataEnum == XfDataEnum.GwYsQData){ + DTO = JSONObject.parseArray(data, WsLData.class); +// DTO = surgeTankDataList.stream().map(WrOutwamntRData::dtoToDto).collect(Collectors.toList()); + } + else { throw new RuntimeException("暂未开发"); } } @@ -312,6 +320,14 @@ }else if(xfDataEnum == XfDataEnum.OutwamntData){ WrOutwamntRDataDto surgeTankData = JSONObject.parseObject(data, WrOutwamntRDataDto.class); model = RealTimeSerializer.xfObjectToRealMap(WrOutwamntRData.dtoToDto(surgeTankData)); + } + else if(xfDataEnum == XfDataEnum.GwWsLData + ||xfDataEnum == XfDataEnum.GwWsQData + ||xfDataEnum == XfDataEnum.GwYsLData + ||xfDataEnum == XfDataEnum.GwYsQData){ + WsLData DTO = JSONObject.parseObject(data, WsLData.class); + model = RealTimeSerializer.xfObjectToRealMap(DTO); +// DTO = surgeTankDataList.stream().map(WrOutwamntRData::dtoToDto).collect(Collectors.toList()); }else { throw new RuntimeException("暂未开发"); } diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/entity/WsLData.java b/src/main/java/org/springnewfiber/dataadapter/xf/entity/WsLData.java new file mode 100644 index 0000000..cc55b12 --- /dev/null +++ b/src/main/java/org/springnewfiber/dataadapter/xf/entity/WsLData.java @@ -0,0 +1,28 @@ +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 WsLData extends BaseXfInterfaceEntity{ + @JsonProperty(value ="q") + @ApiModelProperty(value = "水表1每小时水量(立方米/小时)") + private BigDecimal SBL1; + @JsonProperty(value ="cq1") + @ApiModelProperty(value = "累计流量1(立方米)") + private BigDecimal CQ1; + @JsonProperty(value ="z") + @ApiModelProperty(value = "瞬时河道水位、潮位(米）") + private BigDecimal Z; + @JsonProperty(value ="zt") + @ApiModelProperty(value = "遥测站状态及报警信息") + private String ZT; + @JsonProperty(value ="va") + @ApiModelProperty(value = "断面平均流速(米/秒）") + private BigDecimal VA; + @JsonProperty(value ="vt") + @ApiModelProperty(value = "电源电压") + private BigDecimal VT; +} diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java b/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java index 16fb503..4488b4c 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java @@ -33,6 +33,10 @@ WhjkSzqData("WhjkSzqData","公司水质船"), InwamntData("InwamntData","供水厂入水数据-水源地数据"), OutwamntData("OutwamntData","供水厂出水数据"), + GwYsQData("GwYsQData","雨水管网流量监测数据"), + GwYsLData("GwYsLData","雨水管网水位监测数据"), + GwWsQData("GwWsQData","污水管网流量监测数据"), + GwWsLData("GwWsLData"," 污水管网水位监测数据"), ; 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 c3a3e2f..bebfb26 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java @@ -125,7 +125,15 @@ }else if(xfDataEnum == XfDataEnum.OutwamntData){ List surgeTankDataList = JSONObject.parseArray(data, WrOutwamntRDataDto.class); DTO = surgeTankDataList.stream().map(WrOutwamntRData::dtoToDto).collect(Collectors.toList()); - }else { + } + else if(xfDataEnum == XfDataEnum.GwWsLData + ||xfDataEnum == XfDataEnum.GwWsQData + ||xfDataEnum == XfDataEnum.GwYsLData + ||xfDataEnum == XfDataEnum.GwYsQData){ + DTO = JSONObject.parseArray(data, WsLData.class); +// DTO = surgeTankDataList.stream().map(WrOutwamntRData::dtoToDto).collect(Collectors.toList()); + } + else { throw new RuntimeException("暂未开发"); } } @@ -312,6 +320,14 @@ }else if(xfDataEnum == XfDataEnum.OutwamntData){ WrOutwamntRDataDto surgeTankData = JSONObject.parseObject(data, WrOutwamntRDataDto.class); model = RealTimeSerializer.xfObjectToRealMap(WrOutwamntRData.dtoToDto(surgeTankData)); + } + else if(xfDataEnum == XfDataEnum.GwWsLData + ||xfDataEnum == XfDataEnum.GwWsQData + ||xfDataEnum == XfDataEnum.GwYsLData + ||xfDataEnum == XfDataEnum.GwYsQData){ + WsLData DTO = JSONObject.parseObject(data, WsLData.class); + model = RealTimeSerializer.xfObjectToRealMap(DTO); +// DTO = surgeTankDataList.stream().map(WrOutwamntRData::dtoToDto).collect(Collectors.toList()); }else { throw new RuntimeException("暂未开发"); } diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/entity/WsLData.java b/src/main/java/org/springnewfiber/dataadapter/xf/entity/WsLData.java new file mode 100644 index 0000000..cc55b12 --- /dev/null +++ b/src/main/java/org/springnewfiber/dataadapter/xf/entity/WsLData.java @@ -0,0 +1,28 @@ +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 WsLData extends BaseXfInterfaceEntity{ + @JsonProperty(value ="q") + @ApiModelProperty(value = "水表1每小时水量(立方米/小时)") + private BigDecimal SBL1; + @JsonProperty(value ="cq1") + @ApiModelProperty(value = "累计流量1(立方米)") + private BigDecimal CQ1; + @JsonProperty(value ="z") + @ApiModelProperty(value = "瞬时河道水位、潮位(米）") + private BigDecimal Z; + @JsonProperty(value ="zt") + @ApiModelProperty(value = "遥测站状态及报警信息") + private String ZT; + @JsonProperty(value ="va") + @ApiModelProperty(value = "断面平均流速(米/秒）") + private BigDecimal VA; + @JsonProperty(value ="vt") + @ApiModelProperty(value = "电源电压") + private BigDecimal VT; +} diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/entity/WsQData.java b/src/main/java/org/springnewfiber/dataadapter/xf/entity/WsQData.java new file mode 100644 index 0000000..75ab843 --- /dev/null +++ b/src/main/java/org/springnewfiber/dataadapter/xf/entity/WsQData.java @@ -0,0 +1,28 @@ +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 WsQData extends BaseXfInterfaceEntity{ + @JsonProperty(value ="q") + @ApiModelProperty(value = "水表1每小时水量(立方米/小时)") + private BigDecimal SBL1; + @JsonProperty(value ="cq1") + @ApiModelProperty(value = "累计流量1(立方米)") + private BigDecimal CQ1; + @JsonProperty(value ="z") + @ApiModelProperty(value = "瞬时河道水位、潮位(米）") + private BigDecimal Z; + @JsonProperty(value ="zt") + @ApiModelProperty(value = "遥测站状态及报警信息") + private String ZT; + @JsonProperty(value ="va") + @ApiModelProperty(value = "断面平均流速(米/秒）") + private BigDecimal VA; + @JsonProperty(value ="vt") + @ApiModelProperty(value = "电源电压") + private BigDecimal VT; +} diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java b/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java index 16fb503..4488b4c 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java @@ -33,6 +33,10 @@ WhjkSzqData("WhjkSzqData","公司水质船"), InwamntData("InwamntData","供水厂入水数据-水源地数据"), OutwamntData("OutwamntData","供水厂出水数据"), + GwYsQData("GwYsQData","雨水管网流量监测数据"), + GwYsLData("GwYsLData","雨水管网水位监测数据"), + GwWsQData("GwWsQData","污水管网流量监测数据"), + GwWsLData("GwWsLData"," 污水管网水位监测数据"), ; 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 c3a3e2f..bebfb26 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java @@ -125,7 +125,15 @@ }else if(xfDataEnum == XfDataEnum.OutwamntData){ List surgeTankDataList = JSONObject.parseArray(data, WrOutwamntRDataDto.class); DTO = surgeTankDataList.stream().map(WrOutwamntRData::dtoToDto).collect(Collectors.toList()); - }else { + } + else if(xfDataEnum == XfDataEnum.GwWsLData + ||xfDataEnum == XfDataEnum.GwWsQData + ||xfDataEnum == XfDataEnum.GwYsLData + ||xfDataEnum == XfDataEnum.GwYsQData){ + DTO = JSONObject.parseArray(data, WsLData.class); +// DTO = surgeTankDataList.stream().map(WrOutwamntRData::dtoToDto).collect(Collectors.toList()); + } + else { throw new RuntimeException("暂未开发"); } } @@ -312,6 +320,14 @@ }else if(xfDataEnum == XfDataEnum.OutwamntData){ WrOutwamntRDataDto surgeTankData = JSONObject.parseObject(data, WrOutwamntRDataDto.class); model = RealTimeSerializer.xfObjectToRealMap(WrOutwamntRData.dtoToDto(surgeTankData)); + } + else if(xfDataEnum == XfDataEnum.GwWsLData + ||xfDataEnum == XfDataEnum.GwWsQData + ||xfDataEnum == XfDataEnum.GwYsLData + ||xfDataEnum == XfDataEnum.GwYsQData){ + WsLData DTO = JSONObject.parseObject(data, WsLData.class); + model = RealTimeSerializer.xfObjectToRealMap(DTO); +// DTO = surgeTankDataList.stream().map(WrOutwamntRData::dtoToDto).collect(Collectors.toList()); }else { throw new RuntimeException("暂未开发"); } diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/entity/WsLData.java b/src/main/java/org/springnewfiber/dataadapter/xf/entity/WsLData.java new file mode 100644 index 0000000..cc55b12 --- /dev/null +++ b/src/main/java/org/springnewfiber/dataadapter/xf/entity/WsLData.java @@ -0,0 +1,28 @@ +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 WsLData extends BaseXfInterfaceEntity{ + @JsonProperty(value ="q") + @ApiModelProperty(value = "水表1每小时水量(立方米/小时)") + private BigDecimal SBL1; + @JsonProperty(value ="cq1") + @ApiModelProperty(value = "累计流量1(立方米)") + private BigDecimal CQ1; + @JsonProperty(value ="z") + @ApiModelProperty(value = "瞬时河道水位、潮位(米）") + private BigDecimal Z; + @JsonProperty(value ="zt") + @ApiModelProperty(value = "遥测站状态及报警信息") + private String ZT; + @JsonProperty(value ="va") + @ApiModelProperty(value = "断面平均流速(米/秒）") + private BigDecimal VA; + @JsonProperty(value ="vt") + @ApiModelProperty(value = "电源电压") + private BigDecimal VT; +} diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/entity/WsQData.java b/src/main/java/org/springnewfiber/dataadapter/xf/entity/WsQData.java new file mode 100644 index 0000000..75ab843 --- /dev/null +++ b/src/main/java/org/springnewfiber/dataadapter/xf/entity/WsQData.java @@ -0,0 +1,28 @@ +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 WsQData extends BaseXfInterfaceEntity{ + @JsonProperty(value ="q") + @ApiModelProperty(value = "水表1每小时水量(立方米/小时)") + private BigDecimal SBL1; + @JsonProperty(value ="cq1") + @ApiModelProperty(value = "累计流量1(立方米)") + private BigDecimal CQ1; + @JsonProperty(value ="z") + @ApiModelProperty(value = "瞬时河道水位、潮位(米）") + private BigDecimal Z; + @JsonProperty(value ="zt") + @ApiModelProperty(value = "遥测站状态及报警信息") + private String ZT; + @JsonProperty(value ="va") + @ApiModelProperty(value = "断面平均流速(米/秒）") + private BigDecimal VA; + @JsonProperty(value ="vt") + @ApiModelProperty(value = "电源电压") + private BigDecimal VT; +} diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/entity/YsLData.java b/src/main/java/org/springnewfiber/dataadapter/xf/entity/YsLData.java new file mode 100644 index 0000000..7e2bd6d --- /dev/null +++ b/src/main/java/org/springnewfiber/dataadapter/xf/entity/YsLData.java @@ -0,0 +1,28 @@ +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 YsLData extends BaseXfInterfaceEntity{ + @JsonProperty(value ="q") + @ApiModelProperty(value = "水表1每小时水量(立方米/小时)") + private BigDecimal SBL1; + @JsonProperty(value ="cq1") + @ApiModelProperty(value = "累计流量1(立方米)") + private BigDecimal CQ1; + @JsonProperty(value ="z") + @ApiModelProperty(value = "瞬时河道水位、潮位(米）") + private BigDecimal Z; + @JsonProperty(value ="zt") + @ApiModelProperty(value = "遥测站状态及报警信息") + private String ZT; + @JsonProperty(value ="va") + @ApiModelProperty(value = "断面平均流速(米/秒）") + private BigDecimal VA; + @JsonProperty(value ="vt") + @ApiModelProperty(value = "电源电压") + private BigDecimal VT; +} diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java b/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java index 16fb503..4488b4c 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java @@ -33,6 +33,10 @@ WhjkSzqData("WhjkSzqData","公司水质船"), InwamntData("InwamntData","供水厂入水数据-水源地数据"), OutwamntData("OutwamntData","供水厂出水数据"), + GwYsQData("GwYsQData","雨水管网流量监测数据"), + GwYsLData("GwYsLData","雨水管网水位监测数据"), + GwWsQData("GwWsQData","污水管网流量监测数据"), + GwWsLData("GwWsLData"," 污水管网水位监测数据"), ; 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 c3a3e2f..bebfb26 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java @@ -125,7 +125,15 @@ }else if(xfDataEnum == XfDataEnum.OutwamntData){ List surgeTankDataList = JSONObject.parseArray(data, WrOutwamntRDataDto.class); DTO = surgeTankDataList.stream().map(WrOutwamntRData::dtoToDto).collect(Collectors.toList()); - }else { + } + else if(xfDataEnum == XfDataEnum.GwWsLData + ||xfDataEnum == XfDataEnum.GwWsQData + ||xfDataEnum == XfDataEnum.GwYsLData + ||xfDataEnum == XfDataEnum.GwYsQData){ + DTO = JSONObject.parseArray(data, WsLData.class); +// DTO = surgeTankDataList.stream().map(WrOutwamntRData::dtoToDto).collect(Collectors.toList()); + } + else { throw new RuntimeException("暂未开发"); } } @@ -312,6 +320,14 @@ }else if(xfDataEnum == XfDataEnum.OutwamntData){ WrOutwamntRDataDto surgeTankData = JSONObject.parseObject(data, WrOutwamntRDataDto.class); model = RealTimeSerializer.xfObjectToRealMap(WrOutwamntRData.dtoToDto(surgeTankData)); + } + else if(xfDataEnum == XfDataEnum.GwWsLData + ||xfDataEnum == XfDataEnum.GwWsQData + ||xfDataEnum == XfDataEnum.GwYsLData + ||xfDataEnum == XfDataEnum.GwYsQData){ + WsLData DTO = JSONObject.parseObject(data, WsLData.class); + model = RealTimeSerializer.xfObjectToRealMap(DTO); +// DTO = surgeTankDataList.stream().map(WrOutwamntRData::dtoToDto).collect(Collectors.toList()); }else { throw new RuntimeException("暂未开发"); } diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/entity/WsLData.java b/src/main/java/org/springnewfiber/dataadapter/xf/entity/WsLData.java new file mode 100644 index 0000000..cc55b12 --- /dev/null +++ b/src/main/java/org/springnewfiber/dataadapter/xf/entity/WsLData.java @@ -0,0 +1,28 @@ +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 WsLData extends BaseXfInterfaceEntity{ + @JsonProperty(value ="q") + @ApiModelProperty(value = "水表1每小时水量(立方米/小时)") + private BigDecimal SBL1; + @JsonProperty(value ="cq1") + @ApiModelProperty(value = "累计流量1(立方米)") + private BigDecimal CQ1; + @JsonProperty(value ="z") + @ApiModelProperty(value = "瞬时河道水位、潮位(米）") + private BigDecimal Z; + @JsonProperty(value ="zt") + @ApiModelProperty(value = "遥测站状态及报警信息") + private String ZT; + @JsonProperty(value ="va") + @ApiModelProperty(value = "断面平均流速(米/秒）") + private BigDecimal VA; + @JsonProperty(value ="vt") + @ApiModelProperty(value = "电源电压") + private BigDecimal VT; +} diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/entity/WsQData.java b/src/main/java/org/springnewfiber/dataadapter/xf/entity/WsQData.java new file mode 100644 index 0000000..75ab843 --- /dev/null +++ b/src/main/java/org/springnewfiber/dataadapter/xf/entity/WsQData.java @@ -0,0 +1,28 @@ +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 WsQData extends BaseXfInterfaceEntity{ + @JsonProperty(value ="q") + @ApiModelProperty(value = "水表1每小时水量(立方米/小时)") + private BigDecimal SBL1; + @JsonProperty(value ="cq1") + @ApiModelProperty(value = "累计流量1(立方米)") + private BigDecimal CQ1; + @JsonProperty(value ="z") + @ApiModelProperty(value = "瞬时河道水位、潮位(米）") + private BigDecimal Z; + @JsonProperty(value ="zt") + @ApiModelProperty(value = "遥测站状态及报警信息") + private String ZT; + @JsonProperty(value ="va") + @ApiModelProperty(value = "断面平均流速(米/秒）") + private BigDecimal VA; + @JsonProperty(value ="vt") + @ApiModelProperty(value = "电源电压") + private BigDecimal VT; +} diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/entity/YsLData.java b/src/main/java/org/springnewfiber/dataadapter/xf/entity/YsLData.java new file mode 100644 index 0000000..7e2bd6d --- /dev/null +++ b/src/main/java/org/springnewfiber/dataadapter/xf/entity/YsLData.java @@ -0,0 +1,28 @@ +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 YsLData extends BaseXfInterfaceEntity{ + @JsonProperty(value ="q") + @ApiModelProperty(value = "水表1每小时水量(立方米/小时)") + private BigDecimal SBL1; + @JsonProperty(value ="cq1") + @ApiModelProperty(value = "累计流量1(立方米)") + private BigDecimal CQ1; + @JsonProperty(value ="z") + @ApiModelProperty(value = "瞬时河道水位、潮位(米）") + private BigDecimal Z; + @JsonProperty(value ="zt") + @ApiModelProperty(value = "遥测站状态及报警信息") + private String ZT; + @JsonProperty(value ="va") + @ApiModelProperty(value = "断面平均流速(米/秒）") + private BigDecimal VA; + @JsonProperty(value ="vt") + @ApiModelProperty(value = "电源电压") + private BigDecimal VT; +} diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/entity/YsQData.java b/src/main/java/org/springnewfiber/dataadapter/xf/entity/YsQData.java new file mode 100644 index 0000000..2ba6b34 --- /dev/null +++ b/src/main/java/org/springnewfiber/dataadapter/xf/entity/YsQData.java @@ -0,0 +1,35 @@ +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 YsQData extends BaseXfInterfaceEntity{ + @JsonProperty(value ="q") + @ApiModelProperty(value = "水表1每小时水量(立方米/小时)") + private BigDecimal SBL1; + @JsonProperty(value ="cq1") + @ApiModelProperty(value = "累计流量1(立方米)") + private BigDecimal CQ1; + @JsonProperty(value ="z") + @ApiModelProperty(value = "瞬时河道水位、潮位(米）") + private BigDecimal Z; + @JsonProperty(value ="zt") + @ApiModelProperty(value = "遥测站状态及报警信息") + private String ZT; + @JsonProperty(value ="va") + @ApiModelProperty(value = "断面平均流速(米/秒）") + private BigDecimal VA; + @JsonProperty(value ="vt") + @ApiModelProperty(value = "电源电压") + private BigDecimal VT; +// "SBL1" decimal(10,2) DEFAULT NULL COMMENT '水表1每小时水量(立方米/小时)', +// "CQ1" decimal(20,5) DEFAULT NULL COMMENT '累计流量1(立方米)', +// "Z" decimal(7,3) DEFAULT NULL COMMENT '瞬时河道水位、潮位(米）', +// "ZT" varchar(100) DEFAULT NULL COMMENT '遥测站状态及报警信息', +// "VA" decimal(5,3) DEFAULT NULL COMMENT '断面平均流速(米/秒）', +// "VT" decimal(4,2) DEFAULT NULL COMMENT '电源电压', + +}