diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/UploadRealTimeMonitorHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/UploadRealTimeMonitorHandler.java index bb59381bb..ea3a42e0c 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/UploadRealTimeMonitorHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/UploadRealTimeMonitorHandler.java @@ -376,13 +376,17 @@ public class UploadRealTimeMonitorHandler extends AbstractHandler { // 江苏省平台(充电状态至少一分钟推送一次) if (!StringUtils.equals(realTimeMonitorData.getConnectorStatus(), "03")) { // 如果不是充电状态,直接推送就可以 - nrService.pushPileStatus(realTimeMonitorData); + log.info("推送江苏省平台 非充电状态 params:{}", realTimeMonitorData); + String result = nrService.pushPileStatus(realTimeMonitorData); + log.info("推送江苏省平台 非充电状态 result:{}", result); }else { // 充电状态 // 如果缓存有数据,证明上次推送未超过一分钟,不予推送,若缓存中无数据,说明需要推送 if (cacheObject == null) { - nrService.pushPileStatus(realTimeMonitorData); + log.info("推送江苏省平台 充电状态 params:{}", realTimeMonitorData); + String result = nrService.pushPileStatus(realTimeMonitorData); redisCache.setCacheObject(redisKey, realTimeMonitorData, 1, TimeUnit.MINUTES); + log.info("推送江苏省平台 充电状态 result:{}", result); } } diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/nanrui/service/impl/NRServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/nanrui/service/impl/NRServiceImpl.java index 4f311956b..2fbfab6fb 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/nanrui/service/impl/NRServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/nanrui/service/impl/NRServiceImpl.java @@ -42,6 +42,7 @@ import com.jsowell.thirdparty.lianlian.vo.LianLianResultVO; import com.jsowell.thirdparty.nanrui.domain.*; import com.jsowell.thirdparty.nanrui.service.NRService; import com.jsowell.thirdparty.nanrui.util.QEncodeUtil; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.RandomStringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -61,6 +62,7 @@ import java.util.stream.Collectors; * @Date 2023/9/26 9:20 */ @Service +@Slf4j public class NRServiceImpl implements NRService { @Autowired @@ -433,6 +435,14 @@ public class NRServiceImpl implements NRService { } // 根据交易流水号查询订单信息 OrderBasicInfo orderBasicInfo = orderBasicInfoService.getOrderInfoByTransactionCode(transactionCode); + log.info("江苏省平台查询订单信息: {}", orderBasicInfo); + if (orderBasicInfo == null) { + return null; + } + if (StringUtils.isBlank(DateUtils.formatDateTime(orderBasicInfo.getChargeStartTime()))) { + log.error("江苏省平台查询订单信息, 充电开始时间为空: {}", orderBasicInfo); + return null; + } // 封装对象 NRConnectorStatusInfo nrConnectorStatusInfo = NRConnectorStatusInfo.builder() .connectorID(pileConnectorCode)