From 950f31ee2351e2d26ede3eeba49c09d52f46b296 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期五, 03 十一月 2023 17:31:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java | 38 ++++++++++++++++++++++++++++++++++++--
1 files changed, 36 insertions(+), 2 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 a68a2e4..fcb0887 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
@@ -1,5 +1,8 @@
package com.ruoyi.sy.controller;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.text.SimpleDateFormat;
import java.util.*;
import javax.annotation.PostConstruct;
import javax.annotation.Resource;
@@ -393,19 +396,50 @@
@GetMapping("getCarPicture")
@ApiOperation("娓呮筏鑾峰彇鐓х墖")
- public AjaxResult getCarNearPositionByCarId(String carId){
+ public AjaxResult getCarNearPositionByCarId(String carId) throws UnsupportedEncodingException {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
+ Date currentTime = new Date();
+ long tenSeconds = 1000L;
+ Date beforeTenSeconds = new Date(currentTime.getTime() - tenSeconds);
+ String startTime = sdf.format(beforeTenSeconds);
String usersId = SecurityUtils.getUserId();
ArdSyUser ardSyUser = iArdSyUserService.userById(usersId);
String syURL = sysConfigService.getSYURL();
+ //鑾峰彇鎽勫儚閫氶亾淇℃伅
Map<String, Object> result = ardSyCarService.getCarPicture(carId,syURL,ardSyUser);
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);
vs = (String) videos.get("vs");
} catch (Exception e) {
return AjaxResult.error("璇ヨ溅杈嗘病鏈夋憚鍍忛�氶亾鏃犵収鐗囨暟鎹紒");
}
- return AjaxResult.success(vs);
+ //绛涢�夐�氶亾淇℃伅
+ String[] vsArray = vs.split(",");
+ List<String> channelList = new ArrayList<>();
+ for (int i = 0; i < vsArray.length; i++) {
+ channelList.add(vsArray[i].substring(0,1));
+ }
+ //鎷嶇収
+ Map<String,Object> sendCmdMap = ardSyCarService.sendCmd(syURL,ardSyUser,carId,channelList);
+// System.out.println(sendCmdMap);
+ //鑾峰彇鐓х墖
+ Map<String,Object> photoMap = ardSyCarService.getPhoto(syURL,carId,ardSyUser,startTime);
+// System.out.println(photoMap);
+ return AjaxResult.success(photoMap);
}
+
+ @GetMapping("getVideo")
+ @ApiOperation("娓呮筏鑾峰彇瑙嗛")
+ public AjaxResult getVideo(String carId){
+ String usersId = SecurityUtils.getUserId();
+ ArdSyUser ardSyUser = iArdSyUserService.userById(usersId);
+ String syURL = sysConfigService.getSYURL();
+ Map<String,Object> video = ardSyCarService.getVideo(syURL,carId,ardSyUser);
+ return AjaxResult.success(video);
+ }
+
}
--
Gitblit v1.9.3