From 6decb63d865de6b551324fd9782555786132170e Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期二, 07 十一月 2023 16:11:22 +0800
Subject: [PATCH] 1、修改相机异步登录 2、sdk切换更改为策略模式 3、修复手动巡检停止录像bug
---
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java | 48 +++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 43 insertions(+), 5 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 f0133ad..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
@@ -2,6 +2,8 @@
import java.io.IOException;
import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -796,18 +798,54 @@
}
@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 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
+ params.put("interval", "0");//姣忛殧0s鐓т竴娆�
+ params.put("photoNum", "1");//鐓�1寮�
+ params.put("action", "0");//涓婁紶妯″紡
+ String paramsStr = com.alibaba.fastjson2.JSON.toJSONString(params);
+ paramsStr = URLEncoder.encode(paramsStr,"UTF-8");
+ System.out.println(paramsStr);
+ return sYClient.sendCmd(syURL,userId,carId,301,"MediaTake",paramsStr,sessionId);
+// }
+// return sendCmdMap;
+ }
+
+ @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);
+ }
+
+ @Override
+ public Map<String, Object> getVideo(String syURL,String carId,ArdSyUser ardSyUser) {
+ //31鐢ㄦ埛鍚嶅瘑鐮�
+ String username = ardSyUser.getUserId();
+ String password31 = ardSyUser.getPassword();
+ String password = DigestUtils.md5Hex(password31);
+// Map<String, Object> result1 = sYClient.logIn(syURL, passwordMd5, username31);
+ return sYClient.getVideo(syURL,username,password,"榛慐12401",1);
+ }
+
+
+ @Override
public Results chaseCarByCarId(String usersId, String carId, String cycle) {
try {
/*Map<String,Map<String,Object>> map = new HashMap();
--
Gitblit v1.9.3