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 b5f16100f..eb17903f7 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 @@ -31,6 +31,7 @@ import com.jsowell.pile.service.programlogic.AbstractProgramLogic; import com.jsowell.pile.service.programlogic.ProgramLogicFactory; import com.jsowell.pile.vo.base.ThirdPartyStationRelationVO; import com.jsowell.pile.vo.web.PileStationVO; +import com.jsowell.thirdparty.hainan.service.HaiNanChargeService; import com.jsowell.thirdparty.huawei.HuaWeiService; import com.jsowell.thirdparty.lianlian.service.LianLianService; import com.jsowell.thirdparty.lutongyunting.service.LTYTService; @@ -114,6 +115,9 @@ public class TransactionRecordsRequestHandler extends AbstractHandler { @Autowired private HuaWeiService huaWeiService; + @Autowired + private HaiNanChargeService haiNanChargeService; + @Autowired private ThirdPartyParkingConfigService thirdPartyParkingConfigService; @@ -732,6 +736,10 @@ public class TransactionRecordsRequestHandler extends AbstractHandler { // 推送订单信息 huaWeiService.pushChargeOrderInfo(orderBasicInfo.getOrderCode()); } + if (StringUtils.equals(ThirdPlatformTypeEnum.HAI_NAN.getCode(), thirdPartyType)) { + // 海南平台 + haiNanChargeService.pushChargeOrderInfo(orderBasicInfo.getOrderCode()); + } if (StringUtils.equals(ThirdPlatformTypeEnum.YONG_CHENG_BO_CHE.getCode(), thirdPartyType)) { if (StringUtils.equals(orderBasicInfo.getStartMode(), StartModeEnum.THIRD_PARTY_PLATFORM.getValue())) { @@ -739,9 +747,9 @@ public class TransactionRecordsRequestHandler extends AbstractHandler { // 推送停止充电结果 ycbcService.pushStopChargeResult(orderBasicInfo.getOrderCode()); // 推送订单信息 - log.info("甬城泊车平台 推送充电订单信息 param:{}", orderBasicInfo.getOrderCode()); + // log.info("甬城泊车平台 推送充电订单信息 param:{}", orderBasicInfo.getOrderCode()); String result = ycbcService.pushChargeOrderInfo(orderBasicInfo.getOrderCode()); - log.info("甬城泊车平台 推送充电订单信息 result:{}", result); + // log.info("甬城泊车平台 推送充电订单信息 result:{}", result); } } } 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 6da87fadd..a0127ddce 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 @@ -23,6 +23,7 @@ import com.jsowell.pile.service.PileConnectorInfoService; import com.jsowell.pile.service.ThirdPartyStationRelationService; import com.jsowell.pile.service.OrderBasicInfoService; import com.jsowell.pile.vo.base.ThirdPartyStationRelationVO; +import com.jsowell.thirdparty.hainan.service.HaiNanChargeService; import com.jsowell.thirdparty.huawei.HuaWeiService; import com.jsowell.thirdparty.lianlian.service.LianLianService; import com.jsowell.thirdparty.nanrui.service.NRService; @@ -85,6 +86,9 @@ public class UploadRealTimeMonitorHandler extends AbstractHandler { @Autowired private NRService nrService; + @Autowired + private HaiNanChargeService haiNanChargeService; + @Autowired private XDTService xdtService; @@ -427,7 +431,10 @@ public class UploadRealTimeMonitorHandler extends AbstractHandler { } huaWeiService.notificationEquipChargeStatus(orderInfo.getOrderCode()); } - + if (StringUtils.equals(ThirdPlatformTypeEnum.HAI_NAN.getCode(), thirdPartyType)) { + // 海南平台 + haiNanChargeService.notificationStationStatus(pileConnectorCode, changedStatus); + } if (StringUtils.equals(ThirdPlatformTypeEnum.YONG_CHENG_BO_CHE.getCode(), thirdPartyType)) { // 甬城泊车 // log.info("推送甬城泊车平台设备状态变化推送 pileConnectorCode:{}, changedStatus:{}", pileConnectorCode, changedStatus);