From a17551833794cceabddff337bf185dbfb97b44ae Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期四, 25 七月 2024 10:33:01 +0800
Subject: [PATCH] 电磁锁打印注释提交
---
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java | 41 ++++++++++++++++++++++++-----------------
1 files changed, 24 insertions(+), 17 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 31f5842..e50c863 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
@@ -547,9 +547,13 @@
map.put("list", new ArrayList());
return map;
}
- QueryWrapper<ArdSyCar> queryWrapper = new QueryWrapper<>();
+ /*QueryWrapper<ArdSyCar> queryWrapper = new QueryWrapper<>();
queryWrapper.in("dept_id", deptList);
- List<ArdSyCar> carListTable = ardSyCarMapper.selectList(queryWrapper);
+ List<ArdSyCar> carListTable = ardSyCarMapper.selectList(queryWrapper);*/
+ List<ArdSyCar> carListTable = new ArrayList();
+ if(!deptList.isEmpty()){
+ carListTable = ardSyCarMapper.getCarListByDeptIdList(deptList);
+ }
int online = 0;
for (Map<String, Object> map : (List<Map<String, Object>>) result0.get("list")) {
Map<String, Object> resultMap = sYClient.getTeamCarList(syURL, (String) map.get("teamId"), result.get("sessionId"));
@@ -572,7 +576,15 @@
}
for (Map<String, Object> m : carList) {
if (((String) m.get("stateCn")).contains("鍦ㄧ嚎")) {
- online = online + 1;
+ String carId = (String) m.get("carId");
+ ArdSyCar ardSyCarQuery = new ArdSyCar();
+ ardSyCarQuery.setCarId(carId);
+ List<ArdSyCar> ardSyCarList = ardSyCarMapper.selectArdSyCarList(ardSyCarQuery);
+ if(ardSyCarList.size() != 0){
+ online = online + 1;
+ }else{
+ continue;
+ }
} else {
continue;
}
@@ -687,35 +699,30 @@
*/
@Override
public List<Map<String, String>> carIdByDeptList(List<Long> deptList, List<Map<String, String>> list) {
- QueryWrapper<ArdSyCar> queryWrapper = new QueryWrapper<>();
+ /*QueryWrapper<ArdSyCar> queryWrapper = new QueryWrapper<>();
queryWrapper.in("dept_id", deptList);
- List<ArdSyCar> carList = ardSyCarMapper.selectList(queryWrapper);
+ List<ArdSyCar> carList = ardSyCarMapper.selectList(queryWrapper);*/
+ List<ArdSyCar> carList = new ArrayList();
+ if(!deptList.isEmpty()){
+ carList = ardSyCarMapper.getCarListByDeptIdList(deptList);
+ }
+
//瀵规瘮鎶婂尮閰嶅埌鐨勬暟鎹坊鍔犲埌list涓�
for (int i = 0; i < list.size(); i++) {
String carId = list.get(i).get("carId");
- Boolean isCar = false;
for (int j = 0; j < carList.size(); j++) {
ArdSyCar ardSyCar = carList.get(j);
if (carId.equals(ardSyCar.getCarId())) {
- /*String url = "";
- if (ardSyCar.getCarPicture() != null) {
- if (!ardSyCar.getCarPicture().equals("")) {
- url = ardSyCar.getCarPicture().split("sycar")[0];
- }
- }*/
list.get(i).put("carModel", this.minioEndpoint + "/" + ardSyCar.getCarModel());//zns
- //m.put("carModel",ardSyCar.getCarModel());
list.get(i).put("carTypeArd", ardSyCar.getCarType());
list.get(i).put("carBrand", ardSyCar.getCarBrand());
list.get(i).put("carPicture", ardSyCar.getCarPicture());
- isCar = true;
+ list.get(i).put("deptId", ardSyCar.getDeptId());
break;
}
}
- /*if(!isCar){
- list.remove(list.get(i));
- }*/
}
+ list = list.stream().filter(map -> map.get("deptId") != null).collect(Collectors.toList());
return list;
}
--
Gitblit v1.9.3