From fbced0c4dd4950a184f8471ef71995aa93dafd50 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: Sat, 27 Dec 2025 10:17:44 +0800
Subject: [PATCH] 优化
---
ard-device/src/main/java/com/ard/device/camera/service/impl/ArdCameraServiceImpl.java | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/ard-device/src/main/java/com/ard/device/camera/service/impl/ArdCameraServiceImpl.java b/ard-device/src/main/java/com/ard/device/camera/service/impl/ArdCameraServiceImpl.java
index 39de4b9..d387132 100644
--- a/ard-device/src/main/java/com/ard/device/camera/service/impl/ArdCameraServiceImpl.java
+++ b/ard-device/src/main/java/com/ard/device/camera/service/impl/ArdCameraServiceImpl.java
@@ -29,6 +29,7 @@
import org.springframework.scheduling.annotation.Async;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service;
+
import javax.annotation.Resource;
import javax.validation.Validator;
import java.util.*;
@@ -295,6 +296,20 @@
return DeviceConstants.UNIQUE;
}
+ /**
+ * 校验机场是否已关联相机
+ *
+ * @param camera 相机
+ * @return 结果
+ */
+ @Override
+ public ArdCamera checkAirportHasCamera(ArdCamera camera) {
+ ArdCamera info = ardCameraMapper.checkAirportHasCamera(camera);
+ if (StringUtils.isNotNull(info)&& !info.getId().equals(camera.getId())) {
+ return info;
+ }
+ return null;
+ }
/**
* 同步通道
@@ -357,13 +372,14 @@
// SDK 登录成功后写入 Redis
redisService.setCacheObject(getCacheKey(camera.getId()), camera);
}
+
/**
* 同步设备通道与本地通道库信息
*
* @author 刘苏义
* @date 2024/8/22 14:37
*/
- @Scheduled(cron = "0/10 * * * * ?")
+ @Scheduled(fixedDelay = 5000)
public void syncChannel() {
try {
log.debug("定时执行同步通道任务");
@@ -385,13 +401,14 @@
log.error("定时执行同步通道任务异常：{}", ex.getMessage());
}
}
+
/**
* 定时执行登录失败相机重新登录
*
* @author 刘苏义
* @date 2024/8/22 14:37
*/
- @Scheduled(cron = "0/30 * * * * ?")
+ @Scheduled(fixedDelay = 30000)
public void failedReconnect() {
try {
log.debug("定时执行失败相机重连任务");
@@ -410,7 +427,7 @@
* 刘苏义
* 2023/10/8 14:54:41
*/
- @Scheduled(cron = "0/10 * * * * ?")
+ @Scheduled(fixedDelay = 5000)
public void cameraState() {
try {
log.debug("定时执行同步相机在线状态任务");
--
Gitblit v1.9.3