diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java b/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java index 13b9e17..4c23aca 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java @@ -30,6 +30,7 @@ DiverterWellData("DiverterWellData", "分流井监测数据"), StSlwtRData("StSlwtRData","其他水体监测数据"), dhgx_szq("dhgx_szq","东湖高新-水质船"), + WhjkSzqData("WhjkSzqData","公司水质船"), ; 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 13b9e17..4c23aca 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java @@ -30,6 +30,7 @@ DiverterWellData("DiverterWellData", "分流井监测数据"), StSlwtRData("StSlwtRData","其他水体监测数据"), dhgx_szq("dhgx_szq","东湖高新-水质船"), + WhjkSzqData("WhjkSzqData","公司水质船"), ; 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 06129bd..fb28744 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java @@ -110,7 +110,16 @@ } else if (xfDataEnum == XfDataEnum.DiverterWellData) { List diverterWellDataList = JSONObject.parseArray(data, DiverterWellData.class); DTO = diverterWellDataList.stream().map(DiverterWellDataDto::dataToDto).collect(Collectors.toList()); - } else { + } else if(xfDataEnum == XfDataEnum.WhjkSzqData){ + List szqDtos = JSONObject.parseArray(data, WhjkSzqDto.class); +// List DTO1= szqDtos.stream().map(WhjkSzqDto::dataToDto).collect(Collectors.toList()); +// DTO1.forEach(i->{ +// log.info("source:{}", JSONObject.toJSONString(i)); +// PtReceiveBaseModel model = RealTimeSerializer.xfObjectToRealMap(i); +// log.info("cover:{}", JSONObject.toJSONString(model)); +// }); + DTO= szqDtos.stream().map(WhjkSzqDto::dataToDto).collect(Collectors.toList()); + }else { throw new RuntimeException("暂未开发"); } } @@ -288,7 +297,10 @@ } else if (xfDataEnum == XfDataEnum.DiverterWellData) { DiverterWellData diverterWellData = JSONObject.parseObject(data, DiverterWellData.class); model = RealTimeSerializer.xfObjectToRealMap(DiverterWellDataDto.dataToDto(diverterWellData)); - } else { + } else if(xfDataEnum == XfDataEnum.WhjkSzqData){ + WhjkSzqDto szqDto = JSONObject.parseObject(data, WhjkSzqDto.class); + model = RealTimeSerializer.xfObjectToRealMap(WhjkSzqDto.dataToDto(szqDto)); + }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 13b9e17..4c23aca 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java @@ -30,6 +30,7 @@ DiverterWellData("DiverterWellData", "分流井监测数据"), StSlwtRData("StSlwtRData","其他水体监测数据"), dhgx_szq("dhgx_szq","东湖高新-水质船"), + WhjkSzqData("WhjkSzqData","公司水质船"), ; 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 06129bd..fb28744 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java @@ -110,7 +110,16 @@ } else if (xfDataEnum == XfDataEnum.DiverterWellData) { List diverterWellDataList = JSONObject.parseArray(data, DiverterWellData.class); DTO = diverterWellDataList.stream().map(DiverterWellDataDto::dataToDto).collect(Collectors.toList()); - } else { + } else if(xfDataEnum == XfDataEnum.WhjkSzqData){ + List szqDtos = JSONObject.parseArray(data, WhjkSzqDto.class); +// List DTO1= szqDtos.stream().map(WhjkSzqDto::dataToDto).collect(Collectors.toList()); +// DTO1.forEach(i->{ +// log.info("source:{}", JSONObject.toJSONString(i)); +// PtReceiveBaseModel model = RealTimeSerializer.xfObjectToRealMap(i); +// log.info("cover:{}", JSONObject.toJSONString(model)); +// }); + DTO= szqDtos.stream().map(WhjkSzqDto::dataToDto).collect(Collectors.toList()); + }else { throw new RuntimeException("暂未开发"); } } @@ -288,7 +297,10 @@ } else if (xfDataEnum == XfDataEnum.DiverterWellData) { DiverterWellData diverterWellData = JSONObject.parseObject(data, DiverterWellData.class); model = RealTimeSerializer.xfObjectToRealMap(DiverterWellDataDto.dataToDto(diverterWellData)); - } else { + } else if(xfDataEnum == XfDataEnum.WhjkSzqData){ + WhjkSzqDto szqDto = JSONObject.parseObject(data, WhjkSzqDto.class); + model = RealTimeSerializer.xfObjectToRealMap(WhjkSzqDto.dataToDto(szqDto)); + }else { throw new RuntimeException("暂未开发"); } log.info("cover:{}", JSONObject.toJSONString(model)); diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/entity/WhjkSzqData.java b/src/main/java/org/springnewfiber/dataadapter/xf/entity/WhjkSzqData.java new file mode 100644 index 0000000..3be98b5 --- /dev/null +++ b/src/main/java/org/springnewfiber/dataadapter/xf/entity/WhjkSzqData.java @@ -0,0 +1,84 @@ +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 WhjkSzqData extends BaseXfInterfaceEntity{ + + @JsonProperty(value ="c") + @ApiModelProperty(value = "水温") + private BigDecimal wt; + @JsonProperty(value ="codmn") + @ApiModelProperty(value = "化学需氧量") + private BigDecimal codcr; + @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; + @JsonProperty(value ="redox") + @ApiModelProperty(value = "氧化还原电位") + private BigDecimal redox; + @JsonProperty(value ="z") + @ApiModelProperty(value = "水深(m)") + private BigDecimal dpz; + + @JsonProperty(value ="us") + @ApiModelProperty(value = "风速(m/s)") + private BigDecimal wind_speed; + + @JsonProperty(value ="uc") + @ApiModelProperty(value = "风向(°)") + private BigDecimal wind_angle; + + @JsonProperty(value ="p1") + @ApiModelProperty(value = "降雨量(mm)") + private BigDecimal drp; + + @JsonProperty(value ="qspeed") + @ApiModelProperty(value = "船速(m/s)") + private BigDecimal speed; + + @JsonProperty(value ="ai") + @ApiModelProperty(value = "气温(℃)") + private BigDecimal tem; + + @JsonProperty(value ="fl") + @ApiModelProperty(value = "大气压(Pa)") + private BigDecimal pre; + + @JsonProperty(value ="mst") + @ApiModelProperty(value = "湿度(%RH)") + private BigDecimal rhu; + + @JsonProperty(value ="imli") + @ApiModelProperty(value = "光照强度(Lux)") + private BigDecimal imli; + + @JsonProperty(value ="lgtd") + @ApiModelProperty(value = "经度") + private BigDecimal lgtd; + + @JsonProperty(value ="lttd") + @ApiModelProperty(value = "纬度") + private BigDecimal lttd; + + @JsonProperty(value ="geo") + @ApiModelProperty(value = "地磁角度(°)") + private BigDecimal geo; + + +} diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java b/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java index 13b9e17..4c23aca 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java @@ -30,6 +30,7 @@ DiverterWellData("DiverterWellData", "分流井监测数据"), StSlwtRData("StSlwtRData","其他水体监测数据"), dhgx_szq("dhgx_szq","东湖高新-水质船"), + WhjkSzqData("WhjkSzqData","公司水质船"), ; 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 06129bd..fb28744 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java @@ -110,7 +110,16 @@ } else if (xfDataEnum == XfDataEnum.DiverterWellData) { List diverterWellDataList = JSONObject.parseArray(data, DiverterWellData.class); DTO = diverterWellDataList.stream().map(DiverterWellDataDto::dataToDto).collect(Collectors.toList()); - } else { + } else if(xfDataEnum == XfDataEnum.WhjkSzqData){ + List szqDtos = JSONObject.parseArray(data, WhjkSzqDto.class); +// List DTO1= szqDtos.stream().map(WhjkSzqDto::dataToDto).collect(Collectors.toList()); +// DTO1.forEach(i->{ +// log.info("source:{}", JSONObject.toJSONString(i)); +// PtReceiveBaseModel model = RealTimeSerializer.xfObjectToRealMap(i); +// log.info("cover:{}", JSONObject.toJSONString(model)); +// }); + DTO= szqDtos.stream().map(WhjkSzqDto::dataToDto).collect(Collectors.toList()); + }else { throw new RuntimeException("暂未开发"); } } @@ -288,7 +297,10 @@ } else if (xfDataEnum == XfDataEnum.DiverterWellData) { DiverterWellData diverterWellData = JSONObject.parseObject(data, DiverterWellData.class); model = RealTimeSerializer.xfObjectToRealMap(DiverterWellDataDto.dataToDto(diverterWellData)); - } else { + } else if(xfDataEnum == XfDataEnum.WhjkSzqData){ + WhjkSzqDto szqDto = JSONObject.parseObject(data, WhjkSzqDto.class); + model = RealTimeSerializer.xfObjectToRealMap(WhjkSzqDto.dataToDto(szqDto)); + }else { throw new RuntimeException("暂未开发"); } log.info("cover:{}", JSONObject.toJSONString(model)); diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/entity/WhjkSzqData.java b/src/main/java/org/springnewfiber/dataadapter/xf/entity/WhjkSzqData.java new file mode 100644 index 0000000..3be98b5 --- /dev/null +++ b/src/main/java/org/springnewfiber/dataadapter/xf/entity/WhjkSzqData.java @@ -0,0 +1,84 @@ +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 WhjkSzqData extends BaseXfInterfaceEntity{ + + @JsonProperty(value ="c") + @ApiModelProperty(value = "水温") + private BigDecimal wt; + @JsonProperty(value ="codmn") + @ApiModelProperty(value = "化学需氧量") + private BigDecimal codcr; + @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; + @JsonProperty(value ="redox") + @ApiModelProperty(value = "氧化还原电位") + private BigDecimal redox; + @JsonProperty(value ="z") + @ApiModelProperty(value = "水深(m)") + private BigDecimal dpz; + + @JsonProperty(value ="us") + @ApiModelProperty(value = "风速(m/s)") + private BigDecimal wind_speed; + + @JsonProperty(value ="uc") + @ApiModelProperty(value = "风向(°)") + private BigDecimal wind_angle; + + @JsonProperty(value ="p1") + @ApiModelProperty(value = "降雨量(mm)") + private BigDecimal drp; + + @JsonProperty(value ="qspeed") + @ApiModelProperty(value = "船速(m/s)") + private BigDecimal speed; + + @JsonProperty(value ="ai") + @ApiModelProperty(value = "气温(℃)") + private BigDecimal tem; + + @JsonProperty(value ="fl") + @ApiModelProperty(value = "大气压(Pa)") + private BigDecimal pre; + + @JsonProperty(value ="mst") + @ApiModelProperty(value = "湿度(%RH)") + private BigDecimal rhu; + + @JsonProperty(value ="imli") + @ApiModelProperty(value = "光照强度(Lux)") + private BigDecimal imli; + + @JsonProperty(value ="lgtd") + @ApiModelProperty(value = "经度") + private BigDecimal lgtd; + + @JsonProperty(value ="lttd") + @ApiModelProperty(value = "纬度") + private BigDecimal lttd; + + @JsonProperty(value ="geo") + @ApiModelProperty(value = "地磁角度(°)") + private BigDecimal geo; + + +} diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/entity/WhjkSzqDto.java b/src/main/java/org/springnewfiber/dataadapter/xf/entity/WhjkSzqDto.java new file mode 100644 index 0000000..4ad5c7b --- /dev/null +++ b/src/main/java/org/springnewfiber/dataadapter/xf/entity/WhjkSzqDto.java @@ -0,0 +1,64 @@ +package org.springnewfiber.dataadapter.xf.entity; + +import cn.hutool.core.bean.BeanUtil; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; +@Data +public class WhjkSzqDto { + @ApiModelProperty(value = "船舶编号") + private String bid; + @ApiModelProperty(value = "湖泊名称") + private String lknm; + @ApiModelProperty(value = "时间") + private Date tm; + @ApiModelProperty(value = "水温") + private BigDecimal wt; + @ApiModelProperty(value = "化学需氧量") + private BigDecimal codcr; + @ApiModelProperty(value = "溶解氧") + private BigDecimal dox; + @ApiModelProperty(value = "浊度") + private BigDecimal turb; + @ApiModelProperty(value = "电导率") + private BigDecimal cond; + @ApiModelProperty(value = "酸碱度") + private BigDecimal ph; + @ApiModelProperty(value = "氨氮") + private BigDecimal nh3n; + @ApiModelProperty(value = "氧化还原电位") + private BigDecimal redox; + @ApiModelProperty(value = "水深(m)") + private BigDecimal dpz; + @ApiModelProperty(value = "风速(m/s)") + private BigDecimal wind_speed; + @ApiModelProperty(value = "风向(°)") + private BigDecimal wind_angle; + @ApiModelProperty(value = "降雨量(mm)") + private BigDecimal drp; + @ApiModelProperty(value = "船速(m/s)") + private BigDecimal speed; + @ApiModelProperty(value = "气温(℃)") + private BigDecimal tem; + @ApiModelProperty(value = "大气压(Pa)") + private BigDecimal pre; + @ApiModelProperty(value = "湿度(%RH)") + private BigDecimal rhu; + @ApiModelProperty(value = "光照强度(Lux)") + private BigDecimal imli; + @ApiModelProperty(value = "经度") + private BigDecimal lgtd; + @ApiModelProperty(value = "纬度") + private BigDecimal lttd; + @ApiModelProperty(value = "地磁角度(°)") + private BigDecimal geo; + public static WhjkSzqData dataToDto(WhjkSzqDto data) { + WhjkSzqData dto = new WhjkSzqData(); + BeanUtil.copyProperties(data, dto); + dto.setStnm(data.getLknm()); + dto.setStcd(data.getBid()); + return dto; + } +}