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/rongcloud/controller/RongCloudController.java | 11 +----------
1 files changed, 1 insertions(+), 10 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/rongcloud/controller/RongCloudController.java b/ard-work/src/main/java/com/ruoyi/rongcloud/controller/RongCloudController.java
index 3c76221..56c08fb 100644
--- a/ard-work/src/main/java/com/ruoyi/rongcloud/controller/RongCloudController.java
+++ b/ard-work/src/main/java/com/ruoyi/rongcloud/controller/RongCloudController.java
@@ -2,13 +2,10 @@
import com.ruoyi.common.annotation.Anonymous;
import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.device.hiksdk.config.MinioClientSingleton;
-import com.ruoyi.device.hiksdk.util.minio.MinioUtils;
import com.ruoyi.rongcloud.service.RongCloudService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import java.util.List;
@@ -37,13 +34,7 @@
return AjaxResult.success(token);
}
- @PostMapping("/uploadPic")
- @ApiOperation("涓婁紶鐢ㄦ埛澶村儚")
- public AjaxResult uploadPic(MultipartFile file)
- {
- String url = MinioUtils.putObjectAndGetUrl("useravatar", file);
- return AjaxResult.success(url);
- }
+
@PostMapping("/checkOnline")
@ApiOperation("鏌ヨ鐢ㄦ埛鍦ㄧ嚎鐘舵��")
--
Gitblit v1.9.3