From 704e7207d74b6477c5f472c5aba92d484ab17f98 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 29 十一月 2023 17:07:11 +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/AlarmController.java |   67 ++++++++++++++++++++++++++++++---
 1 files changed, 61 insertions(+), 6 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 35b62d9..40068e6 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,10 +1,17 @@
 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.ycl.annotation.LogSave;
 import com.ycl.api.CommonResult;
 import com.ycl.dto.video.AlarmParam;
+import com.ycl.dto.video.HKAlarmParam;
+import com.ycl.entity.video.VideoPoint;
 import com.ycl.enums.common.ResultCode;
 import com.ycl.service.video.IVideoAlarmReportService;
+import com.ycl.service.video.impl.IVideoPointService;
 import com.ycl.util.VideoUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -24,6 +31,7 @@
 import java.util.Base64;
 import java.util.Dictionary;
 import java.util.Hashtable;
+import java.util.List;
 
 /**
  * @author admin
@@ -32,6 +40,7 @@
 @RestController
 @RequestMapping("/API")
 public class AlarmController {
+    private IVideoPointService videoPointService;
     private IVideoAlarmReportService videoAlarmReportService;
 
     private static Dictionary<String, Integer> sessionDic = new Hashtable<>();
@@ -44,10 +53,26 @@
         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());
+    }
+
+    @ApiOperation("娴峰悍瑙嗛鎶ヨ鎺ㄩ�丄PI")
+    @PostMapping("/HK/alarmReport")
+    @LogSave(operationType = "鎶ヨ绠＄悊", contain = "娴峰悍瑙嗛鎶ヨ鎺ㄩ��")
+    public CommonResult hkAlarmReport(@RequestBody @Validated HKAlarmParam alarmParam) {
+        System.out.println("娴峰悍瑙嗛鎶ヨ鎺ㄩ�丄PI锛�" + JSONObject.toJSONString(alarmParam));
+        videoAlarmReportService.saveFromHK(alarmParam);
         return new CommonResult(ResultCode.SUCCESS.getCode(), ResultCode.SUCCESS.getMessage());
     }
 
@@ -57,13 +82,34 @@
     public CommonResult getMonitorAddress(@PathVariable String code, @PathVariable Integer subType,
                                           @RequestParam(required = false) String scheme) {
 
-        if (subType == null) {
-            subType = 1;
+        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) {
+//                videoUtil.getKHPresets(code);
+                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 {
+
+            if (subType == null) {
+                subType = 1;
+            }
+            if (!StringUtils.isNotBlank(scheme)) {
+                scheme = "RTSP";
+            }
+            return CommonResult.successApi(videoUtil.getVideo(code, scheme, subType));
         }
-        if (!StringUtils.isNotBlank(scheme)) {
-            scheme = "RTSP";
-        }
-        return CommonResult.successApi(videoUtil.getVideo(code, scheme, subType));
     }
 
 
@@ -80,11 +126,20 @@
 
     }
 
+
+    @GetMapping(value = "/index")
+    @ResponseBody
+    public String getImages(HttpServletRequest request, HttpServletResponse response) {
+        return "閬傛槍缁煎悎鎵ф硶骞冲彴";
+
+    }
+
     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();

--
Gitblit v1.8.0