From 757f7e5256ef3cd48cb7887f4e1f8fd4ecff1b14 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期一, 12 六月 2023 15:31:23 +0800
Subject: [PATCH] 修复sdk错误码56的错误 相机登录修改为异步登录
---
ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/GlobalAlarmServiceImpl.java | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/GlobalAlarmServiceImpl.java b/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/GlobalAlarmServiceImpl.java
index bf0c6cd..5b9a23f 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/GlobalAlarmServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/GlobalAlarmServiceImpl.java
@@ -11,13 +11,19 @@
import com.ruoyi.alarmpoints.tube.domain.ArdTubesDetails;
import com.ruoyi.alarmpoints.tube.mapper.ArdTubesDetailsMapper;
import com.ruoyi.alarmpoints.tube.mapper.ArdTubesMapper;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.uuid.UUID;
+import com.ruoyi.utils.tube.GeoPoint;
+import com.ruoyi.utils.tube.TubeTools;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
+
+import static jdk.nashorn.internal.runtime.regexp.joni.Config.log;
/**
* @ClassName: globalAlarmServiceImpl
@@ -27,6 +33,7 @@
* @Version: 1.0
**/
@Service
+@Slf4j(topic = "mqtt")
public class GlobalAlarmServiceImpl implements IGlobalAlarmService {
@Resource
ArdAlarmStealelecMapper ardAlarmStealelecMapper;
@@ -67,8 +74,19 @@
ardAlarmTube.setColor(ardTubes.getColor());
ardAlarmTube.setPipeDiameter(ardTubes.getPipeDiameter());
ardAlarmTube.setTubeType(ardTubes.getType());
+ GeoPoint geoPoint = TubeTools.CalculateCoordinates(ardTubesDetails, ardAlarmTube.getPosition());
+ if(StringUtils.isNotNull(geoPoint))
+ {
+ ardAlarmTube.setLongitude(geoPoint.getLongitude());
+ ardAlarmTube.setLatitude(geoPoint.getLatitude());
+ ardAlarmTube.setAltitude(geoPoint.getAltitude());
+ }
}
int i = ardAlarmTubeService.insertArdAlarmTube(ardAlarmTube);
+ if(i>0)
+ {
+ log.info("鍏ュ簱鎴愬姛锛�"+ardAlarmTube.toString());
+ }
break;
}
}
--
Gitblit v1.9.3