From bf45f88ff9ea1ea1d4976f97dbe2a12eae9a52f9 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 05 Feb 2026 10:12:37 +0800
Subject: [PATCH] 反无优化
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceServiceImpl.java | 104 +++++++++++++++++++++++++++++++++++++--------------
1 files changed, 75 insertions(+), 29 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..9734cc0 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
@@ -16,36 +16,39 @@
*/
package org.sxkj.fw.device.service.impl;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.utils.StringUtil;
+import org.springframework.stereotype.Service;
+import org.sxkj.fw.area.service.IFwAreaDivideService;
import org.sxkj.fw.cockpit.vo.AlarmStatisticsVO;
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.excel.FwDeviceExcel;
+import org.sxkj.fw.device.mapper.FwDeviceMapper;
import org.sxkj.fw.device.param.FwDevicePageParam;
+import org.sxkj.fw.device.service.IFwDeviceService;
import org.sxkj.fw.device.vo.CockpitFwDeviceVO;
import org.sxkj.fw.device.vo.DeviceTypeStatisticsVO;
import org.sxkj.fw.device.vo.FwDeviceVO;
-import org.sxkj.fw.device.excel.FwDeviceExcel;
-import org.sxkj.fw.device.mapper.FwDeviceMapper;
-import org.sxkj.fw.device.service.IFwDeviceService;
-import org.sxkj.fw.area.service.IFwAreaDivideService;
import org.sxkj.fw.device.wrapper.FwDeviceWrapper;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.core.mp.base.BaseServiceImpl;
-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.Region;
+import javax.annotation.Resource;
import java.math.BigDecimal;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
-import javax.annotation.Resource;
/**
* 设备表 服务实现类
@@ -67,8 +70,13 @@
@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);
+ // 按当前部门及下级部门范围过滤数据
+ if (!AuthUtil.isAdministrator()) {
+ List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
+ fwDeviceDTO.setDeptList(deptList);
+ }
+ fwDeviceDTO.setCurrentDeptId(AuthUtil.getDeptId());
+ // 按区域范围过滤数据
IPage<FwDeviceEntity> pages = selectFwDevicePage(Condition.getPage(query), fwDeviceDTO);
IPage<FwDeviceVO> result = FwDeviceWrapper.build().pageVO(pages);
List<FwDeviceVO> records = result.getRecords();
@@ -77,6 +85,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());
@@ -87,8 +96,8 @@
}
@Override
- public List<FwDeviceEntity> selectFwDeviceList(Integer isAreaSelect, Long areaId, Integer status, Integer isTrack) {
- return baseMapper.selectFwDeviceList(isAreaSelect, areaId, status, isTrack);
+ public List<FwDeviceEntity> selectFwDeviceList(Integer isAreaSelect, Long areaId, List<Long> areaIds, Integer status, Integer isTrack) {
+ return baseMapper.selectFwDeviceList(isAreaSelect, areaId, areaIds, status, isTrack);
}
@Override
@@ -115,7 +124,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 +134,8 @@
* @return
*/
@Override
- public List<DeviceStatisticsVO> statisticalDeviceType(List<Long> deptList,String currentDeptId) {
- return baseMapper.statisticalDeviceType(deptList,currentDeptId);
+ public List<DeviceStatisticsVO> statisticalDeviceType(String regionCode, String currentDeptId) {
+ return baseMapper.statisticalDeviceType(regionCode, currentDeptId);
}
/**
@@ -135,20 +145,33 @@
*/
@Override
public List<DeviceTypeStatisticsVO> getDeviceTypeStatistics() {
- List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
- return baseMapper.getDeviceTypeStatistics(deptList);
+ // 统计范围限定在当前部门及下级部门
+ List<Long> deptList = new ArrayList<>();
+ if (!AuthUtil.isAdministrator()) {
+ deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
+ }
+ 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);
+ // 统计范围限定在当前部门及下级部门
+ List<Long> deptList = new ArrayList<>();
+ if (!AuthUtil.isAdministrator()) {
+ deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
+ }
+ 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);
+ // 统计范围限定在当前部门及下级部门
+ List<Long> deptList = new ArrayList<>();
+ if (!AuthUtil.isAdministrator()) {
+ deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
+ }
+ return baseMapper.getDeviceManufacturerStatistics(deptList, AuthUtil.getDeptId());
}
/**
@@ -157,8 +180,8 @@
* @return
*/
@Override
- public AlarmStatisticsVO statisticalDeviceAtt(List<Long> deptList, String currentDeptId) {
- return baseMapper.statisticalDeviceAtt(deptList, currentDeptId);
+ public AlarmStatisticsVO statisticalDeviceAtt(String regionCode, String currentDeptId) {
+ return baseMapper.statisticalDeviceAtt(regionCode, currentDeptId);
}
@Override
@@ -179,6 +202,7 @@
*/
@Override
public boolean saveOrUpdateDevice(FwDeviceEntity fwDeviceEntity) {
+ // 无效范围时清空坐标，避免显示无意义位置
if (fwDeviceEntity.getEffectiveRangeKm() == null || fwDeviceEntity.getEffectiveRangeKm().compareTo(BigDecimal.ZERO) == 0) {
fwDeviceEntity.setLatitude("");
fwDeviceEntity.setLongitude("");
@@ -187,7 +211,29 @@
}
@Override
- public boolean updateTrackStatusByDeviceId(Long deviceId, Integer trackStatus) {
- return baseMapper.updateTrackStatusByDeviceId(deviceId, trackStatus) > 0;
+ public boolean updateTrackStatusByDeviceId(Long deviceId, Integer trackStatus, String outTarget, String outTargetCode) {
+ return baseMapper.updateTrackStatusByDeviceId(deviceId, trackStatus, outTarget, outTargetCode) > 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;
+ }
+
+ @Override
+ public List<DeviceStatisticsVO> getDeviceStatistics(FwDeviceDTO fwDeviceDTO) {
+ return baseMapper.getDeviceStatistics(fwDeviceDTO);
}
}
--
Gitblit v1.9.3