From af39365d9b0a2f4896470c505cf085776009ca97 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期四, 28 十二月 2023 16:06:24 +0800
Subject: [PATCH] 车辆管理数量BUG
---
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java | 79 ++++++++++++++++++++-------------------
1 files changed, 40 insertions(+), 39 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 e7d97ce..0a67bcb 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
@@ -623,10 +623,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 +635,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;
@@ -782,41 +788,36 @@
}
@Override
- public Results getCarGPSBycarId(String usersId, String carId, String syURL, ArdSyUser ardSyUser) {
- Map<String, String> result = logInMap.get(Integer.parseInt(usersId));
+ public Map<String, Object> getCarGPSBycarId(String usersId, String carId, String syURL, ArdSyUser ardSyUser) {
+// 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"));
- Map<String, Object> result0 = new HashMap();
- result0 = sYClient.getCarNearPositionByCarId(syURL, carId, result.get("userId"), result.get("sessionId"));
- return Results.succeed(result0);
+ return sYClient.getCarNearPositionByCarId(syURL, carId, result.get("userId"), result.get("sessionId"));
}
@Override
- public Map<String, Object> getCarPicture(String carId, String syURL, ArdSyUser ardSyUser) {
- //31鐢ㄦ埛鍚嶅瘑鐮�
+ public Map<String, Object> getCarPicture(String carId, String syURL, String sessionId) {
+ return sYClient.getCarPicture(syURL, carId, sessionId);
+ }
+
+ @Override
+ public String getSessionId(String syURL,ArdSyUser ardSyUser) {
String username31 = ardSyUser.getUserId();
String password31 = ardSyUser.getPassword();
String passwordMd5 = DigestUtils.md5Hex(password31);
+ System.out.println(passwordMd5);
Map<String, Object> result1 = sYClient.logIn(syURL, passwordMd5, username31);
- Map<String, Object> result0 = new HashMap();
- result0 = sYClient.getCarPicture(syURL, carId, (String) result1.get("sessionId"));
- return result0;
+ return (String) result1.get("sessionId");
}
@Override
- public Map<String, Object> sendCmd(String syURL, ArdSyUser ardSyUser, String carId, List<String> channelList) throws UnsupportedEncodingException {
- //31鐢ㄦ埛鍚嶅瘑鐮�
- String userId = ardSyUser.getUserId();
- String password31 = ardSyUser.getPassword();
- String password = DigestUtils.md5Hex(password31);
- Map<String, Object> result1 = sYClient.logIn(syURL, password, userId);
- Map<String, Object> sendCmdMap = new HashMap();
+ public Map<String, Object> sendCmd(String userId,String syURL, String sessionId, String carId, List<String> channelList) throws UnsupportedEncodingException {
// for (int i = 0; i < channelList.size(); i++) {
Map<String,String> params = new HashMap();
params.put("channel", channelList.get(1));//閫夋嫨閫氶亾1
@@ -825,24 +826,18 @@
params.put("action", "0");//涓婁紶妯″紡
String paramsStr = com.alibaba.fastjson2.JSON.toJSONString(params);
paramsStr = URLEncoder.encode(paramsStr,"UTF-8");
- System.out.println(paramsStr);
- sendCmdMap = sYClient.sendCmd(syURL,userId,carId,301,"MediaTake",paramsStr,(String) result1.get("sessionId"));
+ System.out.println("鎷嶇収鍙傛暟锛�"+paramsStr);
+ return sYClient.sendCmd(syURL,userId,carId,301,"MediaTake",paramsStr,sessionId);
// }
- return sendCmdMap;
+// return sendCmdMap;
}
@Override
- public Map<String, Object> getPhoto(String syURL, String carId, ArdSyUser ardSyUser,String startTime) {
+ public Map<String, Object> getPhoto(String syURL, String carId, String sessionId,String startTime) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
- //31鐢ㄦ埛鍚嶅瘑鐮�
- String username31 = ardSyUser.getUserId();
- String password31 = ardSyUser.getPassword();
- String passwordMd5 = DigestUtils.md5Hex(password31);
-// System.out.println(username31+"----------"+passwordMd5);
- Map<String, Object> result1 = sYClient.logIn(syURL, passwordMd5, username31);
- Map<String, Object> photoMap = new HashMap();
- photoMap = sYClient.getPhoto(syURL,carId,startTime,sdf.format(new Date()),(String) result1.get("sessionId"));
- return photoMap;
+ String endTime = sdf.format(new Date());
+ System.out.println("寮�濮嬫椂闂达細"+startTime+" 缁撴潫鏃堕棿锛�"+endTime);
+ return sYClient.getPhoto(syURL,carId,startTime,endTime,sessionId);
}
@Override
@@ -1233,4 +1228,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