From 9b2b2396bb5540246d4f507d8a337c5e8d417754 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Wed, 2 Aug 2023 10:35:13 +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 | 28 +++++++++++++++---- .../pile/service/PileRemoteService.java | 3 ++ 2 files changed, 26 insertions(+), 5 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 226828f8f..cf6ffb094 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,16 +1,17 @@ package com.jsowell.web.controller.pile; import com.google.common.collect.ImmutableMap; +import com.jsowell.common.core.controller.BaseController; import com.jsowell.common.core.domain.AjaxResult; import com.jsowell.common.enums.ykc.ReturnCodeEnum; import com.jsowell.common.exception.BusinessException; import com.jsowell.common.util.StringUtils; import com.jsowell.common.util.id.IdUtils; +import com.jsowell.pile.domain.ykcCommond.RemoteControlGroundLockCommand; import com.jsowell.pile.dto.GenerateOrderDTO; import com.jsowell.pile.dto.QueryPileDTO; import com.jsowell.pile.dto.UpdateFirmwareDTO; import com.jsowell.pile.service.PileRemoteService; -import com.jsowell.service.OrderService; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; @@ -25,14 +26,11 @@ import java.math.BigDecimal; */ @RestController @RequestMapping("/pile/remote") -public class PileRemoteController { +public class PileRemoteController extends BaseController { @Autowired private PileRemoteService pileRemoteService; - @Autowired - private OrderService orderService; - /** * 获取实时上传数据 * http://localhost:8080/pile/remote/getRealTimeMonitorData @@ -139,4 +137,24 @@ public class PileRemoteController { return result; } + /** + * 遥控地锁 + * http://localhost:8080/pile/remote/remoteControlGroundLock + */ + @PostMapping("remoteControlGroundLock") + public AjaxResult remoteControlGroundLock(@RequestBody RemoteControlGroundLockCommand command) { + AjaxResult result; + try { + pileRemoteService.remoteControlGroundLock(command); + result = AjaxResult.success(); + } catch (BusinessException e) { + logger.error("遥控地锁error", e); + result = AjaxResult.error(e.getMessage()); + } catch (Exception e) { + logger.error("遥控地锁error", e); + result = AjaxResult.error(e.getMessage()); + } + return result; + } + } 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 0b3fa3af7..b2adef7b6 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 @@ -219,4 +219,7 @@ public class PileRemoteService { ykcPushCommandService.pushAccountBalanceUpdateCommand(command); } + public void remoteControlGroundLock(RemoteControlGroundLockCommand command) { + ykcPushCommandService.pushRemoteControlGroundLock(command); + } }