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 | 24 ++++++++++++++++-------- 1 files changed, 16 insertions(+), 8 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 ce48a8f..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); /** * 褰曞儚鍙敤 @@ -44,14 +43,14 @@ * @param recordMetaDSumParam 璇锋眰鍙傛暟 * @return 鏌ヨ婊¤冻鏉′欢鐨勫綍鍍忔眹鎬讳俊鎭� */ - @PostMapping("/report/recordMetaDSum/list") - JSONObject recordMetaDSumList(@RequestBody RecordMetaDSumParam recordMetaDSumParam); + @PostMapping("/videomon/report/recordMetaDSum/list") + JSONObject recordMetaDSumList( RecordMetaDSumParam recordMetaDSumParam); /** * osd鏍囨敞淇℃伅 * @return */ - @GetMapping("/api/v1/app/osdMonitor/list") + @GetMapping("/videomon-ocr/api/v1/osd/format/list") JSONObject osdMonitorList(@SpringQueryMap OsdMonitorParam param, @RequestHeader("tenantId") String tenantId); /** @@ -69,8 +68,17 @@ * @param param * @return */ - @GetMapping("/api/v1/app/report/vqd/detail/list") + @GetMapping("/videomon/api/v1/app/report/vqd/detail/list") JSONObject videoQuality(@SpringQueryMap VideoQualityParam param); + + /** + * 涓�鏈轰竴妗e悎鏍肩巼 + * + * @param param + * @return + */ + @GetMapping("/iotdiscovery/api/v1/app/camera/precision/stat/detail") + JSONObject monitorQualify(@SpringQueryMap MonitorQualifyParam param); /** * 浼樹簯鑾峰彇token鎺ュ彛 @@ -78,6 +86,6 @@ * @param param * @return */ - @PostMapping("/tenant/api/vi/user/login") + @PostMapping(value = "/tenant/api/v1/user/login",headers = "No-Need-To-Token=true") JSONObject getToken(@RequestBody UYTokenParam param); } -- Gitblit v1.8.0