From 163942aec6316425d2eeaf93f34f7a8ff627d8b8 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期二, 26 三月 2024 16:22:11 +0800
Subject: [PATCH] lock
---
ard-work/src/main/java/com/ruoyi/sy/controller/OilWallController.java | 9 ++++++++-
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdAccessFenceServiceImpl.java | 11 +----------
2 files changed, 9 insertions(+), 11 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")
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdAccessFenceServiceImpl.java b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdAccessFenceServiceImpl.java
index 0b2ac2e..02b8216 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdAccessFenceServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdAccessFenceServiceImpl.java
@@ -23,8 +23,6 @@
private ArdAccessFenceMapper ardAccessFenceMapper;
@Autowired
private ArdSyCarMapper carMapper;
- @Autowired
- private ArdSyCarLockService lockService;
@Override
public int access(ArdAccessFence ardAccessFence) {
@@ -60,14 +58,7 @@
@Override
public List<ArdAccessFence> all(String url) {
- List<ArdAccessFence> list = ardAccessFenceMapper.selectList(null);
- for (int i = 0; i < list.size(); i++) {
- ArdAccessFence ardAccessFence = list.get(i);
-// ardAccessFence.setCarModel(url+ardAccessFence.getCarModel());
- ardAccessFence.setCarModel(ardAccessFence.getCarModel());
- ardAccessFence.setIsLock(lockService.isLock(ardAccessFence.getCarId()));
- }
- return list;
+ return ardAccessFenceMapper.selectList(null);
}
@Override
--
Gitblit v1.9.3