From ba12d5d8e844146c334223ef5939a51c8e5d76ca Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 29 Jan 2026 20:18:26 +0800
Subject: [PATCH] 反无-权限控制
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceServiceImpl.java | 36 +++++++++++++++++++++++++++++++-----
1 files changed, 31 insertions(+), 5 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceServiceImpl.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceServiceImpl.java
index 60a621e..fbca111 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceServiceImpl.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceServiceImpl.java
@@ -39,7 +39,10 @@
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.utils.StringUtil;
+import org.sxkj.system.cache.RegionCache;
import org.sxkj.system.cache.SysCache;
+import org.sxkj.system.entity.Dept;
+import org.sxkj.system.entity.Region;
import java.math.BigDecimal;
import java.util.List;
@@ -67,6 +70,7 @@
@Override
public IPage<FwDeviceVO> selectFwDevicePageVo(FwDevicePageParam fwDevice, Query query) {
FwDeviceDTO fwDeviceDTO = GenericConverter.convert(fwDevice, FwDeviceDTO.class);
+ // 按当前部门及下级部门范围过滤数据
List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
fwDeviceDTO.setDeptList(deptList);
IPage<FwDeviceEntity> pages = selectFwDevicePage(Condition.getPage(query), fwDeviceDTO);
@@ -77,6 +81,7 @@
.map(FwDeviceVO::getId)
.filter(id -> id != null)
.collect(Collectors.toList());
+ // 批量补充设备关联场景名称
Map<Long, String> sceneNameMap = selectSceneNameByDeviceIds(deviceIds);
for (FwDeviceVO record : records) {
String sceneName = sceneNameMap.get(record.getId());
@@ -115,7 +120,8 @@
*/
@Override
public IPage<CockpitFwDeviceVO> selectCockpitDevicePage(IPage<CockpitFwDeviceVO> page, FwDeviceDTO fwDevice) {
- return page.setRecords(baseMapper.selectCockpitDevicePage(page, fwDevice));
+ List<CockpitFwDeviceVO> cockpitFwDeviceVOS = baseMapper.selectCockpitDevicePage(page, fwDevice);
+ return page.setRecords(cockpitFwDeviceVOS);
}
/**
@@ -124,8 +130,8 @@
* @return
*/
@Override
- public List<DeviceStatisticsVO> statisticalDeviceType(List<Long> deptList,String currentDeptId) {
- return baseMapper.statisticalDeviceType(deptList,currentDeptId);
+ public List<DeviceStatisticsVO> statisticalDeviceType(String regionName, String currentDeptId) {
+ return baseMapper.statisticalDeviceType(regionName, currentDeptId);
}
/**
@@ -135,18 +141,21 @@
*/
@Override
public List<DeviceTypeStatisticsVO> getDeviceTypeStatistics() {
+ // 统计范围限定在当前部门及下级部门
List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
return baseMapper.getDeviceTypeStatistics(deptList);
}
@Override
public List<DeviceStatisticsVO> getDeviceOutStatistics(String effectiveRangeKmIsNotNull) {
+ // 统计范围限定在当前部门及下级部门
List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
return baseMapper.getDeviceOutStatistics(effectiveRangeKmIsNotNull, deptList);
}
@Override
public List<DeviceStatisticsVO> getDeviceManufacturerStatistics() {
+ // 统计范围限定在当前部门及下级部门
List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
return baseMapper.getDeviceManufacturerStatistics(deptList);
}
@@ -157,8 +166,8 @@
* @return
*/
@Override
- public AlarmStatisticsVO statisticalDeviceAtt(List<Long> deptList, String currentDeptId) {
- return baseMapper.statisticalDeviceAtt(deptList, currentDeptId);
+ public AlarmStatisticsVO statisticalDeviceAtt(String regionName, String currentDeptId) {
+ return baseMapper.statisticalDeviceAtt(regionName, currentDeptId);
}
@Override
@@ -179,6 +188,7 @@
*/
@Override
public boolean saveOrUpdateDevice(FwDeviceEntity fwDeviceEntity) {
+ // 无效范围时清空坐标，避免显示无意义位置
if (fwDeviceEntity.getEffectiveRangeKm() == null || fwDeviceEntity.getEffectiveRangeKm().compareTo(BigDecimal.ZERO) == 0) {
fwDeviceEntity.setLatitude("");
fwDeviceEntity.setLongitude("");
@@ -190,4 +200,20 @@
public boolean updateTrackStatusByDeviceId(Long deviceId, Integer trackStatus) {
return baseMapper.updateTrackStatusByDeviceId(deviceId, trackStatus) > 0;
}
+
+ /**
+ * 查询非本部门区域的设备
+ *
+ * @return 设备列表
+ */
+ @Override
+ public List<FwDeviceVO> getNonDeptAreaDevices() {
+ // 1. 获取当前用户的部门ID
+ String currentDeptId = AuthUtil.getDeptId();
+ Dept dept = SysCache.getDept(Long.valueOf(currentDeptId));
+ // 3. 查询不在这些部门区域内的设备
+ Region byCode = RegionCache.getByCode(dept.getAreaCode());
+ List<FwDeviceVO> deviceList = baseMapper.selectNonDeptAreaDevices(byCode.getName(), currentDeptId);
+ return deviceList;
+ }
}
--
Gitblit v1.9.3