From fbe41ac0c9758ade6dc690f5d9e3d5985b5e3f7c Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 04 Feb 2026 11:31:40 +0800
Subject: [PATCH] 反无驾驶舱优化
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceServiceImpl.java | 26 +++++++++++++++++---------
1 files changed, 17 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 1d3ec1e..073bd5c 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
@@ -17,6 +17,7 @@
package org.sxkj.fw.device.service.impl;
import org.springblade.core.secure.utils.AuthUtil;
+import org.sxkj.common.utils.HeaderUtils;
import org.sxkj.fw.cockpit.vo.AlarmStatisticsVO;
import org.sxkj.fw.cockpit.vo.DeviceStatisticsVO;
import org.sxkj.fw.common.GenericConverter;
@@ -73,7 +74,9 @@
// 按当前部门及下级部门范围过滤数据
List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
fwDeviceDTO.setDeptList(deptList);
- IPage<FwDeviceEntity> pages = selectFwDevicePage(Condition.getPage(query), fwDeviceDTO);
+ fwDeviceDTO.setCurrentDeptId(AuthUtil.getDeptId());
+ // 按区域范围过滤数据
+ IPage<FwDeviceEntity> pages = selectFwDevicePage(Condition.getPage(query), fwDeviceDTO);
IPage<FwDeviceVO> result = FwDeviceWrapper.build().pageVO(pages);
List<FwDeviceVO> records = result.getRecords();
if (records != null && !records.isEmpty()) {
@@ -92,8 +95,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
@@ -130,8 +133,8 @@
* @return
*/
@Override
- public List<DeviceStatisticsVO> statisticalDeviceType(String regionName, String currentDeptId) {
- return baseMapper.statisticalDeviceType(regionName, currentDeptId);
+ public List<DeviceStatisticsVO> statisticalDeviceType(String regionCode, String currentDeptId) {
+ return baseMapper.statisticalDeviceType(regionCode, currentDeptId);
}
/**
@@ -167,8 +170,8 @@
* @return
*/
@Override
- public AlarmStatisticsVO statisticalDeviceAtt(String regionName, String currentDeptId) {
- return baseMapper.statisticalDeviceAtt(regionName, currentDeptId);
+ public AlarmStatisticsVO statisticalDeviceAtt(String regionCode, String currentDeptId) {
+ return baseMapper.statisticalDeviceAtt(regionCode, currentDeptId);
}
@Override
@@ -198,8 +201,8 @@
}
@Override
- public boolean updateTrackStatusByDeviceId(Long deviceId, Integer trackStatus, String outTarget) {
- return baseMapper.updateTrackStatusByDeviceId(deviceId, trackStatus, outTarget) > 0;
+ public boolean updateTrackStatusByDeviceId(Long deviceId, Integer trackStatus, String outTarget, String outTargetCode) {
+ return baseMapper.updateTrackStatusByDeviceId(deviceId, trackStatus, outTarget, outTargetCode) > 0;
}
/**
@@ -218,4 +221,9 @@
List<FwDeviceVO> deviceList = baseMapper.selectNonDeptAreaDevices(regionName, deptId);
return deviceList;
}
+
+ @Override
+ public List<DeviceStatisticsVO> getDeviceStatistics(FwDeviceDTO fwDeviceDTO) {
+ return baseMapper.getDeviceStatistics(fwDeviceDTO);
+ }
}
--
Gitblit v1.9.3