From a8c87a18fed28e8cd06b20de9def11631f80ab96 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 31 七月 2024 16:21:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/feign/UYClient.java | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/feign/UYClient.java b/ycl-server/src/main/java/com/ycl/feign/UYClient.java
index 5cb01dc..44d25b8 100644
--- a/ycl-server/src/main/java/com/ycl/feign/UYClient.java
+++ b/ycl-server/src/main/java/com/ycl/feign/UYClient.java
@@ -1,15 +1,13 @@
package com.ycl.feign;
import com.alibaba.fastjson2.JSONObject;
-import com.ycl.platform.domain.param.UY.CameraParam;
-import com.ycl.platform.domain.param.UY.OnlineParam;
-import com.ycl.platform.domain.param.UY.RecordMetaDSumParam;
+import com.ycl.platform.domain.param.UY.*;
import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
/**
* @author gonghl
@@ -23,11 +21,11 @@
/**
* 涓�鏈轰竴妗�
*
- * @param cameraParam 璇锋眰鍙傛暟
+ * @param oneMachineFileParam 璇锋眰鍙傛暟
* @return 鏌ヨ鎽勫儚鏈烘竻鍗曢泦鍚�
*/
@GetMapping("/VIID/Cameras")
- JSONObject cameraList(@RequestParam CameraParam cameraParam);
+ JSONObject oneMachineFile(@SpringQueryMap OneMachineFileParam oneMachineFileParam);
/**
* 鐐逛綅鍦ㄧ嚎
@@ -36,7 +34,7 @@
* @return 鏌ヨ鍦ㄧ嚎缁熻鍒楄〃
*/
@GetMapping("/openapi/v1/report/online/list")
- JSONObject onlineList(@RequestParam OnlineParam onlineParam);
+ JSONObject onlineList(@SpringQueryMap OnlineParam onlineParam);
/**
* 褰曞儚鍙敤
@@ -50,4 +48,21 @@
@GetMapping("/api/v1/app/osdMonitor/list")
JSONObject osdMonitorList();
+ /**
+ * 鍥惧儚妫�娴嬭瘖鏂粨鏋�
+ *
+ * @param param
+ * @return
+ */
+ @GetMapping("/openapi/v1/vqdMonitor/queryVqdResult")
+ JSONObject queryVqdResult(@SpringQueryMap QueryVqdParam param);
+
+ /**
+ * 瑙嗛鍥惧儚璐ㄩ噺
+ *
+ * @param param
+ * @return
+ */
+ @GetMapping("/api/v1/app/report/vqd/detail/list")
+ JSONObject videoQuality(@SpringQueryMap VideoQualityParam param);
}
--
Gitblit v1.8.0