autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-06-11 18:59:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
YAS\29473
2025-11-27 14:20:49 +08:00
parent 020ff30a2b 2916d1ecaf
commit 235d938a6d
4 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jsowell-netty/src/main/java/com/jsowell/netty/service/electricbicycles/impl/EBikeBusinessServiceImpl.java
View File

@@ -86,7 +86,7 @@ public class EBikeBusinessServiceImpl implements EBikeBusinessService {
// pileMsgRecordService.save(pileSn, pileSn, type, jsonMsg, ""); // pileMsgRecordService.save(pileSn, pileSn, type, jsonMsg, "");
SavePileMsgDTO dto = SavePileMsgDTO.builder() SavePileMsgDTO dto = SavePileMsgDTO.builder()
.pileSn(pileSn) .pileSn(pileSn)
.connectorCode(pileSn) .connectorCode("")
.transactionCode("") .transactionCode("")
.frameType(type) .frameType(type)
.jsonMsg(jsonMsg) .jsonMsg(jsonMsg)

2
jsowell-netty/src/main/java/com/jsowell/netty/service/yunkuaichong/impl/YKCBusinessServiceImpl.java
View File

@@ -88,7 +88,7 @@ public class YKCBusinessServiceImpl implements YKCBusinessService {
// pileMsgRecordService.save(pileSn, pileSn, type, jsonMsg, ""); // pileMsgRecordService.save(pileSn, pileSn, type, jsonMsg, "");
SavePileMsgDTO dto = SavePileMsgDTO.builder() SavePileMsgDTO dto = SavePileMsgDTO.builder()
.pileSn(pileSn) .pileSn(pileSn)
.connectorCode(pileSn) .connectorCode("")
.transactionCode("") .transactionCode("")
.frameType(type) .frameType(type)
.jsonMsg(jsonMsg) .jsonMsg(jsonMsg)

2
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ChargeAlgorithmRecordServiceImpl.java
View File

@@ -134,7 +134,7 @@ public class ChargeAlgorithmRecordServiceImpl implements ChargeAlgorithmRecordSe
// 2-pdf 端 // 2-pdf 端
return record.getPdfUrl(); return record.getPdfUrl();
} }
return null; return "";
} }
/** /**

2
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMsgRecordServiceImpl.java
View File

@@ -73,9 +73,11 @@ public class PileMsgRecordServiceImpl implements PileMsgRecordService {
PileMsgRecord pileMsgRecord = new PileMsgRecord(); PileMsgRecord pileMsgRecord = new PileMsgRecord();
pileMsgRecord.setPileSn(pileSn); pileMsgRecord.setPileSn(pileSn);
pileMsgRecord.setConnectorCode(connectorCode);
pileMsgRecord.setTransactionCode(transactionCode); pileMsgRecord.setTransactionCode(transactionCode);
// 如果pileSn与connectorCode都不为空，则设置pileConnectorCode为pileSn+connectorCode // 如果pileSn与connectorCode都不为空，则设置pileConnectorCode为pileSn+connectorCode
if (StringUtils.isNotBlank(pileSn) && StringUtils.isNotBlank(connectorCode)) { if (StringUtils.isNotBlank(pileSn) && StringUtils.isNotBlank(connectorCode)) {
// log.info("保存桩消息记录 -pileSn: {}, connectorCode: {}, length:{}", pileSn, connectorCode, (pileSn + connectorCode).length());
pileMsgRecord.setPileConnectorCode(pileSn + connectorCode); pileMsgRecord.setPileConnectorCode(pileSn + connectorCode);
} }
pileMsgRecord.setFrameType(frameType); pileMsgRecord.setFrameType(frameType);