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 | 64 ++++++++++++++++++++++++--------
1 files changed, 48 insertions(+), 16 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 2efbc05..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;
}
@@ -623,10 +643,11 @@
queryWrapper.in("dept_id", deptList);
List<ArdSyCar> carList = ardSyCarMapper.selectList(queryWrapper);
//瀵规瘮鎶婂尮閰嶅埌鐨勬暟鎹坊鍔犲埌list涓�
- for (Map<String, String> m : list) {
- String carId = m.get("carId");
- for (int i = 0; i < carList.size(); i++) {
- ArdSyCar ardSyCar = carList.get(i);
+ 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) {
@@ -634,12 +655,17 @@
url = ardSyCar.getCarPicture().split("sycar")[0];
}
}*/
- m.put("carModel", this.minioEndpoint + "/" + ardSyCar.getCarModel());//zns
+ list.get(i).put("carModel", this.minioEndpoint + "/" + ardSyCar.getCarModel());//zns
//m.put("carModel",ardSyCar.getCarModel());
- m.put("carTypeArd", ardSyCar.getCarType());
- m.put("carBrand", ardSyCar.getCarBrand());
- m.put("carPicture", ardSyCar.getCarPicture());
+ list.get(i).put("carTypeArd", ardSyCar.getCarType());
+ list.get(i).put("carBrand", ardSyCar.getCarBrand());
+ list.get(i).put("carPicture", ardSyCar.getCarPicture());
+ isCar = true;
+ break;
}
+ }
+ if(!isCar){
+ list.remove(list.get(i));
}
}
return list;
@@ -783,13 +809,13 @@
@Override
public Map<String, Object> getCarGPSBycarId(String usersId, String carId, String syURL, ArdSyUser ardSyUser) {
- Map<String, String> result = logInMap.get(Integer.parseInt(usersId));
+// Map<String, String> result = logInMap.get(Integer.parseInt(usersId));
//31鐢ㄦ埛鍚嶅瘑鐮�
String username31 = ardSyUser.getUserId();
String password31 = ardSyUser.getPassword();
String passwordMd5 = DigestUtils.md5Hex(password31);
Map<String, Object> result1 = sYClient.logIn(syURL, passwordMd5, username31);
- result = new HashMap();
+ Map<String, String> result = new HashMap();
result.put("userId", username31);
result.put("sessionId", (String) result1.get("sessionId"));
return sYClient.getCarNearPositionByCarId(syURL, carId, result.get("userId"), result.get("sessionId"));
@@ -1222,4 +1248,10 @@
return ardSyCarMapper.selectList(queryWrapper);
}
+ @Override
+ public Map<String, Object> getAlarmHPfmCountDetail(String sessionId, String usersId, String carId, String startTime, String endTime, String syURL) {
+// System.out.println("sessionId------"+sessionId+",usersId-----"+usersId+",carId-----"+carId+",startTime----"+startTime+",endTime----"+endTime+",syURL----"+syURL);
+ return sYClient.getAlarmHPfmCountDetail(syURL,carId,sessionId,startTime,endTime);
+ }
+
}
--
Gitblit v1.9.3