From e4d7da0fc500395f70f13d6c46bd7227c8644ec4 Mon Sep 17 00:00:00 2001
From: liusuyi <13324259@qq.com>
Date: 星期三, 29 十一月 2023 21:18:59 +0800
Subject: [PATCH] 增加雷达引导相机跟踪
---
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java | 18 ++++++++++++------
1 files changed, 12 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 0cd276d..c5d4c27 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
@@ -782,7 +782,7 @@
}
@Override
- public Results getCarGPSBycarId(String usersId, String carId, String syURL, ArdSyUser ardSyUser) {
+ 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();
@@ -792,9 +792,7 @@
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
@@ -822,7 +820,7 @@
params.put("action", "0");//涓婁紶妯″紡
String paramsStr = com.alibaba.fastjson2.JSON.toJSONString(params);
paramsStr = URLEncoder.encode(paramsStr,"UTF-8");
- System.out.println(paramsStr);
+ System.out.println("鎷嶇収鍙傛暟锛�"+paramsStr);
return sYClient.sendCmd(syURL,userId,carId,301,"MediaTake",paramsStr,sessionId);
// }
// return sendCmdMap;
@@ -831,7 +829,9 @@
@Override
public Map<String, Object> getPhoto(String syURL, String carId, String sessionId,String startTime) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
- return sYClient.getPhoto(syURL,carId,startTime,sdf.format(new Date()),sessionId);
+ String endTime = sdf.format(new Date());
+ System.out.println("寮�濮嬫椂闂达細"+startTime+" 缁撴潫鏃堕棿锛�"+endTime);
+ return sYClient.getPhoto(syURL,carId,startTime,endTime,sessionId);
}
@Override
@@ -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