From a4cd4c2d98392cd1036f36b96c262878743a7e63 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 05 九月 2024 19:52:22 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/java/com/ycl/controller/platformApi/TranspondDHController.java | 69 +++++++++++++++++++++++++++++-----
1 files changed, 59 insertions(+), 10 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/controller/platformApi/TranspondDHController.java b/ycl-platform/src/main/java/com/ycl/controller/platformApi/TranspondDHController.java
index c360933..b75e8cc 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/platformApi/TranspondDHController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/platformApi/TranspondDHController.java
@@ -4,7 +4,9 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import com.ycl.annotation.LogSave;
import com.ycl.api.CommonResult;
+import com.ycl.dto.casePool.ViolationParam;
import com.ycl.dto.v1.Req.FirstReq;
+import com.ycl.dto.v1.Req.GpsSubscribe;
import com.ycl.dto.v1.Req.SecondReq;
import com.ycl.dto.v1.Res.FirstRes;
import com.ycl.dto.video.AlarmParam;
@@ -25,50 +27,75 @@
@Api(tags = "绗笁鏂规帴鍙�-澶у崕")
@RestController
-@RequestMapping("/API/videoService/eventCenter/messages")
+@RequestMapping("/API")
public class TranspondDHController {
- @Value("${videoPoint.url}")
+ @Value("${DH.web_url}")
private String url;
- @Value("${videoPoint.userName}")
+ @Value("${DH.userName}")
private String userName;
- @Value("${videoPoint.passWord}")
+ @Value("${DH.passWord}")
private String passWord;
@Value("${videoPoint.ip}")
private String ip;
@ApiOperation("娑堟伅璁㈤槄")
- @GetMapping("/subscribeAddress")
+ @GetMapping("/videoService/eventCenter/messages/subscribeAddress")
public CommonResult subscribeAddress() {
String url = "/videoService/eventCenter/messages/subscribeAddress";
return getResult(url, "");
}
+ @ApiOperation("鐢ㄦ埛淇℃伅")
+ @GetMapping("/udu/user/infos")
+ public CommonResult infos() {
+ String url = "/udu/user/infos";
+ return getResult(url, "");
+ }
+
+ @ApiOperation("gps璁㈤槄")
+ @PostMapping("/dsu/gps/subscribe")
+ public CommonResult gps_subscribe(@RequestBody GpsSubscribe subscribe) {
+ String url = "/dsu/gps/subscribe";
+ postResult(url, subscribe);
+ return CommonResult.success("璁㈤槄鎴愬姛");
+ }
+
+ @ApiOperation("gps鐢ㄦ埛璁㈤槄")
+ @PostMapping("/dsu/gps/user/subscribe")
+ public CommonResult gps_user_subscribe(@RequestBody GpsSubscribe subscribe) {
+ String url = "/dsu/gps/user/subscribe";
+ postResult(url, subscribe);
+ return CommonResult.success("璁㈤槄鎴愬姛");
+ }
+
+
@ApiOperation("闀胯疆璇㈣幏鍙栨秷鎭�")
- @GetMapping("/subscribe")
+ @GetMapping("/videoService/eventCenter/messages/subscribe")
public CommonResult subscribe(@RequestParam Integer type,
@RequestParam Integer msgId,
@RequestParam(required = false) Integer msgNum,
@RequestParam(required = false) Integer waitSec) {
String url = "/videoService/eventCenter/messages/subscribe";
- String param = "?type=" + type + "&msgId=" + msgId + "&msgNum=" + msgNum + "&waitSec=" + waitSec;
+ String param = "?type=" + type + "&msgId=" + msgId + "&waitSec=" + waitSec + "&msgNum=" + msgNum;
+
return getResult(url, param);
}
- private CommonResult<?> getResult(String url, String param) {
+ private CommonResult<?> getResult(String reqUrl, String param) {
try {
String token = getToken();
-
+// System.out.println("瀹氫綅鎺ュ彛url:" + url + reqUrl + param);
HttpHeaders deviceHeaders = new HttpHeaders();
ObjectMapper objectMapper = new ObjectMapper();
deviceHeaders.add("X-Subject-Token", token);
HttpEntity<Object> deviceEntity = new HttpEntity<>(deviceHeaders);
RestTemplate restTemplate = new RestTemplate();
- ResponseEntity<String> exchange = restTemplate.exchange(url + param, HttpMethod.GET, deviceEntity, String.class);
+ ResponseEntity<String> exchange = restTemplate.exchange(url + reqUrl + param, HttpMethod.GET, deviceEntity, String.class);
System.out.println(exchange);
return CommonResult.success(exchange);
} catch (Exception ex) {
@@ -77,6 +104,28 @@
}
}
+ private void postResult(String reqUrl, GpsSubscribe subscribe) {
+ try {
+ String token = getToken();
+// System.out.println("瀹氫綅鎺ュ彛url:" + url + reqUrl + subscribe.toString());
+ HttpHeaders deviceHeaders = new HttpHeaders();
+ ObjectMapper objectMapper = new ObjectMapper();
+ deviceHeaders.add("X-Subject-Token", token);
+ HttpEntity<Object> deviceEntity = new HttpEntity<>(deviceHeaders);
+ //璇锋眰澶�
+ HttpHeaders httpHeaders = new HttpHeaders();
+ httpHeaders.setContentType(MediaType.APPLICATION_JSON);
+
+ RestTemplate restTemplate = new RestTemplate();
+ HttpEntity<String> secondEntity = new HttpEntity<>(objectMapper.writeValueAsString(subscribe), httpHeaders);
+ ResponseEntity<String> resEntity = restTemplate.postForEntity(url + reqUrl, secondEntity, String.class);
+
+ System.out.println(resEntity.toString());
+ } catch (Exception ex) {
+ System.out.println("瀹氫綅鎺ュ彛閿欒锛�" + ex.getMessage());
+ }
+ }
+
private String getToken() throws JsonProcessingException {
--
Gitblit v1.8.0