From 1bfbc52da47b22f00a1c1f5f670c30f70d999873 Mon Sep 17 00:00:00 2001 From: linwei <872216696@qq.com> Date: Mon, 02 Feb 2026 18:18:09 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/IFwDeviceService.java | 31 +++++++++++++++++++++++++++++-- 1 files changed, 29 insertions(+), 2 deletions(-) diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/IFwDeviceService.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/IFwDeviceService.java index 0537fae..241be87 100644 --- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/IFwDeviceService.java +++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/IFwDeviceService.java @@ -20,6 +20,7 @@ import org.sxkj.fw.cockpit.vo.AlarmStatisticsVO; import org.sxkj.fw.cockpit.vo.DeviceStatisticsVO; 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; @@ -67,6 +68,14 @@ */ List<FwDeviceEntity> selectFwDeviceList(Integer isAreaSelect, Long areaId, Integer status, Integer isTrack); + /** + * 根据多边形查询设备列表 + * + * @param query 查询条件 + * @return 设备列表 + */ + List<FwDeviceEntity> selectFwDeviceListByPolygons(FwDevicePolygonQueryDTO query); + /** * 导出数据 @@ -80,7 +89,7 @@ * 设备类型统计 * @return */ - List<DeviceStatisticsVO> statisticalDeviceType(List<Long> deptList); + List<DeviceStatisticsVO> statisticalDeviceType(String regionName, String currentDeptId); /** * 设备统计 - 按类型统计 @@ -104,7 +113,7 @@ * 设备报警统计 * @return */ - AlarmStatisticsVO statisticalDeviceAtt(List<Long> deptList); + AlarmStatisticsVO statisticalDeviceAtt(String regionName, String currentDeptId); /** * 驾驶舱获取设备列表 @@ -136,4 +145,22 @@ * @return */ boolean saveOrUpdateDevice(FwDeviceEntity fwDeviceEntity); + + /** + * 按设备ID更新出入库状态 + * + * @param deviceId 设备ID + * @param trackStatus 出入库状态 + * @return 是否更新成功 + */ + boolean updateTrackStatusByDeviceId(Long deviceId, Integer trackStatus, String outTarget); + + /** + * 查询非本部门区域的设备 + * + * @param regionCode 区域编码，用于查询不在该区域内的设备 + * @param deptId 机构ID，用于限定查询范围 + * @return 设备列表 + */ + List<FwDeviceVO> getNonDeptAreaDevices(String regionCode, String deptId); } -- Gitblit v1.9.3