diff --git a/jsowell-admin/src/main/java/com/jsowell/service/PileService.java b/jsowell-admin/src/main/java/com/jsowell/service/PileService.java index fb30d89f8..0d289fae3 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/PileService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/PileService.java @@ -191,11 +191,11 @@ public class PileService { } // 判断桩是否在线 - boolean onLineStatus = pileConnectorInfoService.checkPileOffLine(pileInfoVO.getPileSn()); - if (!onLineStatus) { - // 离线 - throw new BusinessException(ReturnCodeEnum.CODE_PILE_CONNECTOR_STATUS_ERROR); - } + // boolean onLineStatus = pileConnectorInfoService.checkPileOffLine(pileInfoVO.getPileSn()); + // if (!onLineStatus) { + // // 离线 + // throw new BusinessException(ReturnCodeEnum.CODE_PILE_CONNECTOR_STATUS_ERROR); + // } // 查询站点信息 PileStationVO stationInfo = pileStationInfoService.getStationInfo(pileInfoVO.getStationId()); diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java index 4c0916fc7..e8ebab271 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java @@ -875,7 +875,7 @@ public class LianLianServiceImpl implements LianLianService { OrderInfo orderInfo = OrderInfo.builder() .operatorID(operatorId) .equipmentOwnerID(Constants.OPERATORID_LIANLIAN) - .stationID(orderBasicInfo.getStationId()) + .stationID("LC" + orderBasicInfo.getStationId()) .equipmentID(orderBasicInfo.getPileSn()) .connectorID(orderBasicInfo.getPileConnectorCode()) .startChargeSeq(orderCode) @@ -1361,18 +1361,18 @@ public class LianLianServiceImpl implements LianLianService { // 通过订单号查询信息 OrderBasicInfo orderInfo = orderBasicInfoService.getOrderInfoByOrderCode(orderCode); // 根据枪口号查询充电实时状态 - OrderBasicInfo orderBasicInfo = orderBasicInfoService.queryChargingByPileConnectorCode(orderInfo.getPileConnectorCode()); - List list = orderBasicInfoService.getChargingRealTimeData(orderBasicInfo.getTransactionCode()); + // OrderBasicInfo orderBasicInfo = orderBasicInfoService.queryChargingByPileConnectorCode(orderInfo.getPileConnectorCode()); + List list = orderBasicInfoService.getChargingRealTimeData(orderInfo.getTransactionCode()); RealTimeMonitorData realTimeMonitorData = list.get(0); // 拼装联联参数 ConnectorChargeStatusInfo info = ConnectorChargeStatusInfo.builder() - .startChargeSeq(orderBasicInfo.getOrderCode()) + .startChargeSeq(orderCode) .connectorID(orderInfo.getPileConnectorCode()) .connectorStatus(Integer.valueOf(realTimeMonitorData.getConnectorStatus())) .currentA(new BigDecimal(realTimeMonitorData.getOutputCurrent())) .voltageA(new BigDecimal(realTimeMonitorData.getOutputVoltage())) .soc(new BigDecimal(realTimeMonitorData.getSOC())) - .startTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, orderBasicInfo.getChargeStartTime())) + .startTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, orderInfo.getChargeStartTime())) .endTime(DateUtils.getTime()) .totalPower(new BigDecimal(realTimeMonitorData.getChargingDegree())) .elecMoney(new BigDecimal("0")) // TODO