From b54ea64cbb2cf8d613ca1ecf6ed9e5140abb4b9f Mon Sep 17 00:00:00 2001
From: Van333 <van666666@foxmail.com>
Date: 星期三, 26 十月 2022 15:30:29 +0800
Subject: [PATCH] 参数调整
---
src/main/java/api/controller/CameraController.java | 88 +++++++++++++++++++++++++++++++++++++------
1 files changed, 75 insertions(+), 13 deletions(-)
diff --git a/src/main/java/api/controller/CameraController.java b/src/main/java/api/controller/CameraController.java
index ba233fe..6584974 100644
--- a/src/main/java/api/controller/CameraController.java
+++ b/src/main/java/api/controller/CameraController.java
@@ -7,7 +7,6 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.google.common.util.concurrent.RateLimiter;
-import com.google.gson.Gson;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -33,39 +32,102 @@
RateLimiter rateLimiter = RateLimiter.create(10.0);
- @RequestMapping(value = "/getToken",method = RequestMethod.POST)
- public Msg listWithNotStatus(@RequestBody ReqParams reqParams){
+ @RequestMapping(value = "/getToken", method = RequestMethod.POST)
+ public Msg getToken(@RequestBody ReqParams reqParams) {
rateLimiter.acquire(1);
Long userId = accessService.getUserId(reqParams.getAccessToken());
- if(userId == null){
+ if (userId == null) {
return Msg.error("accessToken exception!!!");
}
//鐖禷ccesstoken
- Map<String, String> parms =new HashMap<>(2);
+ Map<String, String> parms = new HashMap<>(2);
- parms.put("appKey","51a534ebadf54c31a0848dc575dfa206");
- parms.put("appSecret","8c32c67a73c87b9e461b2e3bdf58967a");
- String post = HttpUtil.httpRequestToString("https://open.ys7.com/api/lapp/token/get","post",parms);
- String accessToken= JSON.parseObject(JSON.parseObject(post).getString("data")).getString("accessToken");
+ parms.put("appKey", "51a534ebadf54c31a0848dc575dfa206");
+ parms.put("appSecret", "8c32c67a73c87b9e461b2e3bdf58967a");
+ String post = HttpUtil.httpRequestToString("https://open.ys7.com/api/lapp/token/get", "post", parms);
+ String accessToken = JSON.parseObject(JSON.parseObject(post).getString("data")).getString("accessToken");
//瀛恆ccesstoken
String ys7AccountId = accessService.getYs7AccountId(reqParams.getAccessToken());
- Map<String, String> parms02 =new HashMap<>(2);
+ Map<String, String> parms02 = new HashMap<>(2);
- parms02.put("accessToken",accessToken);
- parms02.put("accountId",ys7AccountId);
- String post02 = HttpUtil.httpRequestToString("https://open.ys7.com/api/lapp/ram/token/get","post",parms02);
+ parms02.put("accessToken", accessToken);
+ parms02.put("accountId", ys7AccountId);
+ String post02 = HttpUtil.httpRequestToString("https://open.ys7.com/api/lapp/ram/token/get", "post", parms02);
System.out.println(post02);
JSONObject data = JSON.parseObject(JSON.parseObject(post02).getString("data"));
+// System.out.println(data);
+
+// System.out.println(data.get("accessToken"));
+// accessService.setYs7Token((String) data.get("accessToken"), reqParams.getAccessToken());
+
return Msg.ok(data);
}
+
+
+ @RequestMapping("/getLiveAddress")
+ public Msg getUrl(@RequestBody ReqParams reqParams){
+ System.out.println(reqParams.toString());
+ rateLimiter.acquire(1);
+
+ Long userId = accessService.getUserId(reqParams.getAccessToken());
+
+
+ if (userId == null) {
+ return Msg.error("accessToken exception!!!");
+ }
+
+ Map<String, String> parms = new HashMap<>(2);
+
+ parms.put("appKey", "51a534ebadf54c31a0848dc575dfa206");
+ parms.put("appSecret", "8c32c67a73c87b9e461b2e3bdf58967a");
+ String post = HttpUtil.httpRequestToString("https://open.ys7.com/api/lapp/token/get", "post", parms);
+ String accessToken = JSON.parseObject(JSON.parseObject(post).getString("data")).getString("accessToken");
+
+
+ //瀛恆ccesstoken
+
+ String ys7AccountId = accessService.getYs7AccountId(reqParams.getAccessToken());
+
+ Map<String, String> parms02 = new HashMap<>(2);
+
+ parms02.put("accessToken", accessToken);
+ parms02.put("accountId", ys7AccountId);
+ String post02 = HttpUtil.httpRequestToString("https://open.ys7.com/api/lapp/ram/token/get", "post", parms02);
+ System.out.println(post02);
+ JSONObject data = JSON.parseObject(JSON.parseObject(post02).getString("data"));
+
+ //鍙互鍗曠嫭浼犲叆http鍙傛暟锛岃繖鏍峰弬鏁颁細鑷姩鍋歎RL缂栫爜锛屾嫾鎺ュ湪URL涓�
+ HashMap<String, Object> paramMap = new HashMap<>();
+ paramMap.put("accessToken", data.get("accessToken"));
+ paramMap.put("deviceSerial", reqParams.getDeviceSerial());
+ paramMap.put("protocol", 2);
+ paramMap.put("expireTime", 720 * 60 * 60 * 24);
+ paramMap.put("quality", 1);
+
+
+ try {
+ String result =
+ cn.hutool.http.HttpUtil.post
+ ("https://open.ys7.com/api/lapp/v2/live/address/get", paramMap);
+
+ System.out.println(result);
+ JSONObject url = JSON.parseObject(JSON.parseObject(result).getString("data"));
+
+ return Msg.ok(url);
+ } catch (Exception e) {
+ return Msg.error();
+ }
+ }
}
+
+
--
Gitblit v1.9.3