Merge remote-tracking branch 'origin/master'

fuliqi

2024-07-29 a8f5761841bcf481eb2f2a7c535dbac145d2a468

 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.YY.CameraParam;
import com.ycl.platform.domain.param.YY.OnlineParam;
import com.ycl.platform.domain.param.YY.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();