From 01a30369e55a754c28dec4939a99e59aefecdc60 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 08 八月 2024 20:48:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/feign/UYClient.java | 7 +++----
1 files changed, 3 insertions(+), 4 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 3610c41..d8a09fc 100644
--- a/ycl-server/src/main/java/com/ycl/feign/UYClient.java
+++ b/ycl-server/src/main/java/com/ycl/feign/UYClient.java
@@ -2,7 +2,6 @@
import com.alibaba.fastjson2.JSONObject;
import com.ycl.platform.domain.param.UY.*;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.cloud.openfeign.SpringQueryMap;
import org.springframework.stereotype.Component;
@@ -35,8 +34,8 @@
* @param onlineParam 璇锋眰鍙傛暟
* @return 鏌ヨ鍦ㄧ嚎缁熻鍒楄〃
*/
- @GetMapping("/openapi/v1/report/online/list")
- JSONObject onlineList(@SpringQueryMap OnlineParam onlineParam);
+ @GetMapping("/videomon/api/v1/app/onlineMonitor/list")
+ JSONObject videoOnline(@SpringQueryMap VideoOnlineParam onlineParam);
/**
* 褰曞儚鍙敤
@@ -51,7 +50,7 @@
* osd鏍囨敞淇℃伅
* @return
*/
- @GetMapping("/videomon/api/v1/app/osdMonitor/list")
+ @GetMapping("/videomon-ocr/api/v1/osd/format/list")
JSONObject osdMonitorList(@SpringQueryMap OsdMonitorParam param, @RequestHeader("tenantId") String tenantId);
/**
--
Gitblit v1.8.0