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/controller/ArdSyCarController.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java b/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java
index fcb0887..314679f 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java
@@ -402,17 +402,20 @@
long tenSeconds = 1000L;
Date beforeTenSeconds = new Date(currentTime.getTime() - tenSeconds);
String startTime = sdf.format(beforeTenSeconds);
+ System.out.println(startTime);
String usersId = SecurityUtils.getUserId();
ArdSyUser ardSyUser = iArdSyUserService.userById(usersId);
String syURL = sysConfigService.getSYURL();
+ String sessionId = ardSyCarService.getSessionId(syURL,ardSyUser);
+ System.out.println(sessionId);
//鑾峰彇鎽勫儚閫氶亾淇℃伅
- Map<String, Object> result = ardSyCarService.getCarPicture(carId,syURL,ardSyUser);
+ Map<String, Object> result = ardSyCarService.getCarPicture(carId,syURL,sessionId);
String vs = "";
try {
//鎻愬彇閫氶亾淇℃伅
Map<String,Object> map = ((List<Map<String,Object>>)result.get("list")).get(0);
Map<String, Object> videos = (Map<String, Object>) JSON.parse((String) map.get("videos"));
-// System.out.println(videos);
+ System.out.println(videos);
vs = (String) videos.get("vs");
} catch (Exception e) {
return AjaxResult.error("璇ヨ溅杈嗘病鏈夋憚鍍忛�氶亾鏃犵収鐗囨暟鎹紒");
@@ -424,11 +427,11 @@
channelList.add(vsArray[i].substring(0,1));
}
//鎷嶇収
- Map<String,Object> sendCmdMap = ardSyCarService.sendCmd(syURL,ardSyUser,carId,channelList);
-// System.out.println(sendCmdMap);
+ Map<String,Object> sendCmdMap = ardSyCarService.sendCmd(ardSyUser.getUserId(),syURL,sessionId,carId,channelList);
+ System.out.println(sendCmdMap);
//鑾峰彇鐓х墖
- Map<String,Object> photoMap = ardSyCarService.getPhoto(syURL,carId,ardSyUser,startTime);
-// System.out.println(photoMap);
+ Map<String,Object> photoMap = ardSyCarService.getPhoto(syURL,carId,sessionId,startTime);
+ System.out.println(photoMap);
return AjaxResult.success(photoMap);
}
@@ -442,4 +445,10 @@
return AjaxResult.success(video);
}
+ @GetMapping("getThreeOne")
+ @ApiOperation("鑾峰彇涓変竴瑙嗛鍦板潃")
+ public AjaxResult getThreeOne() {
+ return AjaxResult.success("鑾峰彇鍦板潃鎴愬姛锛�",sysConfigService.selectConfigByKey("threeOneVideo"));
+ }
+
}
--
Gitblit v1.9.3