From 470b596ddce65dcbb8087e78f0a096d8ba1a429e Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期五, 02 八月 2024 08:17:48 +0800
Subject: [PATCH] 电磁锁新增临时电子围栏提交
---
ard-work/src/main/java/com/ruoyi/sy/controller/OilWallController.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 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 56f7333..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
@@ -8,6 +8,7 @@
import com.ruoyi.sy.domain.*;
import com.ruoyi.sy.param.OilWallParam;
import com.ruoyi.sy.service.*;
+import com.ruoyi.system.service.ISysConfigService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -32,6 +33,12 @@
@Autowired
private ArdAccessNumService ardAccessNumService;
+
+ @Autowired
+ private ISysConfigService sysConfigService;
+
+ @Autowired
+ private ArdSyCarLockService lockService;
@PostMapping("/add")
@ApiOperation("娣诲姞鐢靛瓙鍥存爮")
@@ -86,7 +93,12 @@
@GetMapping("/wallCar")
@ApiOperation("鎵�鏈夎繘鍏ュ洿鏍忕殑杞﹁締")
public AjaxResult wallCar(){
- return AjaxResult.success(ardAccessFenceService.all());
+ String url = sysConfigService.selectConfigByKey("minioIn")+"/";
+ 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")
@@ -98,7 +110,7 @@
@PostMapping("/updTime")
@ApiOperation("淇濆瓨鏃堕棿姝ラ暱")
public AjaxResult updTime(@RequestBody ArdAccessNum ardAccessNum){
- return AjaxResult.success(ardAccessNumService.add(ardAccessNum));
+ return AjaxResult.success(ardAccessNumService.upd(ardAccessNum));
}
}
--
Gitblit v1.9.3