From 51de7e6b1a7b68c76b8dcb385013a0c06466b81c Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 22 十月 2024 11:49:26 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TVehicleRampController.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TVehicleRampController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TVehicleRampController.java
index dcb1432..c15b6af 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TVehicleRampController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TVehicleRampController.java
@@ -1,7 +1,9 @@
package com.ruoyi.chargingPile.controller;
+import com.ruoyi.chargingPile.api.model.TParkingLot;
import com.ruoyi.chargingPile.api.model.TVehicleRamp;
+import com.ruoyi.chargingPile.service.TParkingLotService;
import com.ruoyi.chargingPile.service.TVehicleRampService;
import com.ruoyi.common.core.utils.CodeGenerateUtils;
import com.ruoyi.common.core.web.domain.AjaxResult;
@@ -37,6 +39,9 @@
@Resource
private SwitchwayGateClient switchwayGateClient;
+
+ @Resource
+ private TParkingLotService parkingLotService;
@@ -105,9 +110,13 @@
@ApiOperation(tags = {"后台-车道"},value = "开关闸车道")
@PostMapping(value = "/openOrDown")
public AjaxResult<String> openOrDown(@RequestBody TVehicleRamp dto) {
+ TVehicleRamp vehicleRamp = vehicleRampService.getById(dto.getId());
+ TParkingLot parkingLot = parkingLotService.getById(vehicleRamp.getParkingLotId());
SwitchwayGateReq req = new SwitchwayGateReq();
- req.setAction(dto.getAction());
- req.setChannel(dto.getCarportNum());
+ req.setAction(vehicleRamp.getAction());
+ req.setChannel(vehicleRamp.getCarportNum());
+ req.setAppkey(parkingLot.getAppKey());
+ req.setSecretkey(parkingLot.getSecretKey());
Boolean data = switchwayGateClient.gateService(req).getData();
return data ? AjaxResult.success() : AjaxResult.error("操作失败");
}
--
Gitblit v1.7.1