From 55811ddff81bc142eac3c27e44f30c55e84311f1 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期六, 20 七月 2024 13:25:19 +0800
Subject: [PATCH] 三一车辆遗漏提交
---
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java | 36 +++++++++++++++++++++++++++---------
1 files changed, 27 insertions(+), 9 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 118dcdf..31f5842 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
@@ -26,6 +26,7 @@
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.uuid.IdUtils;
import com.ruoyi.sy.domain.ArdAccessFence;
+import com.ruoyi.sy.mapper.ArdTankLockMapper;
import com.ruoyi.sy.param.ArdSyCarParam;
import com.ruoyi.sy.vo.ArdSyCarVo;
import com.ruoyi.system.mapper.SysDeptMapper;
@@ -98,6 +99,9 @@
@Resource
private SysDeptMapper sysDeptMapper;
+
+ @Resource
+ private ArdTankLockMapper ardTankLockMapper;
@Value("${minio.endpoint}")
private String minioEndpoint;
@@ -212,7 +216,16 @@
}
}
MinioUtil.removeObjects("sycar", objectNames);
- return ardSyCarMapper.deleteArdSyCarByIds(ids);
+ try{
+ return ardSyCarMapper.deleteArdSyCarByIds(ids);
+ }finally {
+ List<String> carIds = new ArrayList();
+ for(ArdSyCar ardSyCar : result){
+ carIds.add(ardSyCar.getCarId());
+ }
+ ardTankLockMapper.deleteArdTankLockAndWallByCarIds(carIds);
+ }
+
}
/**
@@ -564,12 +577,17 @@
continue;
}
}
-// for (Map<String, Object> m : (List<Map<String, Object>>) result0.get("list")) {
-// if (((String) m.get("teamId")).equals(((String) map.get("teamId")))) {
-// map.put("count", Integer.parseInt((String) m.get("carNum")));
-// }
-// }
- map.put("count", carList.size());
+ List<String> carIdList = new ArrayList();//瀛樻斁杞﹂槦涓嬪叏閮ㄨ溅杈嗕富閿�
+ for(Map<String, Object> carMap : carList){
+ carIdList.add((String) carMap.get("carId"));
+ }
+ //map.put("count", carList.size());
+ if(carIdList.size() == 0){
+ map.put("count", 0);
+ }else{
+ Long count = ardSyCarMapper.getCountByCarIdList(carIdList);
+ map.put("count", count);
+ }
map.put("online", online);
online = 0;
}
@@ -694,9 +712,9 @@
break;
}
}
- if(!isCar){
+ /*if(!isCar){
list.remove(list.get(i));
- }
+ }*/
}
return list;
}
--
Gitblit v1.9.3