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 ab2bb5a..da4044c 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java @@ -134,6 +134,9 @@ ||xfDataEnum == XfDataEnum.GwYsQData ||xfDataEnum==XfDataEnum.GwYsSZData){ DTO = JSONObject.parseArray(data, WsLData.class); + if(xfDataEnum==XfDataEnum.GwYsSZData){ + setZtoZB(DTO); + } // DTO = surgeTankDataList.stream().map(WrOutwamntRData::dtoToDto).collect(Collectors.toList()); } else if(xfDataEnum == XfDataEnum.GqYlData || xfDataEnum == XfDataEnum.GqSoilData) { @@ -177,6 +180,15 @@ throw new RuntimeException("类型转换错误"); } } + //雨水管网水质,因为是杆式水质站,zb频率为1小时,联系硬件将z水位不要高程,只用水深,当zb为null的时候,将z代表的水深,给入zb + public static void setZtoZB(List wsLDataList) { + wsLDataList.forEach(i->{ + if(i instanceof WsLData){ + ((WsLData) i).setZB(((WsLData) i).getZ()); + } + }); + } + private boolean checkDateTT(MonitorMeteorologicalData data) { Date tt = data.getTm();