From 93cecfaf0fae080ebd0212adea714726290d0d4a Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期四, 01 八月 2024 20:36:54 +0800
Subject: [PATCH] 电磁锁串口协议发送加入线程排队提交
---
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java
index e50c863..7a32f66 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java
@@ -134,10 +134,11 @@
@Override
public AjaxResult ardSyCarList(ArdSyCarParam ardSyCarParam,Map<String,Object> result) {
- QueryWrapper<ArdSyCar> queryWrapper = new QueryWrapper<>();
+ /*QueryWrapper<ArdSyCar> queryWrapper = new QueryWrapper<>();
queryWrapper.like(ardSyCarParam.getCarBrand()!=null,"car_brand",ardSyCarParam.getCarBrand())
.like(ardSyCarParam.getCarType()!=null,"car_type",ardSyCarParam.getCarType());
- List<ArdSyCar> ardSyCars = ardSyCarMapper.selectList(queryWrapper);
+ List<ArdSyCar> ardSyCars = ardSyCarMapper.selectList(queryWrapper);*/
+ List<ArdSyCar> ardSyCars = ardSyCarMapper.selectByBrandAndType(ardSyCarParam.getCarBrand(),ardSyCarParam.getCarType());
List<ArdSyCarVo> ardSyCarVoList = new ArrayList<>();
if(((String)result.get("code")).equals("200")){
List<Map<String,Object>> list = (List<Map<String, Object>>) result.get("data");
@@ -1552,6 +1553,12 @@
}
}
+ @Override
+ public List<ArdSyCar> selectArdSyCarAndTankLock() {
+ List<ArdSyCar> result = ardSyCarMapper.selectArdSyCarAndTankLock();
+ return result;
+ }
+
public List<Long> getOwnAndChildrenDeptIdList(List<Long> deptIdList,List<Long> deptIdListr){
deptIdListr.addAll(deptIdList);
List<Long> result = sysDeptMapper.getChildrenDeptIdList(deptIdList);
--
Gitblit v1.9.3