From d18ef72c533fe6b18d487bcd9fd333c63ca50f04 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 03 Feb 2026 15:20:27 +0800
Subject: [PATCH] 反无驾驶舱优化
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceServiceImpl.java | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 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 860f2aa..9627ada 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
@@ -130,8 +130,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);
}
/**
@@ -143,14 +143,15 @@
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
@@ -166,8 +167,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
@@ -197,8 +198,8 @@
}
@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;
}
/**
@@ -217,4 +218,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