From 4fa212add5bb7689331e9e070c802bfcb5dcafa2 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Mon, 02 Feb 2026 17:21:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceServiceImpl.java | 35 ++++++++++++++++++++++++++++-------
1 files changed, 28 insertions(+), 7 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 9795cc4..b01203c 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;
@@ -117,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);
}
/**
@@ -126,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);
}
/**
@@ -162,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
@@ -193,7 +197,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