From 650b127a6a671a87034db5e027379e740aa56364 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期四, 14 三月 2024 08:54:33 +0800
Subject: [PATCH] 优化
---
ard-work/src/main/java/com/ruoyi/alarm/radar/service/impl/ArdRadarServiceImpl.java | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 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 e97ed12..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,9 +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;
@@ -69,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("鏈幏鍙栧埌闆疯揪濉斾笂鐨勫厜鐢�");
}
@@ -94,13 +91,15 @@
try {
RadarAlarmData radarFollowData = JSONObject.parseObject(msg, RadarAlarmData.class);
if (radarFollowData != null) {
- ArdAlarmRadar ardFollowRadar = radarFollowData.getArdFollowRadars();
- if (ardFollowRadar != 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)) {
@@ -110,8 +109,8 @@
cmd.setOperator("sys_radar_follow");
cmd.setCameraId(camera.getId());
cmd.setChanNo(1);
- cmd.setTargetPosition(new double[]{longitude,latitude});
- boolean res = iCameraSdkService.guideTargetPosition(cmd);
+ cmd.setTargetPosition(new double[]{guidePoint.getLongitude(), guidePoint.getLatitude()});
+ boolean res = iCameraSdkService.guideTargetPosition(cmd).get("code").equals(200);
if (res) {
log.debug("闆疯揪杩借釜寮曞鎴愬姛");
} else {
@@ -126,4 +125,4 @@
log.error("闆疯揪杩借釜寮曞寮傚父:" + ex.getMessage());
}
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3