diff --git a/jsowell-common/src/main/java/com/jsowell/common/enums/thirdparty/ThirdPlatformTypeEnum.java b/jsowell-common/src/main/java/com/jsowell/common/enums/thirdparty/ThirdPlatformTypeEnum.java index 1afba031b..daa98a55a 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/enums/thirdparty/ThirdPlatformTypeEnum.java +++ b/jsowell-common/src/main/java/com/jsowell/common/enums/thirdparty/ThirdPlatformTypeEnum.java @@ -14,6 +14,7 @@ public enum ThirdPlatformTypeEnum { ZHONG_DIAN_LIAN_PLATFORM("2", "中电联平台"), JIANG_SU_PLATFORM("3", "江苏省平台"), YONG_CHENG_BO_CHE("4", "甬城泊车平台"), + XIN_DIAN_TU("5", "新电途平台"); ; private String code; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ChargeEndHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/ChargeEndHandler.java index bf3be3e8a..5e98f0484 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ChargeEndHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/ChargeEndHandler.java @@ -15,6 +15,7 @@ import com.jsowell.pile.service.IThirdPartySettingInfoService; import com.jsowell.pile.service.IThirdPartyStationRelationService; import com.jsowell.pile.vo.base.ThirdPartyStationRelationVO; import com.jsowell.thirdparty.lianlian.service.LianLianService; +import com.jsowell.thirdparty.xindiantu.service.XDTService; import com.jsowell.thirdparty.yongchengboche.service.YCBCService; import io.netty.channel.Channel; import lombok.extern.slf4j.Slf4j; @@ -48,6 +49,9 @@ public class ChargeEndHandler extends AbstractHandler{ @Autowired private YCBCService ycbcService; + @Autowired + private XDTService xdtService; + @Autowired private IThirdPartyStationRelationService thirdPartyStationRelationService; @@ -149,6 +153,11 @@ public class ChargeEndHandler extends AbstractHandler{ // 推送停止充电结果 lianLianService.pushStopChargeResult(orderInfo.getOrderCode()); } + // 新电途平台 + if (StringUtils.equals(ThirdPlatformTypeEnum.XIN_DIAN_TU.getCode(), relationInfo.getThirdPartyType())) { + // 推送停止充电结果 + xdtService.notificationStopChargeResult(orderInfo.getOrderCode()); + } // 甬城泊车平台 if (StringUtils.equals(ThirdPlatformTypeEnum.YONG_CHENG_BO_CHE.getCode(), relationInfo.getThirdPartyType())) { ycbcService.pushStopChargeResult(orderInfo.getOrderCode()); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/TransactionRecordsRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/TransactionRecordsRequestHandler.java index 320887462..6f5cc2bce 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/TransactionRecordsRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/TransactionRecordsRequestHandler.java @@ -35,6 +35,7 @@ import com.jsowell.thirdparty.lianlian.service.LianLianService; import com.jsowell.thirdparty.lutongyunting.service.LTYTService; import com.jsowell.thirdparty.nanrui.service.NRService; import com.jsowell.thirdparty.ruanjie.service.RJService; +import com.jsowell.thirdparty.xindiantu.service.XDTService; import com.jsowell.thirdparty.yongchengboche.service.YCBCService; import com.jsowell.thirdparty.zhongdianlian.service.ZDLService; import io.netty.channel.Channel; @@ -92,6 +93,9 @@ public class TransactionRecordsRequestHandler extends AbstractHandler { @Autowired private YCBCService ycbcService; + @Autowired + private XDTService xdtService; + @Autowired private IThirdPartyStationRelationService thirdPartyStationRelationService; @@ -705,6 +709,12 @@ public class TransactionRecordsRequestHandler extends AbstractHandler { // 推送订单信息 nrService.pushOrderInfo(orderBasicInfo.getOrderCode()); } + if (StringUtils.equals(ThirdPlatformTypeEnum.XIN_DIAN_TU.getCode(), thirdPartyType)) { + // 新电途平台 + // 推送订单信息 + xdtService.pushChargeOrderInfo(orderBasicInfo.getOrderCode()); + } + if (StringUtils.equals(ThirdPlatformTypeEnum.YONG_CHENG_BO_CHE.getCode(), thirdPartyType)) { if (StringUtils.equals(orderBasicInfo.getStartMode(), StartModeEnum.THIRD_PARTY_PLATFORM.getValue())) { // 甬城泊车 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 dee450a5a..bb59381bb 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 @@ -24,6 +24,7 @@ import com.jsowell.pile.service.IThirdPartyStationRelationService; import com.jsowell.pile.vo.base.ThirdPartyStationRelationVO; import com.jsowell.thirdparty.lianlian.service.LianLianService; import com.jsowell.thirdparty.nanrui.service.NRService; +import com.jsowell.thirdparty.xindiantu.service.XDTService; import com.jsowell.thirdparty.yongchengboche.service.YCBCService; import com.jsowell.thirdparty.zhongdianlian.service.ZDLService; import io.netty.channel.Channel; @@ -80,6 +81,9 @@ public class UploadRealTimeMonitorHandler extends AbstractHandler { @Autowired private NRService nrService; + @Autowired + private XDTService xdtService; + @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { // log.info("[===获取桩上传的实时监测数据===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); @@ -384,6 +388,13 @@ public class UploadRealTimeMonitorHandler extends AbstractHandler { // log.info("推送江苏省平台实时数据 result:{}", result); } + if (StringUtils.equals(ThirdPlatformTypeEnum.XIN_DIAN_TU.getCode(), relationInfo.getThirdPartyType())) { + // 新电途平台 + log.info("推送新电途平台设备状态变化推送 pileConnectorCode:{}, connectorStatus:{}", pileConnectorCode, connectorStatus); + String result = xdtService.notificationStationStatus(pileConnectorCode, connectorStatus); + log.info("推送新电途平台设备状态变化推送 result:{}", result); + } + if (StringUtils.equals(ThirdPlatformTypeEnum.YONG_CHENG_BO_CHE.getCode(), relationInfo.getThirdPartyType())) { // 甬城泊车 log.info("推送甬城泊车平台设备状态变化推送 pileConnectorCode:{}, connectorStatus:{}", pileConnectorCode, connectorStatus);