diff --git a/jsowell-common/src/main/java/com/jsowell/common/core/domain/ykc/RealTimeMonitorData.java b/jsowell-common/src/main/java/com/jsowell/common/core/domain/ykc/RealTimeMonitorData.java index 6788ff5dd..7f8b20b61 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/core/domain/ykc/RealTimeMonitorData.java +++ b/jsowell-common/src/main/java/com/jsowell/common/core/domain/ykc/RealTimeMonitorData.java @@ -16,7 +16,7 @@ public class RealTimeMonitorData { /** * 交易流水号 */ - private String orderCode; + private String transactionCode; /** * 桩编号 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 5e7cc98a3..7177a8377 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 @@ -58,8 +58,8 @@ public class UploadRealTimeMonitorHandler extends AbstractHandler { // 交易流水号 byte[] orderCodeByteArr = BytesUtil.copyBytes(msgBody, startIndex, length); - String orderCode = BytesUtil.bcd2Str(orderCodeByteArr); - realTimeMonitorData.setOrderCode(orderCode); + String transactionCode = BytesUtil.bcd2Str(orderCodeByteArr); + realTimeMonitorData.setTransactionCode(transactionCode); // 桩编码 startIndex += length; @@ -225,7 +225,7 @@ public class UploadRealTimeMonitorHandler extends AbstractHandler { if (!StringUtils.equals(connectorStatus, "02")) { log.info("0x13上传实时监测数据==交易流水号:{}, 桩编号:{}, 枪号:{}, 状态:{}, 枪是否归位:{}, 是否插枪:{}, 输出电压:{}, 输出电流:{}, 枪线温度:{}, " + "枪线编码:{}, SOC:{}, 电池组最高温度:{}, 累计充电时间:{}, 剩余时间:{}, 充电度数:{}, 记损充电度数:{}, 已充金额:{}, " + - "硬件故障:{}, 故障码转换结果:{}", orderCode, pileSn, connectorCode, connectorStatus, homingFlag, putGunType, outputVoltage, + "硬件故障:{}, 故障码转换结果:{}", transactionCode, pileSn, connectorCode, connectorStatus, homingFlag, putGunType, outputVoltage, outputCurrent, gunLineTemperature, gunLineCode, SOC, batteryMaxTemperature, sumChargingTime, timeRemaining, chargingDegree, lossDegree, chargingAmount, hardwareFaultTemp, faultReason ); @@ -240,7 +240,8 @@ public class UploadRealTimeMonitorHandler extends AbstractHandler { pileBasicInfoService.saveRealTimeMonitorData2Redis(realTimeMonitorData); // 查询数据库中该订单当前信息 - OrderBasicInfo orderInfo = orderBasicInfoService.getOrderInfoByOrderCode(orderCode); + // OrderBasicInfo orderInfo = orderBasicInfoService.getOrderInfoByOrderCode(transactionCode); + OrderBasicInfo orderInfo = orderBasicInfoService.getOrderInfoByTransactionCode(transactionCode); if (Objects.nonNull(orderInfo)) { boolean updateFlag = false; if (StringUtils.equals(orderInfo.getOrderStatus(), OrderStatusEnum.NOT_START.getValue()) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java index 3ce9641e9..b7c7623c9 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java @@ -457,7 +457,7 @@ public class PileBasicInfoServiceImpl implements IPileBasicInfoService { @Override public void saveRealTimeMonitorData2Redis(RealTimeMonitorData realTimeMonitorData) { // 保存到redis - String redisKey = CacheConstants.PILE_REAL_TIME_MONITOR_DATA + realTimeMonitorData.getPileConnectorCode() + "_" + realTimeMonitorData.getOrderCode(); + String redisKey = CacheConstants.PILE_REAL_TIME_MONITOR_DATA + realTimeMonitorData.getPileConnectorCode() + "_" + realTimeMonitorData.getConnectorCode(); // 设置接收到实时数据的时间 Date now = new Date();