From 7786c1a71400a8e1635d2d6c94161a0474c4bb67 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期六, 28 十月 2023 09:06:49 +0800
Subject: [PATCH] 手动引导增加禁引可视域判断

---
 ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java
index 81876d7..631a1d0 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java
@@ -2,9 +2,11 @@
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.sy.domain.ArdAccessFence;
 import com.ruoyi.sy.domain.ArdSyCar;
 import com.ruoyi.sy.domain.ArdSyCarLock;
 import com.ruoyi.sy.domain.ArdSyCarRtu;
+import com.ruoyi.sy.mapper.ArdAccessFenceMapper;
 import com.ruoyi.sy.mapper.ArdSyCarLockMapper;
 import com.ruoyi.sy.mapper.ArdSyCarMapper;
 import com.ruoyi.sy.mapper.ArdSyCarRtuMapper;
@@ -35,10 +37,19 @@
     @Autowired
     private ArdSyCarLockMapper lockMapper;
 
+
     @Override
     public List<CarVo> car() {
         QueryWrapper<ArdSyCar> queryWrapper = new QueryWrapper<>();
         queryWrapper.isNull("reserved_1").or().eq("reserved_1","");
+        List<ArdSyCar> ardSyCars= ardSyCarMapper.selectList(queryWrapper);
+        return carAnalysis(ardSyCars);
+    }
+
+    @Override
+    public List<CarVo> carAddOne(String carId) {
+        QueryWrapper<ArdSyCar> queryWrapper = new QueryWrapper<>();
+        queryWrapper.isNull("reserved_1").or().eq("reserved_1","").or().eq("car_id",carId);
         List<ArdSyCar> ardSyCars= ardSyCarMapper.selectList(queryWrapper);
         return carAnalysis(ardSyCars);
     }
@@ -152,6 +163,7 @@
         return ardSyCarMapper.updateById(ardSyCar);
     }
 
+
     public List<CarVo> carAnalysis(List<ArdSyCar> ardSyCars){
         List<CarVo> list = new ArrayList<>();
         for (int i = 0; i < ardSyCars.size(); i++) {

--
Gitblit v1.9.3