From e7e8848b00450eafeb48f26cc0774556aa6beec2 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Thu, 1 Aug 2024 16:50:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E8=8E=B7=E5=8F=96=E5=93=8D?= =?UTF-8?q?=E5=BA=94=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/uniapp/customer/TempController.java | 2 +- .../pile/service/PileRemoteService.java | 10 ---------- .../pile/service/YKCPushCommandService.java | 1 - .../impl/YKCPushCommandServiceImpl.java | 18 ------------------ 4 files changed, 1 insertion(+), 30 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/TempController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/TempController.java index e8b8902a7..bd112af4c 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/TempController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/TempController.java @@ -78,7 +78,7 @@ public class TempController extends BaseController { */ @PostMapping("/proofreadTimeTest") public AjaxResult proofreadTimeTest(@RequestBody QueryPileDTO queryPileDTO) { - pileRemoteService.proofreadTimeTest(queryPileDTO.getPileSn()); + pileRemoteService.proofreadTime(queryPileDTO.getPileSn()); return AjaxResult.success(); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/PileRemoteService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileRemoteService.java index e54ad3e59..b2663e202 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/PileRemoteService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileRemoteService.java @@ -151,16 +151,6 @@ public class PileRemoteService { ykcPushCommandService.pushProofreadTimeCommand(command); } - - public void proofreadTimeTest(String pileSn) { - ProofreadTimeCommand command = ProofreadTimeCommand.builder().pileSn(pileSn).build(); - try { - ykcPushCommandService.pushProofreadTimeCommandTest(command); - } catch (Exception e) { - throw new RuntimeException(e); - } - } - /** * 下发充电桩计费模型 */ diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/YKCPushCommandService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/YKCPushCommandService.java index eba71fbfd..244c6b7a5 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/YKCPushCommandService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/YKCPushCommandService.java @@ -84,5 +84,4 @@ public interface YKCPushCommandService { */ void pushReservationChargingCommand(ReservationChargingCommand command); - void pushProofreadTimeCommandTest(ProofreadTimeCommand command) throws Exception; } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/YKCPushCommandServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/YKCPushCommandServiceImpl.java index f59ac6bcc..15e8ac1ec 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/YKCPushCommandServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/YKCPushCommandServiceImpl.java @@ -401,24 +401,6 @@ public class YKCPushCommandServiceImpl implements YKCPushCommandService { log.info("[充电桩:{}对时, 时间:{}, CP56Time2a:{}]", pileSn, DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, date), BytesUtil.binary(dateBytes, 16)); } - - @Override - public void pushProofreadTimeCommandTest(ProofreadTimeCommand command) throws Exception { - String pileSn = command.getPileSn(); - byte[] pileSnByteArr = BytesUtil.str2Bcd(pileSn); - - // 时间 - Date date = DateUtils.parseDate(DateUtils.getDateTime()); - byte[] dateBytes = Cp56Time2aUtil.date2Hbyte(date); - - // 拼装msg - byte[] msg = Bytes.concat(pileSnByteArr, dateBytes); - - byte[] bytes = this.send(msg, pileSn, YKCFrameTypeCode.TIME_CHECK_SETTING_CODE); - log.info("[充电桩:{}对时, 时间:{}, CP56Time2a:{}], 响应:{}", - pileSn, DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, date), BytesUtil.binary(dateBytes, 16), BytesUtil.binary(bytes, 16)); - } - /** * 向充电桩发送计费模板 *