autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-20 19:15:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 上传实时数据相关修改

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-03-13 16:27:42 +08:00
parent a9dbf8e888
commit b32f1ebfeb
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
jsowell-netty/src/main/java/com/jsowell/netty/handler/UploadRealTimeMonitorHandler.java
View File

@@ -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())