diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/LianLianPlatformServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/LianLianPlatformServiceImpl.java index dafff5d8a..1393b40ea 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/LianLianPlatformServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/LianLianPlatformServiceImpl.java @@ -703,11 +703,15 @@ public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService { // OrderBasicInfo orderBasicInfo = orderBasicInfoService.queryChargingByPileConnectorCode(orderInfo.getPileConnectorCode()); List list = orderBasicInfoService.getChargingRealTimeData(orderInfo.getTransactionCode()); RealTimeMonitorData realTimeMonitorData = list.get(0); + //获取枪口状态 + PileConnectorInfoVO connectorInfoVO = pileConnectorInfoService.getPileConnectorInfoByConnectorCode(orderInfo.getPileConnectorCode()); + int connectorStatus = connectorInfoVO.getStatus(); // 拼装联联参数 ConnectorChargeStatusInfo info = ConnectorChargeStatusInfo.builder() .startChargeSeq(orderCode) .connectorID(orderInfo.getPileConnectorCode()) - .connectorStatus(Integer.valueOf(realTimeMonitorData.getConnectorStatus())) + //协议"1:空闲2:占用(未充电)3:占用(充电中)4:占用(预约锁定)5:未响应 6:启动中 7:放电中 8:充放电结束 9:充放电暂停 10:不可用 255:故障" + .connectorStatus(connectorStatus == 0 ? 10 : connectorStatus) .currentA(new BigDecimal(realTimeMonitorData.getOutputCurrent())) .voltageA(new BigDecimal(realTimeMonitorData.getOutputVoltage())) .soc(new BigDecimal(realTimeMonitorData.getSOC())) @@ -1596,7 +1600,7 @@ public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService { String dataSecretIv = lianLianPlatformSecretInfo.getTheirDataSecretIv(); String urlAddress = lianLianPlatformSecretInfo.getTheirUrlPrefix(); - String url = urlAddress + BusinessInformationExchangeEnum.NOTIFICATION_STOP_CHARGE_RESULT.getValue(); + String url = urlAddress + BusinessInformationExchangeEnum.NOTIFICATION_START_CHARGE_RESULT.getValue(); // 拼装联联平台参数 JSONObject json = new JSONObject(); @@ -1607,7 +1611,6 @@ public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService { String jsonString = JSON.toJSONString(json); - log.info("请求参数:{}", jsonString); String token = getToken(urlAddress, operatorId, operatorSecret, dataSecretIv, signSecret, dataSecret); String result = HttpRequestUtil.sendPost(token, jsonString, url, dataSecret, dataSecretIv, operatorId, signSecret);