From 53a8a9426f21c7f853c406e462486029c78018b2 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期六, 03 八月 2024 09:33:08 +0800
Subject: [PATCH] 电磁锁临时电子围栏加入主动操控失效提交
---
ard-work/src/main/java/com/ruoyi/sy/controller/OilWallController.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/sy/controller/OilWallController.java b/ard-work/src/main/java/com/ruoyi/sy/controller/OilWallController.java
index 987456f..1519639 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/controller/OilWallController.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/controller/OilWallController.java
@@ -37,6 +37,9 @@
@Autowired
private ISysConfigService sysConfigService;
+ @Autowired
+ private ArdSyCarLockService lockService;
+
@PostMapping("/add")
@ApiOperation("娣诲姞鐢靛瓙鍥存爮")
public AjaxResult add(@RequestBody ArdOilWall ardOilWall){
@@ -91,7 +94,11 @@
@ApiOperation("鎵�鏈夎繘鍏ュ洿鏍忕殑杞﹁締")
public AjaxResult wallCar(){
String url = sysConfigService.selectConfigByKey("minioIn")+"/";
- return AjaxResult.success(ardAccessFenceService.all(url));
+ List<ArdAccessFence> list = ardAccessFenceService.all(url);
+ for (int i = 0; i < list.size(); i++) {
+ list.get(i).setIsLock(lockService.isLock(list.get(i).getCarId()));
+ }
+ return AjaxResult.success(list);
}
@GetMapping("/rollTime")
--
Gitblit v1.9.3