From 970567fcffdb6710288357a0d18fb66bc29d074e Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 02 Feb 2026 18:17:57 +0800
Subject: [PATCH] 设备统计优化
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceServiceImpl.java | 52 +++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 43 insertions(+), 9 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 386bf11..1d3ec1e 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
@@ -21,6 +21,7 @@
import org.sxkj.fw.cockpit.vo.DeviceStatisticsVO;
import org.sxkj.fw.common.GenericConverter;
import org.sxkj.fw.device.dto.FwDeviceDTO;
+import org.sxkj.fw.device.dto.FwDevicePolygonQueryDTO;
import org.sxkj.fw.device.entity.FwDeviceEntity;
import org.sxkj.fw.device.param.FwDevicePageParam;
import org.sxkj.fw.device.vo.CockpitFwDeviceVO;
@@ -38,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;
@@ -66,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);
@@ -76,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());
@@ -88,6 +94,11 @@
@Override
public List<FwDeviceEntity> selectFwDeviceList(Integer isAreaSelect, Long areaId, Integer status, Integer isTrack) {
return baseMapper.selectFwDeviceList(isAreaSelect, areaId, status, isTrack);
+ }
+
+ @Override
+ public List<FwDeviceEntity> selectFwDeviceListByPolygons(FwDevicePolygonQueryDTO query) {
+ return baseMapper.selectFwDeviceListByPolygons(query);
}
@@ -109,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);
}
/**
@@ -118,8 +130,8 @@
* @return
*/
@Override
- public List<DeviceStatisticsVO> statisticalDeviceType(List<Long> deptList) {
- return baseMapper.statisticalDeviceType(deptList);
+ public List<DeviceStatisticsVO> statisticalDeviceType(String regionName, String currentDeptId) {
+ return baseMapper.statisticalDeviceType(regionName, currentDeptId);
}
/**
@@ -129,18 +141,22 @@
*/
@Override
public List<DeviceTypeStatisticsVO> getDeviceTypeStatistics() {
+ // 统计范围限定在当前部门及下级部门
List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
- return baseMapper.getDeviceTypeStatistics(deptList);
+ List<DeviceTypeStatisticsVO> deviceTypeStatistics = baseMapper.getDeviceTypeStatistics(deptList, AuthUtil.getDeptId());
+ return deviceTypeStatistics;
}
@Override
public List<DeviceStatisticsVO> getDeviceOutStatistics(String effectiveRangeKmIsNotNull) {
+ // 统计范围限定在当前部门及下级部门
List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
- return baseMapper.getDeviceOutStatistics(effectiveRangeKmIsNotNull, deptList);
+ return baseMapper.getDeviceOutStatistics(effectiveRangeKmIsNotNull, deptList, AuthUtil.getDeptId());
}
@Override
public List<DeviceStatisticsVO> getDeviceManufacturerStatistics() {
+ // 统计范围限定在当前部门及下级部门
List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
return baseMapper.getDeviceManufacturerStatistics(deptList);
}
@@ -151,8 +167,8 @@
* @return
*/
@Override
- public AlarmStatisticsVO statisticalDeviceAtt(List<Long> deptList) {
- return baseMapper.statisticalDeviceAtt(deptList);
+ public AlarmStatisticsVO statisticalDeviceAtt(String regionName, String currentDeptId) {
+ return baseMapper.statisticalDeviceAtt(regionName, currentDeptId);
}
@Override
@@ -173,6 +189,7 @@
*/
@Override
public boolean saveOrUpdateDevice(FwDeviceEntity fwDeviceEntity) {
+ // 无效范围时清空坐标，避免显示无意义位置
if (fwDeviceEntity.getEffectiveRangeKm() == null || fwDeviceEntity.getEffectiveRangeKm().compareTo(BigDecimal.ZERO) == 0) {
fwDeviceEntity.setLatitude("");
fwDeviceEntity.setLongitude("");
@@ -181,7 +198,24 @@
}
@Override
- public boolean updateTrackStatusByDeviceId(Long deviceId, Integer trackStatus) {
- return baseMapper.updateTrackStatusByDeviceId(deviceId, trackStatus) > 0;
+ public boolean updateTrackStatusByDeviceId(Long deviceId, Integer trackStatus, String outTarget) {
+ return baseMapper.updateTrackStatusByDeviceId(deviceId, trackStatus, outTarget) > 0;
+ }
+
+ /**
+ * 查询非本部门区域的设备
+ *
+ * @param regionCode 区域编码，用于查询不在该区域内的设备
+ * @param deptId 机构ID，用于限定查询范围
+ * @return 设备列表
+ */
+ @Override
+ public List<FwDeviceVO> getNonDeptAreaDevices(String regionCode, String deptId) {
+ // 1. 根据区域编码获取区域名称
+ Region region = RegionCache.getByCode(regionCode);
+ String regionName = region != null ? region.getName() : null;
+ // 2. 查询不在这些部门区域内的设备
+ List<FwDeviceVO> deviceList = baseMapper.selectNonDeptAreaDevices(regionName, deptId);
+ return deviceList;
}
}
--
Gitblit v1.9.3