From b1f91d23c01266dda8cad34aa866bcac741a21cf Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期六, 23 十二月 2023 17:03:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 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..f6d4342 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
@@ -783,13 +783,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 +1222,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