From 7ef4892f9f24f941aca37e6b3991b808a0aca619 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期五, 08 九月 2023 11:16:35 +0800
Subject: [PATCH] 优化
---
ycl-platform/src/main/java/com/ycl/controller/platformApi/AlarmController.java | 217 ++++++++++++++++++++++++++++++++++--------------------
1 files changed, 136 insertions(+), 81 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/controller/platformApi/AlarmController.java b/ycl-platform/src/main/java/com/ycl/controller/platformApi/AlarmController.java
index a583190..fda52c9 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/platformApi/AlarmController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/platformApi/AlarmController.java
@@ -1,29 +1,36 @@
package com.ycl.controller.platformApi;
+import cn.hutool.json.JSONConverter;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import com.ycl.annotation.LogSave;
import com.ycl.api.CommonResult;
-import com.ycl.dto.v1.Req.FirstReq;
-import com.ycl.dto.v1.Req.SecondReq;
-import com.ycl.dto.v1.Res.FirstRes;
import com.ycl.dto.video.AlarmParam;
+import com.ycl.entity.video.VideoPoint;
import com.ycl.enums.common.ResultCode;
import com.ycl.service.video.IVideoAlarmReportService;
-import com.ycl.utils.MD5Util;
+import com.ycl.service.video.impl.IVideoPointService;
+import com.ycl.util.VideoUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.SneakyThrows;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.*;
-import org.springframework.http.client.ClientHttpResponse;
-import org.springframework.http.client.SimpleClientHttpRequestFactory;
+import org.springframework.http.MediaType;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
-import org.springframework.web.client.DefaultResponseErrorHandler;
-import org.springframework.web.client.RestTemplate;
-import java.net.URI;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.Base64;
+import java.util.Dictionary;
+import java.util.Hashtable;
+import java.util.List;
/**
* @author admin
@@ -32,29 +39,29 @@
@RestController
@RequestMapping("/API")
public class AlarmController {
-
- @Value("${videoPoint.url}")
- private String url;
-
- @Value("${videoPoint.userName}")
- private String userName;
-
- @Value("${videoPoint.passWord}")
- private String passWord;
-
- @Value("${videoPoint.ip}")
- private String ip;
-
+ private IVideoPointService videoPointService;
private IVideoAlarmReportService videoAlarmReportService;
+
+ private static Dictionary<String, Integer> sessionDic = new Hashtable<>();
+
+ @Autowired
+ private VideoUtil videoUtil;
@Autowired
public void setVideoAlarmReportService(IVideoAlarmReportService videoAlarmReportService) {
this.videoAlarmReportService = videoAlarmReportService;
}
+ @Autowired
+ public void setVideoPointService(IVideoPointService videoPointService) {
+ this.videoPointService = videoPointService;
+ }
+
@ApiOperation("瑙嗛鎶ヨ鎺ㄩ�丄PI")
@PostMapping("/AlarmReport")
+ @LogSave(operationType = "鎶ヨ绠＄悊", contain = "瑙嗛鎶ヨ鎺ㄩ��")
public CommonResult alarmReport(@RequestBody @Validated AlarmParam alarmParam) {
+// System.out.println("淇濆瓨鎶ヨ鏁版嵁锛�" + JSONObject.toJSONString(alarmParam));
videoAlarmReportService.save(alarmParam);
return new CommonResult(ResultCode.SUCCESS.getCode(), ResultCode.SUCCESS.getMessage());
}
@@ -65,71 +72,119 @@
public CommonResult getMonitorAddress(@PathVariable String code, @PathVariable Integer subType,
@RequestParam(required = false) String scheme) {
- String clientType = "winpc";
- String reqUrl = "/videoService/accounts/authorize";
- String deviceUrl = "/videoService/devicesManager/devices";
- if (subType == null) {
- subType = 1;
- }
- if (!StringUtils.isNotBlank(scheme)) {
- scheme = "RTSP";
- }
- String monitorUrl = "/videoService/realmonitor/uri?subType=" + subType + "&scheme=" + scheme + "&channelId=";
-
- RestTemplate restTemplate = new RestTemplate();
- restTemplate.setErrorHandler(new DefaultResponseErrorHandler() {
- @Override
- public boolean hasError(HttpStatus status) {
- return super.hasError(status);
+ LambdaQueryWrapper<VideoPoint> queryWrapper = new LambdaQueryWrapper<VideoPoint>()
+ .eq(VideoPoint::getPlatResourceId, code)
+ .or().eq(VideoPoint::getCode, code);
+ List<VideoPoint> pointList = videoPointService.list(queryWrapper);
+ if (pointList.size() > 0) {
+ VideoPoint videoPoint = pointList.get(0);
+ if (videoPoint.getType() == 1) {
+ return CommonResult.successApi(videoUtil.getKHVideo(code));
+ } else {
+ if (subType == null) {
+ subType = 1;
+ }
+ if (!StringUtils.isNotBlank(scheme)) {
+ scheme = "RTSP";
+ }
+ return CommonResult.successApi(videoUtil.getVideo(code, scheme, subType));
}
+ } else {
- @Override
- public void handleError(URI url, HttpMethod method, ClientHttpResponse response) {
-
+ if (subType == null) {
+ subType = 1;
}
- });
- SimpleClientHttpRequestFactory simpleClientHttpRequestFactory = new SimpleClientHttpRequestFactory();
- simpleClientHttpRequestFactory.setOutputStreaming(false);
- restTemplate.setRequestFactory(simpleClientHttpRequestFactory);
+ if (!StringUtils.isNotBlank(scheme)) {
+ scheme = "RTSP";
+ }
+ return CommonResult.successApi(videoUtil.getVideo(code, scheme, subType));
+ }
+ }
- //璇锋眰澶�
- HttpHeaders httpHeaders = new HttpHeaders();
- httpHeaders.setContentType(MediaType.APPLICATION_JSON);
- //绗竴娆℃潈闄愯姹備綋
- FirstReq firstReq = new FirstReq();
- firstReq.setIpAddress(ip);
- firstReq.setUserName(userName);
- firstReq.setClientType(clientType);
- ObjectMapper objectMapper = new ObjectMapper();
+ @ApiOperation(value = "鑾峰彇鍥剧墖")
+ @GetMapping(value = "/img", produces = {MediaType.IMAGE_JPEG_VALUE, MediaType.IMAGE_PNG_VALUE})
+// @GetMapping(value = "/img")
+ @ResponseBody
+ public byte[] getImages(HttpServletRequest request, HttpServletResponse response,
+ @RequestParam String fileUrl, @RequestParam(required = false) String OSSAccessKeyId,
+ @RequestParam(required = false) String Signature) {
+ String sessionId = request.getSession().getId();
+ sessionDic.put(sessionId, 0);
+ return getBytes(fileUrl, OSSAccessKeyId, Signature, sessionId);
- HttpEntity<String> firstEntity = new HttpEntity<>(objectMapper.writeValueAsString(firstReq), httpHeaders);
- ResponseEntity<String> responseEntity = restTemplate.postForEntity(url + reqUrl, firstEntity, String.class);
+ }
- FirstRes firstRes = objectMapper.readValue(responseEntity.getBody(), FirstRes.class);
+ private byte[] getBytes(String fileUrl, String OSSAccessKeyId, String Signature, String sessionId) {
+ int index = sessionDic.get(sessionId);
+ try {
+ if (sessionDic.get(sessionId) < 10) {
+ sessionDic.remove(sessionId);
+ fileUrl = fileUrl.replace("Expires", "v");
+ System.out.println("getImages鑾峰彇鍥剧墖鍦板潃锛�" + fileUrl + "&OSSAccessKeyId=" + OSSAccessKeyId + "&Signature=" + Signature);
+ URL url = new URL(fileUrl + "&OSSAccessKeyId=" + OSSAccessKeyId + "&Signature=" + Signature);
+ HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+ conn.setRequestMethod("GET");
+ conn.setConnectTimeout(10 * 1000);
+ conn.setRequestProperty("User-Agent", "Mozilla/4.0 (compatible; MSIE 5.0; Windows NT; DigExt)");
- String signature = MD5Util.md5Encrypt(passWord);
- signature = MD5Util.md5Encrypt(userName + signature);
- signature = MD5Util.md5Encrypt(signature);
- signature = MD5Util.md5Encrypt(userName + ":" + firstRes.getRealm() + ":" + signature);
- signature = MD5Util.md5Encrypt(signature + ":" + firstRes.getRandomKey());
+ InputStream inputStream = conn.getInputStream();// 閫氳繃杈撳叆娴佽幏鍙栧浘鐗囨暟鎹�
- SecondReq secondReq = new SecondReq();
- secondReq.setIpAddress(ip);
- secondReq.setEncryptType(firstRes.getEncryptType());
- secondReq.setSignature(signature);
- secondReq.setRandomKey(firstRes.getRandomKey());
- secondReq.setClientType(clientType);
- secondReq.setUserName(userName);
+ byte[] data = readInputStream(inputStream);
+ System.out.println("getImages鑾峰彇鍥剧墖鎴愬姛");
- HttpEntity<String> secondEntity = new HttpEntity<>(objectMapper.writeValueAsString(secondReq), httpHeaders);
- ResponseEntity<String> secondResEntity = restTemplate.postForEntity(url + reqUrl, secondEntity, String.class);
- HttpHeaders deviceHeaders = new HttpHeaders();
- deviceHeaders.add("X-Subject-Token", objectMapper.readTree(secondResEntity.getBody()).get("token").textValue());
- HttpEntity<Object> deviceEntity = new HttpEntity<>(deviceHeaders);
- ResponseEntity<String> exchange = restTemplate.exchange(url + deviceUrl + "/" + code, HttpMethod.GET, deviceEntity, String.class);
- String channelId = objectMapper.readTree(objectMapper.readTree(objectMapper.readTree(exchange.getBody()).get("encoderUnit").toString()).get("channels").get(0).toString()).get("channelId").textValue();
- ResponseEntity<String> monitorReq = restTemplate.exchange(url + monitorUrl + channelId, HttpMethod.GET, deviceEntity, String.class);
- return CommonResult.successApi(objectMapper.readTree(monitorReq.getBody()).get("url"));
+ return data;
+ }
+ } catch (Exception e) {
+ index++;
+ sessionDic.put(sessionId, index);
+ System.out.println(index + "-getImages鑾峰彇鍥剧墖澶辫触锛�" + e.getMessage());
+ e.printStackTrace();
+ getBytes(fileUrl, OSSAccessKeyId, Signature, sessionId);
+
+ }
+ return null;
+ }
+
+ private static String inputStream2Base64(InputStream is) throws Exception {
+ byte[] data = null;
+ try {
+ ByteArrayOutputStream swapStream = new ByteArrayOutputStream();
+ byte[] buff = new byte[100];
+ int rc = 0;
+ while ((rc = is.read(buff, 0, 100)) > 0) {
+ swapStream.write(buff, 0, rc);
+ }
+ data = swapStream.toByteArray();
+ } catch (IOException e) {
+ e.printStackTrace();
+ } finally {
+ if (is != null) {
+ try {
+ is.close();
+ } catch (IOException e) {
+ throw new Exception("杈撳叆娴佸叧闂紓甯�");
+ }
+ }
+ }
+
+ return Base64.getEncoder().encodeToString(data);
+ }
+
+ private byte[] readInputStream(InputStream inStream) throws Exception {
+ ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+ //鍒涘缓涓�涓狟uffer瀛楃涓�
+ byte[] buffer = new byte[1024];
+ //姣忔璇诲彇鐨勫瓧绗︿覆闀垮害锛屽鏋滀负-1锛屼唬琛ㄥ叏閮ㄨ鍙栧畬姣�
+ int len = 0;
+ //浣跨敤涓�涓緭鍏ユ祦浠巄uffer閲屾妸鏁版嵁璇诲彇鍑烘潵
+ while ((len = inStream.read(buffer)) != -1) {
+ //鐢ㄨ緭鍑烘祦寰�buffer閲屽啓鍏ユ暟鎹紝涓棿鍙傛暟浠ｈ〃浠庡摢涓綅缃紑濮嬭锛宭en浠ｈ〃璇诲彇鐨勯暱搴�
+ outStream.write(buffer, 0, len);
+ }
+ //鍏抽棴杈撳叆娴�
+ inStream.close();
+ //鎶妎utStream閲岀殑鏁版嵁鍐欏叆鍐呭瓨
+ return outStream.toByteArray();
}
}
\ No newline at end of file
--
Gitblit v1.8.0