From bc2d4d4f3ceee6e51b15723c5e3f2c981bd72ba0 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期五, 29 十二月 2023 10:10:55 +0800
Subject: [PATCH] 车牌
---
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java | 32 ++++++++++++++++++++++++++------
1 files changed, 26 insertions(+), 6 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 0a67bcb..774ea33 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
@@ -483,7 +483,7 @@
* @return
*/
@Override
- public Map<String, Object> allListByUser(ArdSyUser ardSyUser, String syURL, String usersId) {
+ public Map<String, Object> allListByUser(ArdSyUser ardSyUser, String syURL, String usersId, List<Long> deptList) {
Map<String, Object> result0 = new HashMap();
//鍒ゆ柇鍏宠仈琛ㄦ槸鍚︽湁鏁版嵁
if (ardSyUser != null) {
@@ -504,10 +504,29 @@
map.put("list", new ArrayList());
return map;
}
+ QueryWrapper<ArdSyCar> queryWrapper = new QueryWrapper<>();
+ queryWrapper.in("dept_id", deptList);
+ List<ArdSyCar> carListTable = ardSyCarMapper.selectList(queryWrapper);
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"));
List<Map<String, Object>> carList = (List<Map<String, Object>>) resultMap.get("carList");
+ if(carList.size()>0){
+ for (int i = 0; i < carList.size(); i++) {
+ String carId = (String) carList.get(i).get("carId");
+ Boolean isCar = false;
+ for (int j = 0; j < carListTable.size(); j++) {
+ ArdSyCar ardSyCar = carListTable.get(j);
+ if (carId.equals(ardSyCar.getCarId())) {
+ isCar = true;
+ break;
+ }
+ }
+ if(!isCar){
+ carList.remove(carList.get(i));
+ }
+ }
+ }
for (Map<String, Object> m : carList) {
if (((String) m.get("stateCn")).contains("鍦ㄧ嚎")) {
online = online + 1;
@@ -515,11 +534,12 @@
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")));
- }
- }
+// 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());
map.put("online", online);
online = 0;
}
--
Gitblit v1.9.3