From cd538c205628f28839323b49b7f77f33196a601f Mon Sep 17 00:00:00 2001 From: zhangnaisong <2434969829@qq.com> Date: 星期四, 11 七月 2024 15:50:42 +0800 Subject: [PATCH] 电磁锁操控加入判断速度为0提交 --- ard-work/src/main/java/com/ruoyi/alarm/radar/service/impl/ArdRadarServiceImpl.java | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 52 insertions(+), 7 deletions(-) diff --git a/ard-work/src/main/java/com/ruoyi/alarm/radar/service/impl/ArdRadarServiceImpl.java b/ard-work/src/main/java/com/ruoyi/alarm/radar/service/impl/ArdRadarServiceImpl.java index 4735513..9626ed2 100644 --- a/ard-work/src/main/java/com/ruoyi/alarm/radar/service/impl/ArdRadarServiceImpl.java +++ b/ard-work/src/main/java/com/ruoyi/alarm/radar/service/impl/ArdRadarServiceImpl.java @@ -1,7 +1,11 @@ package com.ruoyi.alarm.radar.service.impl; import com.alibaba.fastjson2.JSONObject; +import com.ruoyi.alarm.global.domain.GuidePoint; +import com.ruoyi.alarm.radar.domain.ArdAlarmRadar; +import com.ruoyi.alarm.radar.domain.RadarAlarmData; import com.ruoyi.alarm.radar.service.ArdRadarService; +import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.device.camera.domain.ArdCameras; import com.ruoyi.device.camera.domain.CameraCmd; @@ -16,6 +20,7 @@ import javax.annotation.Resource; import java.util.HashMap; +import java.util.List; import java.util.Map; /** @@ -66,12 +71,7 @@ ptzMap.put("t", t); ptzMap.put("z", cameraPTZ[2]); cmd.setPtzMap(ptzMap); - boolean res = iCameraSdkService.setPtz(cmd); - if (res) { - log.debug("寮哄埗寮曞鎴愬姛"); - } else { - log.debug("寮哄埗寮曞澶辫触"); - } + iCameraSdkService.setPtz(cmd); } else { log.debug("鏈幏鍙栧埌闆疯揪濉斾笂鐨勫厜鐢�"); } @@ -80,4 +80,49 @@ log.error("寮哄埗寮曞寮傚父:" + ex.getMessage()); } } -} \ No newline at end of file + /** + * 寮傛闆疯揪杩借釜寮曞 + * 鍒樿嫃涔� + * 2023/11/2 9:00:55 + */ + @Override + @Async + public void followGuide(String msg) { + try { + RadarAlarmData radarFollowData = JSONObject.parseObject(msg, RadarAlarmData.class); + if (radarFollowData != null) { + List<ArdAlarmRadar> ardFollowRadars = radarFollowData.getArdFollowRadars(); + if (ardFollowRadars.size()>0) { + //褰撴瘡娆′笂鎶ュ彧涓婃姤涓�涓拷韪俊鎭紝璁や负涓嶅お鍙兘闆疯揪鎵弿涓�娆′細璺熻釜澶氫釜鐩爣 + ArdAlarmRadar ardFollowRadar = ardFollowRadars.get(0); + String radarId = radarFollowData.getRadarId();//闆疯揪id + //杩欓噷杩借釜鐨勫潗鏍囦负闆疯揪缁忚繃璁$畻涓婁紶鐨勭粡绾害 + Double longitude = ardFollowRadar.getLongitude(); + Double latitude = ardFollowRadar.getLatitude(); + GuidePoint guidePoint=new GuidePoint().setLongitude(longitude).setLatitude(latitude); + //鑾峰彇闆疯揪鎵�鍦ㄥ涓婄殑澶у厜鐢� + ArdCameras camera = ardEquipRadarMapper.getCameraByRadar(radarId); + if (StringUtils.isNotNull(camera)) { + log.debug("鑾峰彇鍒伴浄杈惧涓婄殑澶у厜鐢�:" + camera.getId()); + //濡傛灉闆疯揪濉斾笂鏈夊厜鐢�,寮曞鍏夌數鐨�1閫氶亾鍒拌拷韪殑鍧愭爣 + CameraCmd cmd = new CameraCmd(camera.getId(), 1); + cmd.setOperator("sys_radar_follow"); + cmd.setCameraId(camera.getId()); + cmd.setChanNo(1); + cmd.setTargetPosition(new double[]{guidePoint.getLongitude(), guidePoint.getLatitude()}); + boolean res = iCameraSdkService.guideTargetPosition(cmd).get("code").equals(200); + if (res) { + log.debug("闆疯揪杩借釜寮曞鎴愬姛"); + } else { + log.debug("闆疯揪杩借釜寮曞澶辫触"); + } + } else { + log.debug("鏈幏鍙栧埌闆疯揪濉斾笂鐨勫ぇ鍏夌數"); + } + } + } + } catch (Exception ex) { + log.error("闆疯揪杩借釜寮曞寮傚父:" + ex.getMessage()); + } + } +} -- Gitblit v1.9.3