From 5e4c0666f6d0d91cc4cf2263e42c7f06505625c7 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期六, 21 十月 2023 15:26:29 +0800
Subject: [PATCH] 入栏
---
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java | 27 ++++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 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 6ef1ba2..7c1c0b2 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;
@@ -34,11 +36,21 @@
private ArdSyCarRtuMapper rtuMapper;
@Autowired
private ArdSyCarLockMapper lockMapper;
+ @Autowired
+ private ArdAccessFenceMapper ardAccessFenceMapper;
@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);
}
@@ -148,10 +160,23 @@
QueryWrapper<ArdSyCar> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("car_id",ardSyCarRtu.getCarId());
ArdSyCar ardSyCar = ardSyCarMapper.selectOne(queryWrapper);
- ardSyCar.setReserved1(ardSyCarRtu.getCarId());
+ ardSyCar.setReserved1(ardSyCarRtu.getId());
return ardSyCarMapper.updateById(ardSyCar);
}
+ @Override
+ public int access(ArdAccessFence ardAccessFence) {
+ int num = 0;
+ String carId = ardAccessFence.getCarId();
+ QueryWrapper<ArdAccessFence> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("car_id",carId);
+ ArdAccessFence ardAccessFence1 = ardAccessFenceMapper.selectOne(queryWrapper);
+ if(ardAccessFence1==null){
+ num = ardAccessFenceMapper.insert(ardAccessFence);
+ }
+ return num;
+ }
+
public List<CarVo> carAnalysis(List<ArdSyCar> ardSyCars){
List<CarVo> list = new ArrayList<>();
for (int i = 0; i < ardSyCars.size(); i++) {
--
Gitblit v1.9.3