From f041323a2bce037843fcb163b017427baa556da3 Mon Sep 17 00:00:00 2001 From: liusuyi <1951119284@qq.com> Date: 星期三, 24 七月 2024 16:41:16 +0800 Subject: [PATCH] 优化:修改未读消息入库前判断不存在则插入 取消:程序自动拉起redis/mediamtx/minio,中间件全部服务化 增加:流媒体vtdu详情接口 --- ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/controller/HikSdkController.java | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/controller/HikSdkController.java b/ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/controller/HikSdkController.java index a231ea7..e70ba37 100644 --- a/ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/controller/HikSdkController.java +++ b/ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/controller/HikSdkController.java @@ -18,7 +18,6 @@ import org.springframework.web.bind.annotation.*; import springfox.documentation.annotations.ApiIgnore; import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; import java.util.List; import java.util.Map; @@ -313,13 +312,16 @@ Float z = (Float) data.get("z"); Float fHorFieldAngle = (Float) data.get("fHorFieldAngle");// 姘村钩瑙嗗満瑙� Float fVerFieldAngle = (Float) data.get("fVerFieldAngle");// 鍨傜洿瑙嗗満瑙� - if(z <= 1.0){ + /*if(z <= 1.0){ return AjaxResult.error("鍙樼劍灏忎簬1"); - } + }*/ if(t > 359.0){ return AjaxResult.error("淇话瑙掕繃灏�"); } List<Map<String,Object>> result = ardAlarmpointsWellService.getCameraVideoLable(SecurityUtils.getDeptId(),cmd.getCameraId(),p,t,fHorFieldAngle,fVerFieldAngle); + if(result == null){ + return AjaxResult.error("璇ュ厜鐢垫病鏈夋寕鎺ュ"); + } return AjaxResult.success(result); } } -- Gitblit v1.9.3