From e8d53b7555595df35bd2fe03a5c5cf449c38859c Mon Sep 17 00:00:00 2001 From: ‘liusuyi’ <1951119284@qq.com> Date: 星期四, 14 十二月 2023 13:30:49 +0800 Subject: [PATCH] 增加PTZ引导优先; 井管理增加可见光和热红外ptz设置; 雷达报警引导只需要引导雷达塔上的光电,通道根据日夜切换自动选择; 引导优先按井配置的ptz进行引导,当未配置时按经纬度进行引导; 相机优先级队列排序取消报警次数num比对,仅由优先级和接收时间作为比较器条件; --- ard-work/src/main/java/com/ruoyi/utils/forest/UavClient.java | 19 +++++++++---------- 1 files changed, 9 insertions(+), 10 deletions(-) diff --git a/ard-work/src/main/java/com/ruoyi/utils/forest/UavClient.java b/ard-work/src/main/java/com/ruoyi/utils/forest/UavClient.java index 4efe3bb..b4011ef 100644 --- a/ard-work/src/main/java/com/ruoyi/utils/forest/UavClient.java +++ b/ard-work/src/main/java/com/ruoyi/utils/forest/UavClient.java @@ -1,26 +1,25 @@ package com.ruoyi.utils.forest; -import com.dtflys.forest.annotation.DataVariable; -import com.dtflys.forest.annotation.Get; -import com.dtflys.forest.annotation.JSONBody; -import com.dtflys.forest.annotation.Post; +import com.dtflys.forest.annotation.*; import org.springframework.stereotype.Component; +import org.springframework.stereotype.Service; -@Component +@Service public interface UavClient { @Get("http://www.baidu.com") String test(); public static String IP = "http://112.98.126.2:6100/"; - - @UavAuth(token = "${token}") @Get(IP + "${url}") - String get(@DataVariable("url") String url, @DataVariable("token") String token, @JSONBody String body); + String GET(@Var("url") String url, @Header("x-auth-token") String token, @JSONBody String body); - @UavAuth(token = "${token}") @Post(IP + "${url}") - String post(@DataVariable("url") String url, @DataVariable("token") String token, @JSONBody String body); + String POST(@Var("url") String url, @Header("x-auth-token") String token, @JSONBody String body); + + @Delete(IP + "${url}") + String DELETE(@Var("url") String url, @Header("x-auth-token") String token, @JSONBody String body); + } -- Gitblit v1.9.3