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 fa4211dd9..06dde627a 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 @@ -19,6 +19,7 @@ import com.jsowell.pile.domain.ThirdPartyStationRelation; import com.jsowell.pile.service.*; import com.jsowell.pile.vo.base.ThirdPartyStationRelationVO; import com.jsowell.thirdparty.lianlian.service.LianLianService; +import com.jsowell.thirdparty.zhongdianlian.service.ZDLService; import io.netty.channel.Channel; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -65,6 +66,9 @@ public class UploadRealTimeMonitorHandler extends AbstractHandler { @Autowired private RedisCache redisCache; + @Autowired + private ZDLService zdlService; + @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { log.info("[===获取桩上传的实时监测数据===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); @@ -292,7 +296,7 @@ public class UploadRealTimeMonitorHandler extends AbstractHandler { } try { - // 推送联联平台 + // 推送第三方平台 OrderBasicInfo orderInfo = orderBasicInfoService.getOrderInfoByTransactionCode(transactionCode); if (orderInfo == null) { return null; @@ -302,29 +306,36 @@ public class UploadRealTimeMonitorHandler extends AbstractHandler { if (StringUtils.equals(connectorStatus, pileStatus)) { return null; } - // 状态不一样,传给联联 - // 查询该站点是否推送联联平台 + // 状态不一样,传给第三方平台 + // 查询该站点是否推送第三方平台 ThirdPartyStationRelation relation = new ThirdPartyStationRelation(); if (StringUtils.isBlank(orderInfo.getStationId())) { return null; } relation.setStationId(Long.parseLong(orderInfo.getStationId())); ThirdPartyStationRelationVO relationInfo = thirdPartyStationRelationService.selectRelationInfo(relation); - // ThirdPartySettingInfo thirdPartySettingInfo = thirdPartySettingInfoService.getInfoByStationId(pileBasicInfo.getStationId()); if (Objects.nonNull(relationInfo)) { String pileConnectorCode = pileSn + connectorCode; - log.info("推送联联平台实时数据 params: orderBasicInfo:{}", JSON.toJSONString(orderInfo)); - // 设备状态变化推送 notification_stationStatus - lianLianService.pushConnectorStatus(pileConnectorCode, connectorStatus); - if (StringUtils.equals(connectorStatus, "03")) { - // 充电中 - lianLianService.pushPileChargeStatusChange(orderInfo.getOrderCode()); + if (StringUtils.equals("1", relationInfo.getThirdPartyType())) { + // 联联 + log.info("推送联联平台实时数据 params: orderBasicInfo:{}", JSON.toJSONString(orderInfo)); + // 设备状态变化推送 notification_stationStatus + lianLianService.pushConnectorStatus(pileConnectorCode, connectorStatus); + if (StringUtils.equals(connectorStatus, "03")) { + // 充电中 + lianLianService.pushPileChargeStatusChange(orderInfo.getOrderCode()); + } + // 推送充电状态 + lianLianService.pushChargeStatus(orderInfo.getOrderCode()); + }else if (StringUtils.equals("2", relationInfo.getThirdPartyType())) { + // 中电联 + log.info("推送中电联平台实时数据 params: orderBasicInfo:{}", JSON.toJSONString(orderInfo)); + zdlService.notificationStationStatus(pileConnectorCode, connectorStatus); } - // 推送充电状态 - lianLianService.pushChargeStatus(orderInfo.getOrderCode()); + } } catch (Exception e) { - log.error("推送联联平台 实时数据 异常", e); + log.error("推送第三方平台 实时数据 异常", e); } return null;