From b802e81da449baa2cb4ec23deb02055d3a8f8f5c Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: Tue, 02 Apr 2024 14:11:23 +0800
Subject: [PATCH] 修复相机密码脱敏导致的bug
---
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java | 38 +++++++++++++++++++++++++++++++++++++-
1 files changed, 37 insertions(+), 1 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 ea18e26..baa6568 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
@@ -717,7 +717,12 @@
String passwordMd5 = DigestUtils.md5Hex(password31);
Map<String, Object> result1 = sYClient.logIn(syURL, passwordMd5, username31);
Map<String, Object> result0 = new HashMap();
- result0 = sYClient.getCarGPSTrack(syURL, carId, startTime, endTime, maxSpeed, (String) result1.get("sessionId"));
+ //result0 = sYClient.getCarGPSTrack(syURL, carId, startTime, endTime, maxSpeed, (String) result1.get("sessionId"));
+ try {
+ result0 = getCarGPSTrack(syURL, carId, startTime, endTime, maxSpeed, (String) result1.get("sessionId"));
+ } catch (Exception e) {
+ return Results.error("查询历史数据数量过多导致超时，请缩小范围查询！");
+ }
List<Map<String, Object>> list = (List<Map<String, Object>>) result0.get("list");
if (list.isEmpty()) {
return Results.succeed();
@@ -737,6 +742,37 @@
}
}
+ public static Map<String,Object> getCarGPSTrack(String syURL,String carId,String startTime,String endTime,String maxSpeed,String sessionId){
+ OkHttpClient okHttpClient = new OkHttpClient();
+
+ Request request = new Request.Builder()
+ .url(syURL + "/gps-web/api/get_gps_h.jsp?carId=" + carId + "&startTime=" + startTime + "&endTime=" + endTime + "&sessionId=" + sessionId)
+ .build();
+
+ Response response = null;
+ try {
+ response = okHttpClient.newCall(request).execute();
+ } catch (IOException e1) {
+ // TODO Auto-generated catch block
+ e1.printStackTrace();
+ }
+
+ response.headers(); //响应头
+
+ ResponseBody responseBody = response.body();
+
+ try {
+ String message = responseBody.string();// 响应体
+ Map<String,Object> map = (Map<String, Object>) JSON.parse(message);
+ //System.out.println(message);
+ return map;
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ return new HashMap();
+ }
+ }
+
public Map<String, List<String>> getInfo(String type, String stts) {
if (stts.isEmpty()) {
--
Gitblit v1.9.3