From 9790a81eba8f0ffb88324c2dd92ad886d12fc910 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期五, 10 十一月 2023 15:26:57 +0800
Subject: [PATCH] 清淤逻辑优化
---
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 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..f16e24a 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,26 @@
return ardSyCarMapper.updateById(ardSyCar);
}
+ @Override
+ public List<CarVo> queryCar(List<String> list) {
+ QueryWrapper<ArdSyCar> queryWrapper = new QueryWrapper<>();
+ queryWrapper.ne("reserved_1","").notIn("car_id",list);
+ List<ArdSyCar> ardSyCars = ardSyCarMapper.selectList(queryWrapper);
+ return carAnalysis(ardSyCars);
+ }
+
+ @Override
+ public List<CarVo> addCarBefore(String id) {
+ QueryWrapper<ArdSyCar> ardSyCarQueryWrapper = new QueryWrapper<>();
+ ardSyCarQueryWrapper.eq("car_id",id);
+ List<ArdSyCar> carList = ardSyCarMapper.selectList(ardSyCarQueryWrapper);
+ return carAnalysis(carList);
+ }
+
+
+
+
+ //杞﹁締鍒楄〃灏佽
public List<CarVo> carAnalysis(List<ArdSyCar> ardSyCars){
List<CarVo> list = new ArrayList<>();
for (int i = 0; i < ardSyCars.size(); i++) {
@@ -164,6 +195,7 @@
SysDept sysDept = sysDeptMapper.selectById(ardSyCar.getDeptId());
carVo.setDeptName(sysDept.getDeptName());
carVo.setRtu(ardSyCar.getReserved1());
+ carVo.setCarModel(ardSyCar.getCarModel());
list.add(carVo);
}
return list;
--
Gitblit v1.9.3