From dd84c954253800217461651d7ff1ac290962c60a Mon Sep 17 00:00:00 2001 From: zhangnaisong <2434969829@qq.com> Date: 星期六, 22 六月 2024 10:13:12 +0800 Subject: [PATCH] 24小时报警兴趣点前十统计bug修改提交 --- ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/controller/HikSdkController.java | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 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 0c3a555..e90b089 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 @@ -1,6 +1,7 @@ package com.ruoyi.utils.sdk.hiksdk.controller; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.ruoyi.alarmpoints.well.service.IArdAlarmpointsWellService; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.enums.BusinessType; @@ -39,6 +40,8 @@ private HikvisionSDK sdk; @Resource private IArdCamerasService ardCamerasService; + @Resource + private IArdAlarmpointsWellService ardAlarmpointsWellService; @RequestMapping("/preview") @@ -298,4 +301,28 @@ cmd.setOperator(SecurityUtils.getUserId()); return AjaxResult.success(sdk.getGisInfo(cmd)); } + + @PostMapping("/getCameraVideoLable") + public @ResponseBody + AjaxResult getCameraVideoLable(@RequestBody CameraCmd cmd) { + cmd.setOperator(SecurityUtils.getUserId()); + Map<String, Object> map = sdk.getGisInfo(cmd); + Map<String, Object> data = (Map<String, Object>) map.get("data"); + Float p = (Float) data.get("p"); + Float t = (Float) data.get("t"); + Float z = (Float) data.get("z"); + Float fHorFieldAngle = (Float) data.get("fHorFieldAngle");// 姘村钩瑙嗗満瑙� + Float fVerFieldAngle = (Float) data.get("fVerFieldAngle");// 鍨傜洿瑙嗗満瑙� + /*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