From 1bfbc52da47b22f00a1c1f5f670c30f70d999873 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 02 Feb 2026 18:18:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwDefenseSceneManageServiceImpl.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwDefenseSceneManageServiceImpl.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwDefenseSceneManageServiceImpl.java
index 3433b9e..3e8106c 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwDefenseSceneManageServiceImpl.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwDefenseSceneManageServiceImpl.java
@@ -93,6 +93,7 @@
*/
@Override
public boolean deleteFwDefenseSceneManage(List<Long> longList) {
+ //删除场景管理
boolean b = deleteLogic(longList);
if (b) {
// 1.遍历所有删除的场景管理ID
@@ -102,6 +103,9 @@
List<Long> deviceIdList = baseMapper.selectDeviceId(sceneManageId);
AllDeviceId.addAll(deviceIdList);
}
+ if (AllDeviceId == null || AllDeviceId.isEmpty()) {
+ return true;
+ }
// 3.禁用设备
return fwDeviceService.update(Wrappers.<FwDeviceEntity>lambdaUpdate()
.set(FwDeviceEntity::getIsEnabled, 0)
@@ -109,4 +113,15 @@
}
return false;
}
+
+ /**
+ * 获取场景管理下的所有设备ID
+ *
+ * @param sceneManageId
+ * @return
+ */
+ @Override
+ public List<Long> selectDeviceId(Long sceneManageId) {
+ return baseMapper.selectDeviceId(sceneManageId);
+ }
}
--
Gitblit v1.9.3