From f56ac229a0a897d81ce7066262ff22f2dd7bf651 Mon Sep 17 00:00:00 2001
From: Xiajijian <1176061145@qq.com>
Date: Fri, 26 Dec 2025 12:37:05 +0800
Subject: [PATCH] 1. 批量新增无人机盒子业务逻辑优化。
---
ard-work/src/main/java/com/ard/work/service/impl/ArdDroneInfoServiceImpl.java | 28 ++++++++++------------------
ard-work/src/main/java/com/ard/work/service/IArdDroneInfoService.java | 2 +-
ard-admin/src/main/java/com/ard/web/controller/work/ArdDroneInfoController.java | 8 +++++---
ard-work/src/main/java/com/ard/work/service/ITyService.java | 2 +-
4 files changed, 17 insertions(+), 23 deletions(-)
diff --git a/ard-admin/src/main/java/com/ard/web/controller/work/ArdDroneInfoController.java b/ard-admin/src/main/java/com/ard/web/controller/work/ArdDroneInfoController.java
index 51e538a..b2bf7a3 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/work/ArdDroneInfoController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/work/ArdDroneInfoController.java
@@ -112,10 +112,12 @@
@ApiOperation("批量新增无人机盒子")
@PreAuthorize("@ss.hasPermi('work:drone:insertArdDroneLs')")
@Log(title = "无人机管理", businessType = BusinessType.DELETE)
- @PostMapping("insertArdDroneLs/{boxSn}/{deptId}")
- public AjaxResult insertArdDroneLs(@PathVariable String[] boxSn, @PathVariable Long deptId) {
+ @PostMapping("insertArdDroneLs/{boxSn}/{deptId}/{serverId}")
+ public AjaxResult insertArdDroneLs(@PathVariable String[] boxSn,
+ @PathVariable Long deptId,
+ @PathVariable String serverId) {
try {
- int result = ardDroneInfoService.insertArdDroneLs(boxSn, deptId);
+ int result = ardDroneInfoService.insertArdDroneLs(boxSn,deptId,serverId);
if (result > 0) {
return AjaxResult.success("成功新增 " + result + " 个无人机盒子");
} else {
diff --git a/ard-work/src/main/java/com/ard/work/service/IArdDroneInfoService.java b/ard-work/src/main/java/com/ard/work/service/IArdDroneInfoService.java
index 907d94e..5d84897 100644
--- a/ard-work/src/main/java/com/ard/work/service/IArdDroneInfoService.java
+++ b/ard-work/src/main/java/com/ard/work/service/IArdDroneInfoService.java
@@ -77,7 +77,7 @@
* @param deptId 部门ID
* @return 结果
*/
- public int insertArdDroneLs(String[] boxSn,Long deptId);
+ public int insertArdDroneLs(String[] boxSn,Long deptId,String serverId);
/**
* 修改无人机状态
diff --git a/ard-work/src/main/java/com/ard/work/service/ITyService.java b/ard-work/src/main/java/com/ard/work/service/ITyService.java
index 18db889..d21a331 100644
--- a/ard-work/src/main/java/com/ard/work/service/ITyService.java
+++ b/ard-work/src/main/java/com/ard/work/service/ITyService.java
@@ -36,7 +36,7 @@
*
* @return
*/
- AccessTokenReceiver getAccessToken(String ServerId);
+ AccessTokenReceiver getAccessToken(String serverId);
/**
* 获取全部服务器云盒列表
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..560cc25 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);
- }
/**
* 批量插入无人机信息
--
Gitblit v1.9.3