From 80aace69506a46f93519fa583d8c04ab861498d2 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期五, 02 八月 2024 23:05:23 +0800
Subject: [PATCH] 电磁锁临时电子围栏加入服务器重启生效创建提交
---
ard-work/src/main/java/com/ruoyi/alarm/radar/service/impl/ArdRadarServiceImpl.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 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 b19c33f..0a0e6a1 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,6 +1,7 @@
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;
@@ -42,7 +43,7 @@
* 2023/11/2 9:00:55
*/
@Override
- @Async
+ @Async("globalExecutor")
public void forceGuide(String msg) {
try {
Map<String, Object> msgMap = JSONObject.parseObject(msg, Map.class);
@@ -85,7 +86,7 @@
* 2023/11/2 9:00:55
*/
@Override
- @Async
+ @Async("globalExecutor")
public void followGuide(String msg) {
try {
RadarAlarmData radarFollowData = JSONObject.parseObject(msg, RadarAlarmData.class);
@@ -98,6 +99,7 @@
//杩欓噷杩借釜鐨勫潗鏍囦负闆疯揪缁忚繃璁＄畻涓婁紶鐨勭粡绾害
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)) {
@@ -107,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 {
--
Gitblit v1.9.3