diff --git a/pom.xml b/pom.xml index 2357bcd..04b0ad3 100644 --- a/pom.xml +++ b/pom.xml @@ -211,6 +211,13 @@ + + org.apache.maven.plugins + maven-surefire-plugin + + true + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 2357bcd..04b0ad3 100644 --- a/pom.xml +++ b/pom.xml @@ -211,6 +211,13 @@ + + org.apache.maven.plugins + maven-surefire-plugin + + true + + \ No newline at end of file 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 7754baa..6c5d47a 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java @@ -1,5 +1,6 @@ package org.springnewfiber.dataadapter.xf.controller; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; @@ -10,6 +11,7 @@ import io.swagger.annotations.ApiParam; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.PostMapping; @@ -89,7 +91,7 @@ } else if (xfDataEnum == XfDataEnum.RiverData) { DTO = JSONObject.parseArray(data, MonitorRiverData.class); } else if (xfDataEnum == XfDataEnum.SoilData) { - List monitorSoilDataList = JSONObject.parseArray(data, MonitorSoilData.class); + List monitorSoilDataList = JSONObject.parseArray(data, MonitorSoilData.class); DTO = MonitorSoilData.coverDto(monitorSoilDataList); } else if (xfDataEnum == XfDataEnum.WasData) { DTO = JSONObject.parseArray(data, MonitorWasData.class); @@ -111,6 +113,19 @@ } if (CollUtil.isNotEmpty(DTO)) { DTO.forEach((i) -> { + //十八家高闸外 市局编号 0461610871 转换成0461610050 -3米 + if (StringUtils.equalsIgnoreCase(i.getStcd(), "0461610871")) { + MonitorChnlDataDto newI = (MonitorChnlDataDto) i; + MonitorChnlDataDto newDto = new MonitorChnlDataDto(); + BeanUtil.copyProperties(newI, newDto); + // + newDto.setStcd("0461610050"); + BigDecimal newZ = newDto.getZ().subtract(new BigDecimal(3)).setScale(2, BigDecimal.ROUND_DOWN); + newDto.setZ(newZ); + PtReceiveBaseModel newModel = RealTimeSerializer.xfObjectToRealMap(newDto); + log.error("0461610050:cover:{}", JSONObject.toJSONString(newModel)); + rabbitTemplate.convertAndSend(JSONObject.toJSONString(newModel)); + } PtReceiveBaseModel model = RealTimeSerializer.xfObjectToRealMap(i); log.info("cover:{}", JSONObject.toJSONString(model)); rabbitTemplate.convertAndSend(JSONObject.toJSONString(model)); @@ -150,8 +165,8 @@ data.setDrp(BigDecimal.ZERO); if (redis.exists(st) && (old = redis.get(st)) != null && tm.compareTo(old.getTm()) > 0) { if (DateUtil.offsetHour(old.getTm(), 1).compareTo(tm) == 0) { - BigDecimal p1=data.getPresum().subtract(old.getPresum()); - if(p1.compareTo(BigDecimal.ZERO)>-1){ + BigDecimal p1 = data.getPresum().subtract(old.getPresum()); + if (p1.compareTo(BigDecimal.ZERO) > -1) { data.setDrp(p1); } }