From ad2901a19dc86705d49b3f7316a1c468027147c7 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Wed, 2 Aug 2023 13:30:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E9=80=81=E9=81=A5=E6=8E=A7=E5=9C=B0?= =?UTF-8?q?=E9=94=81=E6=8C=87=E4=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/pile/PileRemoteController.java | 6 +- jsowell-ui/src/api/pile/pileRemote.js | 9 + jsowell-ui/src/views/pile/basic/detail.vue | 748 +++++++++--------- 3 files changed, 409 insertions(+), 354 deletions(-) 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 cf6ffb094..82a16f2be 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 @@ -1,5 +1,6 @@ package com.jsowell.web.controller.pile; +import com.alibaba.fastjson2.JSON; import com.google.common.collect.ImmutableMap; import com.jsowell.common.core.controller.BaseController; import com.jsowell.common.core.domain.AjaxResult; @@ -143,15 +144,16 @@ public class PileRemoteController extends BaseController { */ @PostMapping("remoteControlGroundLock") public AjaxResult remoteControlGroundLock(@RequestBody RemoteControlGroundLockCommand command) { + logger.info("遥控地锁接口param:{}", JSON.toJSONString(command)); AjaxResult result; try { pileRemoteService.remoteControlGroundLock(command); result = AjaxResult.success(); } catch (BusinessException e) { - logger.error("遥控地锁error", e); + logger.error("遥控地锁接口error", e); result = AjaxResult.error(e.getMessage()); } catch (Exception e) { - logger.error("遥控地锁error", e); + logger.error("遥控地锁接口error", e); result = AjaxResult.error(e.getMessage()); } return result; diff --git a/jsowell-ui/src/api/pile/pileRemote.js b/jsowell-ui/src/api/pile/pileRemote.js index 0a91e3bc7..c44c4e9ba 100644 --- a/jsowell-ui/src/api/pile/pileRemote.js +++ b/jsowell-ui/src/api/pile/pileRemote.js @@ -8,3 +8,12 @@ export function updateFirmware(data) { data: data }) } + +// 遥控地锁 +export function remoteControlGroundLock(data) { + return request({ + url: '/pile/remote/remoteControlGroundLock', + method: 'post', + data: data + }) +} diff --git a/jsowell-ui/src/views/pile/basic/detail.vue b/jsowell-ui/src/views/pile/basic/detail.vue index 8bdb67eea..e135c2d5e 100644 --- a/jsowell-ui/src/views/pile/basic/detail.vue +++ b/jsowell-ui/src/views/pile/basic/detail.vue @@ -1,385 +1,429 @@