From bb22ca2e9b9c60b0138a322ad49cab7ea8aa06e1 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期三, 25 十月 2023 17:12:54 +0800
Subject: [PATCH] 修复雷达引导2个相机引导录像重复问题；
---
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java | 88 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 85 insertions(+), 3 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 ac7e54c..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,14 +2,18 @@
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;
import com.ruoyi.sy.service.ArdSyCarLockService;
import com.ruoyi.sy.vo.CarLockVo;
import com.ruoyi.sy.vo.CarVo;
+import com.ruoyi.sy.vo.RtuVo;
import com.ruoyi.system.mapper.SysDeptMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -30,11 +34,22 @@
private SysDeptMapper sysDeptMapper;
@Autowired
private ArdSyCarRtuMapper rtuMapper;
+ @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);
}
@@ -65,6 +80,9 @@
@Override
public int delCar(String id) {
rtuMapper.deleteById(id);
+ QueryWrapper<ArdSyCarLock> queryWrapper1 = new QueryWrapper<>();
+ queryWrapper1.eq("rtu_id",id);
+ lockMapper.delete(queryWrapper1);
QueryWrapper<ArdSyCar> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("reserved_1",id);
ArdSyCar ardSyCar = ardSyCarMapper.selectOne(queryWrapper);
@@ -73,15 +91,79 @@
}
@Override
- public List<CarLockVo> carLock(String carId) {
- return null;
+ public CarVo carOne(String carId) {
+ CarVo carVo = new CarVo();
+ QueryWrapper<ArdSyCar> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("car_id",carId);
+ ArdSyCar ardSyCar= ardSyCarMapper.selectOne(queryWrapper);
+ carVo.setCarId(ardSyCar.getCarId());
+ carVo.setCarPicture(ardSyCar.getCarPicture());
+ carVo.setCarType(ardSyCar.getCarType());
+ carVo.setDeptId(ardSyCar.getDeptId());
+ SysDept sysDept = sysDeptMapper.selectById(ardSyCar.getDeptId());
+ carVo.setDeptName(sysDept.getDeptName());
+ carVo.setRtu(ardSyCar.getReserved1());
+ return carVo;
+ }
+
+ @Override
+ public List<ArdSyCarLock> carLock(String rtu) {
+ QueryWrapper<ArdSyCarLock> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("rtu_id",rtu);
+ return lockMapper.selectList(queryWrapper);
}
@Override
public int addUpdLock(List<ArdSyCarLock> ardSyCarLock) {
- return 0;
+ int num = 0;
+ if(ardSyCarLock.size()>0){
+ String rtu = ardSyCarLock.get(0).getRtuId();
+ QueryWrapper<ArdSyCarLock> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("rtu_id",rtu);
+ lockMapper.delete(queryWrapper);
+ for (int i = 0; i < ardSyCarLock.size(); i++) {
+ ArdSyCarLock lock = ardSyCarLock.get(i);
+ if(lock.getId()==null){
+ lock.setId(String.valueOf(UUID.randomUUID()));
+ }
+ num += lockMapper.insert(lock);
+ }
+ }
+ return num;
}
+ @Override
+ public RtuVo updRtu(String carId) {
+ QueryWrapper<ArdSyCarRtu> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("car_id",carId);
+ ArdSyCarRtu ardSyCarRtu = rtuMapper.selectOne(queryWrapper);
+ RtuVo rtuVo = new RtuVo();
+ QueryWrapper<ArdSyCar> queryWrapper1 = new QueryWrapper<>();
+ queryWrapper1.eq("car_id",carId);
+ ArdSyCar ardSyCar= ardSyCarMapper.selectOne(queryWrapper1);
+ rtuVo.setCarId(ardSyCar.getCarId());
+ rtuVo.setCarPicture(ardSyCar.getCarPicture());
+ rtuVo.setCarType(ardSyCar.getCarType());
+ rtuVo.setDeptId(ardSyCar.getDeptId());
+ SysDept sysDept = sysDeptMapper.selectById(ardSyCar.getDeptId());
+ rtuVo.setDeptName(sysDept.getDeptName());
+ rtuVo.setRtu(ardSyCar.getReserved1());
+ rtuVo.setTopicPublish(ardSyCarRtu.getTopicPublish());
+ rtuVo.setTopicSubscribe(ardSyCarRtu.getTopicSubscribe());
+ return rtuVo;
+ }
+
+ @Override
+ public int updRtuCar(ArdSyCarRtu ardSyCarRtu) {
+ rtuMapper.updateById(ardSyCarRtu);
+ QueryWrapper<ArdSyCar> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("car_id",ardSyCarRtu.getCarId());
+ ArdSyCar ardSyCar = ardSyCarMapper.selectOne(queryWrapper);
+ ardSyCar.setReserved1(ardSyCarRtu.getId());
+ 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