From ff64e192bc42641406843a407fb69b706da99be7 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 01 十一月 2024 20:54:50 +0800
Subject: [PATCH] 修改
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TVehicleRampController.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 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 e5e06a5..dfe127a 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;
@@ -38,6 +40,9 @@
@Resource
private SwitchwayGateClient switchwayGateClient;
+ @Resource
+ private TParkingLotService parkingLotService;
+
@@ -50,7 +55,7 @@
/**
* 添加车道管理
*/
- @Log(title = "添加车道", businessType = BusinessType.INSERT,operatorType = OperatorType.MANAGE)
+ @Log(title = "【停车场配置】添加车道", businessType = BusinessType.INSERT,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"后台-车道"},value = "添加车道")
@PostMapping(value = "/add")
public AjaxResult<Boolean> add(@RequestBody TVehicleRamp dto) {
@@ -61,7 +66,7 @@
/**
* 修改车道
*/
- @Log(title = "修改车道", businessType = BusinessType.UPDATE,operatorType = OperatorType.MANAGE)
+ @Log(title = "【停车场配置】修改车道", businessType = BusinessType.UPDATE,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"后台-车道"},value = "修改车道")
@PostMapping(value = "/update")
public AjaxResult<Boolean> update(@RequestBody TVehicleRamp dto) {
@@ -80,7 +85,7 @@
/**
* 删除车道
*/
- @Log(title = "删除车道", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
+ @Log(title = "【停车场配置】删除车道", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"后台-车道"},value = "删除车道")
@DeleteMapping(value = "/deleteById")
public AjaxResult<Boolean> deleteById(@RequestParam("id") Integer id) {
@@ -90,7 +95,7 @@
/**
* 批量删除车道
*/
- @Log(title = "批量删除车道", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
+ @Log(title = "【停车场配置】批量删除车道", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"后台-车道"},value = "批量删除车道")
@DeleteMapping(value = "/deleteByIds")
public AjaxResult<Boolean> deleteByIds(@RequestParam String ids) {
@@ -101,13 +106,17 @@
/**
* 开关闸车道
*/
- @Log(title = "开关闸车道", businessType = BusinessType.UPDATE,operatorType = OperatorType.MANAGE)
+ @Log(title = "【停车场配置】开关闸车道", businessType = BusinessType.UPDATE,operatorType = OperatorType.MANAGE)
@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.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