From 8dcf0af29d03e596a5071dfea3df3d5e89f4ff3b Mon Sep 17 00:00:00 2001 From: aijinhui <aijinhui> Date: 星期四, 19 十月 2023 13:52:15 +0800 Subject: [PATCH] 修改RTU --- ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java | 76 ++++++++++++++++++++++++++++++++++++- 1 files changed, 73 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..6ef1ba2 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 @@ -5,11 +5,13 @@ import com.ruoyi.sy.domain.ArdSyCar; import com.ruoyi.sy.domain.ArdSyCarLock; import com.ruoyi.sy.domain.ArdSyCarRtu; +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,6 +32,8 @@ private SysDeptMapper sysDeptMapper; @Autowired private ArdSyCarRtuMapper rtuMapper; + @Autowired + private ArdSyCarLockMapper lockMapper; @Override public List<CarVo> car() { @@ -65,6 +69,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,13 +80,76 @@ } @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.getCarId()); + return ardSyCarMapper.updateById(ardSyCar); } public List<CarVo> carAnalysis(List<ArdSyCar> ardSyCars){ -- Gitblit v1.9.3