From 08ddfad4530a014094c06fe68b8c2d9a0753403a Mon Sep 17 00:00:00 2001 From: linwei <872216696@qq.com> Date: Wed, 05 Aug 2026 14:09:29 +0800 Subject: [PATCH] fix(gd): 修复线索事件查询中的SQL语法错误 --- drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/IFwDeviceService.java | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 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 9780064..ff9e76f 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 @@ -63,10 +63,11 @@ * * @param isAreaSelect 是否过滤区域 * @param areaId 设备被关联区域id + * @param areaIds 设备被关联区域id集合 * @param status 设备状态 * @return */ - List<FwDeviceEntity> selectFwDeviceList(Integer isAreaSelect, Long areaId, Integer status, Integer isTrack); + List<FwDeviceEntity> selectFwDeviceList(Integer isAreaSelect, Long areaId, List<Long> areaIds, Integer status, Integer isTrack); /** * 根据多边形查询设备列表 @@ -140,6 +141,14 @@ boolean existsAreaBindByDeviceId(Long deviceId); /** + * 获取设备绑定区域名称 + * + * @param deviceId + * @return 未绑定时返回空字符串 + */ + String selectAreaBindNameByDeviceId(Long deviceId); + + /** * 新增或修改设备 * @param fwDeviceEntity * @return -- Gitblit v1.9.3