From b4416ebcffe8fc0a59b86540742423367febba44 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Tue, 11 Nov 2025 09:12:48 +0800 Subject: [PATCH 1/5] =?UTF-8?q?pilemsgrecord=E4=B8=8D=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E6=A1=A9=E7=BC=96=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jsowell/pile/service/impl/PileMsgRecordServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMsgRecordServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMsgRecordServiceImpl.java index d33cf1f03..6f485e137 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMsgRecordServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMsgRecordServiceImpl.java @@ -76,7 +76,7 @@ public class PileMsgRecordServiceImpl implements PileMsgRecordService { pileMsgRecord.setTransactionCode(transactionCode); // 如果pileSn与connectorCode都不为空，则设置pileConnectorCode为pileSn+connectorCode if (StringUtils.isNotBlank(pileSn) && StringUtils.isNotBlank(connectorCode)) { - pileMsgRecord.setPileConnectorCode(pileSn + connectorCode); + // pileMsgRecord.setPileConnectorCode(pileSn + connectorCode); } pileMsgRecord.setFrameType(frameType); pileMsgRecord.setJsonMsg(jsonMsg); From d7ead9364b5dba594f804f21110b59f9917b6037 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Tue, 11 Nov 2025 09:14:03 +0800 Subject: [PATCH 2/5] =?UTF-8?q?pilemsgrecord=E4=B8=8D=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E6=A1=A9=E7=BC=96=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsowell/pile/service/impl/PileMsgRecordServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMsgRecordServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMsgRecordServiceImpl.java index 6f485e137..61ef22233 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMsgRecordServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMsgRecordServiceImpl.java @@ -76,7 +76,9 @@ public class PileMsgRecordServiceImpl implements PileMsgRecordService { pileMsgRecord.setTransactionCode(transactionCode); // 如果pileSn与connectorCode都不为空，则设置pileConnectorCode为pileSn+connectorCode if (StringUtils.isNotBlank(pileSn) && StringUtils.isNotBlank(connectorCode)) { - // pileMsgRecord.setPileConnectorCode(pileSn + connectorCode); + String s = pileSn + connectorCode; + log.info("保存桩消息记录 -pileSn: {}, connectorCode: {}, length:{}", pileSn, connectorCode, s.length()); + // pileMsgRecord.setPileConnectorCode(); } pileMsgRecord.setFrameType(frameType); pileMsgRecord.setJsonMsg(jsonMsg); From 546c2ee5314c9a2ed4abaad462e91e7e99c344a2 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Tue, 11 Nov 2025 09:46:11 +0800 Subject: [PATCH 3/5] =?UTF-8?q?update=20pileMsgRecord=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E5=85=85=E7=94=B5=E6=A1=A9=E7=BC=96=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../electricbicycles/impl/EBikeBusinessServiceImpl.java | 2 +- .../service/yunkuaichong/impl/YKCBusinessServiceImpl.java | 2 +- .../jsowell/pile/service/impl/PileMsgRecordServiceImpl.java | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/service/electricbicycles/impl/EBikeBusinessServiceImpl.java b/jsowell-netty/src/main/java/com/jsowell/netty/service/electricbicycles/impl/EBikeBusinessServiceImpl.java index 4b8e2c419..76c5ebbc7 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/service/electricbicycles/impl/EBikeBusinessServiceImpl.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/service/electricbicycles/impl/EBikeBusinessServiceImpl.java @@ -86,7 +86,7 @@ public class EBikeBusinessServiceImpl implements EBikeBusinessService { // pileMsgRecordService.save(pileSn, pileSn, type, jsonMsg, ""); SavePileMsgDTO dto = SavePileMsgDTO.builder() .pileSn(pileSn) - .connectorCode(pileSn) + .connectorCode("") .transactionCode("") .frameType(type) .jsonMsg(jsonMsg) diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/service/yunkuaichong/impl/YKCBusinessServiceImpl.java b/jsowell-netty/src/main/java/com/jsowell/netty/service/yunkuaichong/impl/YKCBusinessServiceImpl.java index 755ed1307..e83ac5abe 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/service/yunkuaichong/impl/YKCBusinessServiceImpl.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/service/yunkuaichong/impl/YKCBusinessServiceImpl.java @@ -88,7 +88,7 @@ public class YKCBusinessServiceImpl implements YKCBusinessService { // pileMsgRecordService.save(pileSn, pileSn, type, jsonMsg, ""); SavePileMsgDTO dto = SavePileMsgDTO.builder() .pileSn(pileSn) - .connectorCode(pileSn) + .connectorCode("") .transactionCode("") .frameType(type) .jsonMsg(jsonMsg) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMsgRecordServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMsgRecordServiceImpl.java index 61ef22233..aa31ad2d9 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMsgRecordServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMsgRecordServiceImpl.java @@ -73,12 +73,12 @@ public class PileMsgRecordServiceImpl implements PileMsgRecordService { PileMsgRecord pileMsgRecord = new PileMsgRecord(); pileMsgRecord.setPileSn(pileSn); + pileMsgRecord.setConnectorCode(connectorCode); pileMsgRecord.setTransactionCode(transactionCode); // 如果pileSn与connectorCode都不为空，则设置pileConnectorCode为pileSn+connectorCode if (StringUtils.isNotBlank(pileSn) && StringUtils.isNotBlank(connectorCode)) { - String s = pileSn + connectorCode; - log.info("保存桩消息记录 -pileSn: {}, connectorCode: {}, length:{}", pileSn, connectorCode, s.length()); - // pileMsgRecord.setPileConnectorCode(); + log.info("保存桩消息记录 -pileSn: {}, connectorCode: {}, length:{}", pileSn, connectorCode, (pileSn + connectorCode).length()); + pileMsgRecord.setPileConnectorCode(pileSn + connectorCode); } pileMsgRecord.setFrameType(frameType); pileMsgRecord.setJsonMsg(jsonMsg); From d61c423673fff85037a2ae86f0c6f0a4b3d305f0 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Tue, 11 Nov 2025 09:46:33 +0800 Subject: [PATCH 4/5] =?UTF-8?q?update=20pileMsgRecord=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E5=85=85=E7=94=B5=E6=A1=A9=E7=BC=96=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jsowell/pile/service/impl/PileMsgRecordServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMsgRecordServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMsgRecordServiceImpl.java index aa31ad2d9..1f2ee6551 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMsgRecordServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMsgRecordServiceImpl.java @@ -77,7 +77,7 @@ public class PileMsgRecordServiceImpl implements PileMsgRecordService { pileMsgRecord.setTransactionCode(transactionCode); // 如果pileSn与connectorCode都不为空，则设置pileConnectorCode为pileSn+connectorCode if (StringUtils.isNotBlank(pileSn) && StringUtils.isNotBlank(connectorCode)) { - log.info("保存桩消息记录 -pileSn: {}, connectorCode: {}, length:{}", pileSn, connectorCode, (pileSn + connectorCode).length()); + // log.info("保存桩消息记录 -pileSn: {}, connectorCode: {}, length:{}", pileSn, connectorCode, (pileSn + connectorCode).length()); pileMsgRecord.setPileConnectorCode(pileSn + connectorCode); } pileMsgRecord.setFrameType(frameType); From 2916d1ecafbc22de7cfb305686f3c39e795ae32f Mon Sep 17 00:00:00 2001 From: Lemon Date: Thu, 27 Nov 2025 10:32:40 +0800 Subject: [PATCH 5/5] =?UTF-8?q?update=20=20=E7=94=B5=E6=B1=A0=E6=8A=A5?= =?UTF-8?q?=E5=91=8A=E7=AE=97=E6=B3=95=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pile/service/impl/ChargeAlgorithmRecordServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ChargeAlgorithmRecordServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ChargeAlgorithmRecordServiceImpl.java index 46076aa1b..b7e7d0323 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ChargeAlgorithmRecordServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ChargeAlgorithmRecordServiceImpl.java @@ -134,7 +134,7 @@ public class ChargeAlgorithmRecordServiceImpl implements ChargeAlgorithmRecordSe // 2-pdf 端 return record.getPdfUrl(); } - return null; + return ""; } /**