From 1f7c1f07cdb00c04257a0b3f4616e4333978c413 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Tue, 27 Jun 2023 09:14:30 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E9=AB=98=E5=BE=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsowell/service/PileRemoteService.java | 10 ++++---- .../controller/pile/PileRemoteController.java | 7 +++--- .../test/java/SpringBootTestController.java | 2 +- .../ykcCommond/UpdateFirmwareCommand.java | 6 ++++- .../jsowell/pile/dto/UpdateFirmwareDTO.java | 24 +++++++++++++++++++ .../impl/YKCPushCommandServiceImpl.java | 2 +- jsowell-ui/src/views/pile/basic/detail.vue | 15 ++++++++---- 7 files changed, 51 insertions(+), 15 deletions(-) create mode 100644 jsowell-pile/src/main/java/com/jsowell/pile/dto/UpdateFirmwareDTO.java diff --git a/jsowell-admin/src/main/java/com/jsowell/service/PileRemoteService.java b/jsowell-admin/src/main/java/com/jsowell/service/PileRemoteService.java index eb5527f39..7ca899c46 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/PileRemoteService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/PileRemoteService.java @@ -4,6 +4,7 @@ import com.google.common.collect.Lists; import com.jsowell.common.util.StringUtils; import com.jsowell.pile.domain.ykcCommond.*; import com.jsowell.pile.dto.RemoteAccountBalanceUpdateDTO; +import com.jsowell.pile.dto.UpdateFirmwareDTO; import com.jsowell.pile.service.YKCPushCommandService; import com.jsowell.pile.domain.PileBillingRelation; import com.jsowell.pile.domain.PileBillingTemplate; @@ -185,12 +186,13 @@ public class PileRemoteService { /** * 远程更新 - * - * @param pileSns 前台传的桩号集合 */ - public void updateFirmware(List pileSns) { + public void updateFirmware(UpdateFirmwareDTO dto) { // - UpdateFirmwareCommand command = UpdateFirmwareCommand.builder().pileSnList(pileSns).build(); + UpdateFirmwareCommand command = UpdateFirmwareCommand.builder() + .pileSnList(dto.getPileSns()) + .filePath(dto.getFilePath()) + .build(); ykcPushCommandService.pushUpdateFileCommand(command); } diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileRemoteController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileRemoteController.java index 2a8caf97a..ba9f28a43 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileRemoteController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileRemoteController.java @@ -5,6 +5,7 @@ import com.jsowell.common.constant.Constants; import com.jsowell.common.core.domain.AjaxResult; import com.jsowell.pile.dto.GenerateOrderDTO; import com.jsowell.pile.dto.QueryPileDTO; +import com.jsowell.pile.dto.UpdateFirmwareDTO; import com.jsowell.service.OrderService; import com.jsowell.service.PileRemoteService; import org.apache.commons.collections4.CollectionUtils; @@ -105,11 +106,11 @@ public class PileRemoteController { * @return */ @PostMapping("/updateFirmware") - public AjaxResult updateFirmware(@RequestBody QueryPileDTO queryPileDTO) { - if (CollectionUtils.isEmpty(queryPileDTO.getPileSns())) { + public AjaxResult updateFirmware(@RequestBody UpdateFirmwareDTO dto) { + if (CollectionUtils.isEmpty(dto.getPileSns())) { return AjaxResult.error("参数不能为空"); } - pileRemoteService.updateFirmware(queryPileDTO.getPileSns()); + pileRemoteService.updateFirmware(dto); return AjaxResult.success(); } diff --git a/jsowell-admin/src/test/java/SpringBootTestController.java b/jsowell-admin/src/test/java/SpringBootTestController.java index 51e6b25ee..db78c6409 100644 --- a/jsowell-admin/src/test/java/SpringBootTestController.java +++ b/jsowell-admin/src/test/java/SpringBootTestController.java @@ -973,7 +973,7 @@ public class SpringBootTestController { public void testRemoteUpdate() { ArrayList list = new ArrayList<>(); list.add("88000000000001"); - pileRemoteService.updateFirmware(list); + // pileRemoteService.updateFirmware(list); } @Test diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/ykcCommond/UpdateFirmwareCommand.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ykcCommond/UpdateFirmwareCommand.java index cac3a4255..39ceb78c0 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/ykcCommond/UpdateFirmwareCommand.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ykcCommond/UpdateFirmwareCommand.java @@ -12,5 +12,9 @@ import java.util.List; @AllArgsConstructor @Builder public class UpdateFirmwareCommand { - List pileSnList; + private List pileSnList; + + // /update.bin + private String filePath; + } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/UpdateFirmwareDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/UpdateFirmwareDTO.java new file mode 100644 index 000000000..64a8a8a11 --- /dev/null +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/UpdateFirmwareDTO.java @@ -0,0 +1,24 @@ +package com.jsowell.pile.dto; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class UpdateFirmwareDTO { + /** + * 桩编码List + */ + private List pileSns; + + /** + * 固件路径 + */ + private String filePath; +} 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 2cc895c1b..6b0dd4f64 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 @@ -340,7 +340,7 @@ public class YKCPushCommandServiceImpl implements YKCPushCommandService { byte[] passwordByteArr = BytesUtil.checkLengthAndBehindAppendZero(BytesUtil.str2Asc(Constants.updateServerPassword), 32); // 文件路径 - byte[] filePathByteArr = BytesUtil.checkLengthAndBehindAppendZero(BytesUtil.str2Asc(Constants.filePath), 64); + byte[] filePathByteArr = BytesUtil.checkLengthAndBehindAppendZero(BytesUtil.str2Asc(command.getFilePath()), 64); // 执行控制 01：立即执行 02：空闲执行 byte[] performTypeByteArr = Constants.oneByteArray; diff --git a/jsowell-ui/src/views/pile/basic/detail.vue b/jsowell-ui/src/views/pile/basic/detail.vue index 83222bd20..a19444cb2 100644 --- a/jsowell-ui/src/views/pile/basic/detail.vue +++ b/jsowell-ui/src/views/pile/basic/detail.vue @@ -213,10 +213,14 @@ - - - 远程升级 - + + + 远程升级 + + + + 远程升级2 + @@ -290,9 +294,10 @@ export default { }, methods: { // 远程升级固件 - updateFirmware() { + updateFirmware(filePath) { const data = { pileSns: [this.pileSn], + filePath: filePath }; console.log("远程升级固件:", data); updateFirmware(data).then((response) => {