From d2a65f0c13df21354ac83bf13b15f46937bd8ecb Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: Mon, 05 Jan 2026 14:07:35 +0800
Subject: [PATCH] 将定时任务迁移到定时模块中
---
ard-work/src/main/java/com/ard/work/service/impl/ArdDroneInfoServiceImpl.java | 55 ++++++++++---------------------------------------------
1 files changed, 10 insertions(+), 45 deletions(-)
diff --git a/ard-work/src/main/java/com/ard/work/service/impl/ArdDroneInfoServiceImpl.java b/ard-work/src/main/java/com/ard/work/service/impl/ArdDroneInfoServiceImpl.java
index 9d6b7f9..7064f3f 100644
--- a/ard-work/src/main/java/com/ard/work/service/impl/ArdDroneInfoServiceImpl.java
+++ b/ard-work/src/main/java/com/ard/work/service/impl/ArdDroneInfoServiceImpl.java
@@ -164,7 +164,7 @@
* @return 成功插入的记录数
*/
@Override
- public int insertArdDroneLs(String[] boxSn, Long deptId) {
+ public int insertArdDroneLs(String[] boxSn,Long deptId,String serverId) {
// 参数校验
if (boxSn == null || boxSn.length == 0) {
log.warn("传入的盒子编码为空");
@@ -176,12 +176,12 @@
try {
// 1. 检查已存在的无人机盒子
List<ArdDroneInfo> existingDrones = getExistingDrones(boxSn);
- // 1.1 新增时不能添加重复的
+ // 1.1 新增时不能添加重复的boxSn
checkDuplicateBox(existingDrones, boxSn);
// 2. 授权数量验证
validateAuthorization(existingDrones.size(), boxSn.length);
// 3. 获取并组装新的无人机信息
- List<ArdDroneInfo> newDrones = assembleNewDrones(boxSn, deptId);
+ List<ArdDroneInfo> newDrones = assembleNewDrones(boxSn,deptId,serverId);
// 4. 批量插入
return batchInsertDrones(newDrones);
} catch (Exception e) {
@@ -261,19 +261,19 @@
/**
* 组装新的无人机信息
*/
- private List<ArdDroneInfo> assembleNewDrones(String[] boxSn, Long deptId) {
+ private List<ArdDroneInfo> assembleNewDrones(String[] boxSn,Long deptId,String serverId) {
List<BoxInfoReceiver> allBoxes = tyService.getBoxList();
Set<String> targetBoxSnSet = new HashSet<>(Arrays.asList(boxSn));
return allBoxes.stream()
.filter(box -> targetBoxSnSet.contains(box.getBoxSn()))
- .map(box -> createDroneInfo(box, deptId))
+ .map(box -> createDroneInfo(box, deptId, serverId))
.collect(Collectors.toList());
}
/**
* 创建无人机信息对象
*/
- private ArdDroneInfo createDroneInfo(BoxInfoReceiver box, Long deptId) {
+ private ArdDroneInfo createDroneInfo(BoxInfoReceiver box, Long deptId ,String serverId) {
ArdDroneInfo drone = new ArdDroneInfo();
drone.setId(IdUtils.simpleUUID());
drone.setBoxSn(box.getBoxSn());
@@ -284,21 +284,13 @@
drone.setVideoPort(box.getVideoPort());
drone.setLastTaskId(box.getLastTaskId());
drone.setDeptId(deptId);
-
- // 设置创建信息和更新信息
- setCreateAndUpdateInfo(drone);
-
+ drone.setCreateTime(new Date());
+ drone.setUpdateTime(new Date());
+ drone.setServerId(serverId);
+ drone.setBoxVersion(box.getBoxVersion());
return drone;
}
- /**
- * 设置创建和更新信息
- */
- private void setCreateAndUpdateInfo(ArdDroneInfo drone) {
- Date currentTime = new Date();
- drone.setCreateTime(currentTime);
- drone.setUpdateTime(currentTime);
- }
/**
* 批量插入无人机信息
@@ -370,32 +362,5 @@
}
- /**
- * 更新 localBoxInfo 的字段，如果有变化返回 true，否则返回 false
- */
- private boolean updateChangedAttributes(ArdDroneInfo localBoxInfo, BoxInfoReceiver remoteArdDrone) {
- boolean changed = false;
-
- if (!Objects.equals(localBoxInfo.getBoxName(), remoteArdDrone.getBoxName())) {
- localBoxInfo.setBoxName(remoteArdDrone.getBoxName());
- changed = true;
- }
- if (!Objects.equals(localBoxInfo.getBoxVersion(), remoteArdDrone.getBoxVersion())) {
- localBoxInfo.setBoxVersion(remoteArdDrone.getBoxVersion());
- changed = true;
- }
- if (!Objects.equals(localBoxInfo.getLastTaskId(), remoteArdDrone.getLastTaskId())) {
- localBoxInfo.setLastTaskId(remoteArdDrone.getLastTaskId());
- changed = true;
- }
- if (!Objects.equals(localBoxInfo.getOnLine(), remoteArdDrone.getOnLine())) {
- localBoxInfo.setOnLine(remoteArdDrone.getOnLine());
- changed = true;
- }
-
- // TODO: 更新其他属性时，如果变化也设置 changed = true
-
- return changed;
- }
}
--
Gitblit v1.9.3