From 9490c47566a0f253f35a1019fd1b1e1473630d67 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 20 一月 2025 09:48:53 +0800
Subject: [PATCH] Merge branch 'dev'

---
 ycl-server/src/main/java/com/ycl/feign/UYClient.java |   71 +++++++++++++++++++++++++++++------
 1 files changed, 59 insertions(+), 12 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..ca8e48b 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,14 @@
 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;
+import org.springframework.web.bind.annotation.RequestHeader;
 
 /**
  * @author gonghl
@@ -17,17 +16,26 @@
  */
 
 @Component
-@FeignClient(name = "UYClient", url = "${request.youYunDomain}", configuration = YYFeignConfig.class)
+@FeignClient(name = "UYClient", url = "${request.youYunDomain}", configuration = UYFeignConfig.class)
 public interface UYClient {
 
     /**
      * 涓�鏈轰竴妗�
      *
-     * @param cameraParam 璇锋眰鍙傛暟
+     * @param oneMachineFileParam 璇锋眰鍙傛暟
      * @return 鏌ヨ鎽勫儚鏈烘竻鍗曢泦鍚�
      */
     @GetMapping("/VIID/Cameras")
-    JSONObject cameraList(@RequestParam CameraParam cameraParam);
+    JSONObject oneMachineFile(@SpringQueryMap OneMachineFileParam oneMachineFileParam);
+
+    /**
+     * 鍥惧儚鐩戞祴
+     *
+     * @param imageDetectionParam 璇锋眰鍙傛暟
+     * @return
+     */
+    @GetMapping("/videomon/api/v1/app/vqdMonitor/list")
+    JSONObject imageDetection(@SpringQueryMap ImageDetectionParam imageDetectionParam);
 
     /**
      * 鐐逛綅鍦ㄧ嚎
@@ -35,8 +43,8 @@
      * @param onlineParam 璇锋眰鍙傛暟
      * @return 鏌ヨ鍦ㄧ嚎缁熻鍒楄〃
      */
-    @GetMapping("/openapi/v1/report/online/list")
-    JSONObject onlineList(@RequestParam OnlineParam onlineParam);
+    @GetMapping("/videomon/api/v1/app/onlineMonitor/list")
+    JSONObject videoOnline(@SpringQueryMap VideoOnlineParam onlineParam);
 
     /**
      * 褰曞儚鍙敤
@@ -44,10 +52,49 @@
      * @param recordMetaDSumParam 璇锋眰鍙傛暟
      * @return 鏌ヨ婊¤冻鏉′欢鐨勫綍鍍忔眹鎬讳俊鎭�
      */
-    @PostMapping("/report/recordMetaDSum/list")
+    @PostMapping("/videomon/report/recordMetaDSum/list")
     JSONObject recordMetaDSumList(@RequestBody RecordMetaDSumParam recordMetaDSumParam);
 
-    @GetMapping("/api/v1/app/osdMonitor/list")
-    JSONObject osdMonitorList();
+    /**
+     * osd鏍囨敞淇℃伅
+     * @return
+     */
+    @GetMapping("/videomon-ocr/api/v1/osd/format/list")
+    JSONObject osdMonitorList(@SpringQueryMap OsdMonitorParam param, @RequestHeader("tenantId") String tenantId);
 
+    /**
+     * 鍥惧儚妫�娴嬭瘖鏂粨鏋�
+     *
+     * @param param
+     * @return
+     */
+    @GetMapping("/openapi/v1/vqdMonitor/queryVqdResult")
+    JSONObject queryVqdResult(@SpringQueryMap QueryVqdParam param);
+
+    /**
+     * 瑙嗛鍥惧儚璐ㄩ噺
+     *
+     * @param param
+     * @return
+     */
+    @GetMapping("/videomon/api/v1/app/report/vqd/detail/list")
+    JSONObject videoQuality(@SpringQueryMap VideoQualityParam param);
+
+    /**
+     * 涓�鏈轰竴妗ｅ悎鏍肩巼
+     *
+     * @param param
+     * @return
+     */
+    @GetMapping("/iotdiscovery/api/v1/app/camera/precision/stat/detail")
+    JSONObject monitorQualify(@SpringQueryMap MonitorQualifyParam param);
+
+    /**
+     * 浼樹簯鑾峰彇token鎺ュ彛
+     *
+     * @param param
+     * @return
+     */
+    @PostMapping(value = "/tenant/api/v1/user/login",headers = "No-Need-To-Token=true")
+    JSONObject getToken(@RequestBody UYTokenParam param);
 }

--
Gitblit v1.8.0