From dbc7e62be76ff48b26461ffaef9c3fc87be018cb Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 11 Feb 2026 11:05:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwDefenseSceneManageServiceImpl.java | 17 +++++++++++++++++
1 files changed, 17 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 3529efb..f82c831 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
@@ -18,6 +18,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import org.checkerframework.checker.units.qual.A;
+import org.springblade.core.secure.utils.AuthUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.sxkj.fw.area.param.FwDefenseSceneManagePageParam;
import org.sxkj.fw.area.entity.FwDefenseSceneManageEntity;
@@ -29,10 +30,13 @@
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseServiceImpl;
+import org.sxkj.fw.common.FwBaseInfo;
import org.sxkj.fw.device.entity.FwDeviceEntity;
import org.sxkj.fw.device.service.IFwDeviceService;
+import org.sxkj.system.cache.SysCache;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
/**
@@ -49,6 +53,10 @@
@Override
public IPage<FwDefenseSceneManageVO> selectFwDefenseSceneManagePage(IPage<FwDefenseSceneManageVO> page, FwDefenseSceneManagePageParam fwDefenseSceneManagePageParam) {
+ if (!AuthUtil.isAdministrator()) {
+ List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
+ fwDefenseSceneManagePageParam.setDeptList(deptList);
+ }
return page.setRecords(baseMapper.selectFwDefenseSceneManagePage(page, fwDefenseSceneManagePageParam));
}
@@ -93,6 +101,7 @@
*/
@Override
public boolean deleteFwDefenseSceneManage(List<Long> longList) {
+ // 删除场景管理
boolean b = deleteLogic(longList);
if (b) {
// 1.遍历所有删除的场景管理ID
@@ -101,6 +110,9 @@
// 2.获取场景管理下的所有设备ID
List<Long> deviceIdList = baseMapper.selectDeviceId(sceneManageId);
AllDeviceId.addAll(deviceIdList);
+ }
+ if (AllDeviceId == null || AllDeviceId.isEmpty()) {
+ return true;
}
// 3.禁用设备
return fwDeviceService.update(Wrappers.<FwDeviceEntity>lambdaUpdate()
@@ -120,4 +132,9 @@
public List<Long> selectDeviceId(Long sceneManageId) {
return baseMapper.selectDeviceId(sceneManageId);
}
+
+ @Override
+ public List<FwDefenseSceneManageVO> selectFwDefenseSceneManageCockpitList(FwBaseInfo fwBaseInfo, Date time) {
+ return baseMapper.selectFwDefenseSceneManageCockpitList(fwBaseInfo, time);
+ }
}
--
Gitblit v1.9.3