From a8f5761841bcf481eb2f2a7c535dbac145d2a468 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 29 七月 2024 10:14:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/web/UYClient.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/web/UYClient.java b/ycl-server/src/main/java/com/ycl/web/UYClient.java
index 8b05e2d..55c0f27 100644
--- a/ycl-server/src/main/java/com/ycl/web/UYClient.java
+++ b/ycl-server/src/main/java/com/ycl/web/UYClient.java
@@ -1,13 +1,16 @@
package com.ycl.web;
import com.alibaba.fastjson2.JSONObject;
-import com.ycl.platform.domain.param.CameraParam;
-import com.ycl.platform.domain.param.OnlineParam;
-import com.ycl.platform.domain.param.RecordMetaDSumParam;
+import com.ycl.config.YYFeignConfig;
+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 org.springframework.cloud.openfeign.FeignClient;
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
@@ -15,7 +18,7 @@
*/
@Component
-@FeignClient(name = "UYClient", url = "${request.youYunDomain}")
+@FeignClient(name = "UYClient", url = "${request.youYunDomain}", configuration = YYFeignConfig.class)
public interface UYClient {
/**
@@ -25,7 +28,7 @@
* @return 鏌ヨ鎽勫儚鏈烘竻鍗曢泦鍚�
*/
@GetMapping("/VIID/Cameras")
- JSONObject cameraList(CameraParam cameraParam);
+ JSONObject cameraList(@RequestParam CameraParam cameraParam);
/**
* 鐐逛綅鍦ㄧ嚎
@@ -34,7 +37,7 @@
* @return 鏌ヨ鍦ㄧ嚎缁熻鍒楄〃
*/
@GetMapping("/openapi/v1/report/online/list")
- JSONObject onlineList(OnlineParam onlineParam);
+ JSONObject onlineList(@RequestParam OnlineParam onlineParam);
/**
* 褰曞儚鍙敤
@@ -43,7 +46,7 @@
* @return 鏌ヨ婊¤冻鏉′欢鐨勫綍鍍忔眹鎬讳俊鎭�
*/
@PostMapping("/report/recordMetaDSum/list")
- JSONObject recordMetaDSumList(RecordMetaDSumParam recordMetaDSumParam);
+ JSONObject recordMetaDSumList(@RequestBody RecordMetaDSumParam recordMetaDSumParam);
@GetMapping("/api/v1/app/osdMonitor/list")
JSONObject osdMonitorList();
--
Gitblit v1.8.0