diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java b/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java index ae9b4a9..5106e9b 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java @@ -38,6 +38,7 @@ GwWsQData("GwWsQData","污水管网流量监测数据"), GwWsLData("GwWsLData"," 污水管网水位监测数据"), GwYsSZData("GwYsSZData"," 雨水管网水质监测数据"), + GqYlData("GqYlData", "港渠实时监测数据"), ; 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 ae9b4a9..5106e9b 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java @@ -38,6 +38,7 @@ GwWsQData("GwWsQData","污水管网流量监测数据"), GwWsLData("GwWsLData"," 污水管网水位监测数据"), GwYsSZData("GwYsSZData"," 雨水管网水质监测数据"), + GqYlData("GqYlData", "港渠实时监测数据"), ; 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 d1bff45..cdd0b40 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java @@ -136,6 +136,9 @@ DTO = JSONObject.parseArray(data, WsLData.class); // DTO = surgeTankDataList.stream().map(WrOutwamntRData::dtoToDto).collect(Collectors.toList()); } + else if(xfDataEnum == XfDataEnum.GqYlData) { + DTO = JSONObject.parseArray(data, GqYlDataDto.class); + } else { throw new RuntimeException("暂未开发"); } @@ -332,7 +335,12 @@ WsLData DTO = JSONObject.parseObject(data, WsLData.class); model = RealTimeSerializer.xfObjectToRealMap(DTO); // DTO = surgeTankDataList.stream().map(WrOutwamntRData::dtoToDto).collect(Collectors.toList()); - }else { + } + else if(xfDataEnum == XfDataEnum.GqYlData) { + GqYlDataDto dto = JSONObject.parseObject(data, GqYlDataDto.class); + model = RealTimeSerializer.xfObjectToRealMap(dto); + } + else { throw new RuntimeException("暂未开发"); } log.info("cover:{}", JSONObject.toJSONString(model)); diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java b/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java index ae9b4a9..5106e9b 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java @@ -38,6 +38,7 @@ GwWsQData("GwWsQData","污水管网流量监测数据"), GwWsLData("GwWsLData"," 污水管网水位监测数据"), GwYsSZData("GwYsSZData"," 雨水管网水质监测数据"), + GqYlData("GqYlData", "港渠实时监测数据"), ; 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 d1bff45..cdd0b40 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java @@ -136,6 +136,9 @@ DTO = JSONObject.parseArray(data, WsLData.class); // DTO = surgeTankDataList.stream().map(WrOutwamntRData::dtoToDto).collect(Collectors.toList()); } + else if(xfDataEnum == XfDataEnum.GqYlData) { + DTO = JSONObject.parseArray(data, GqYlDataDto.class); + } else { throw new RuntimeException("暂未开发"); } @@ -332,7 +335,12 @@ WsLData DTO = JSONObject.parseObject(data, WsLData.class); model = RealTimeSerializer.xfObjectToRealMap(DTO); // DTO = surgeTankDataList.stream().map(WrOutwamntRData::dtoToDto).collect(Collectors.toList()); - }else { + } + else if(xfDataEnum == XfDataEnum.GqYlData) { + GqYlDataDto dto = JSONObject.parseObject(data, GqYlDataDto.class); + model = RealTimeSerializer.xfObjectToRealMap(dto); + } + else { throw new RuntimeException("暂未开发"); } log.info("cover:{}", JSONObject.toJSONString(model)); diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/entity/GqYlDataDto.java b/src/main/java/org/springnewfiber/dataadapter/xf/entity/GqYlDataDto.java new file mode 100644 index 0000000..f3531bb --- /dev/null +++ b/src/main/java/org/springnewfiber/dataadapter/xf/entity/GqYlDataDto.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; + +/** + * 港渠监测信息接收实体 + * @author leo + * + */ +@Data +public class GqYlDataDto extends BaseXfInterfaceEntity{ + + @JsonProperty(value ="z") + @ApiModelProperty(value = "瞬时河道水位、潮位(米)") + private BigDecimal Z; + + @JsonProperty(value ="zt") + @ApiModelProperty(value = "遥测站状态及报警信息") + private String ZT; + + @JsonProperty(value ="vt") + @ApiModelProperty(value = "电源电压") + private BigDecimal VT; + +}