From 2217289657c3a402e132490497b10f3876bc1aa1 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期一, 06 十一月 2023 10:17:36 +0800
Subject: [PATCH] 获取三一地址
---
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java | 43 ++++++++++++++++---------------------------
1 files changed, 16 insertions(+), 27 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..0cd276d 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
@@ -798,25 +798,22 @@
}
@Override
- public Map<String, Object> getCarPicture(String carId, String syURL, ArdSyUser ardSyUser) {
- //31鐢ㄦ埛鍚嶅瘑鐮�
- String username31 = ardSyUser.getUserId();
- String password31 = ardSyUser.getPassword();
- String passwordMd5 = DigestUtils.md5Hex(password31);
- 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;
+ public Map<String, Object> getCarPicture(String carId, String syURL, String sessionId) {
+ return sYClient.getCarPicture(syURL, carId, sessionId);
}
@Override
- public Map<String, Object> sendCmd(String syURL, ArdSyUser ardSyUser, String carId, List<String> channelList) throws UnsupportedEncodingException {
- //31鐢ㄦ埛鍚嶅瘑鐮�
- String userId = ardSyUser.getUserId();
+ public String getSessionId(String syURL,ArdSyUser ardSyUser) {
+ String username31 = 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();
+ String passwordMd5 = DigestUtils.md5Hex(password31);
+ System.out.println(passwordMd5);
+ Map<String, Object> result1 = sYClient.logIn(syURL, passwordMd5, username31);
+ return (String) result1.get("sessionId");
+ }
+
+ @Override
+ 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
@@ -826,23 +823,15 @@
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"));
+ 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;
+ return sYClient.getPhoto(syURL,carId,startTime,sdf.format(new Date()),sessionId);
}
@Override
--
Gitblit v1.9.3