From 66bfbdb9251c22ffa2b5f05595a76a3547a2f5eb Mon Sep 17 00:00:00 2001 From: rain <1679827795@qq.com> Date: Mon, 09 Feb 2026 11:00:44 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/IFwAreaDivideService.java | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 deletions(-) diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/IFwAreaDivideService.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/IFwAreaDivideService.java index 978ed07..dd020e0 100644 --- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/IFwAreaDivideService.java +++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/IFwAreaDivideService.java @@ -20,6 +20,8 @@ import org.sxkj.fw.area.dto.FwAreaDivideDTO; import org.sxkj.fw.area.dto.FwAreaDivideStatisticsDTO; import org.sxkj.fw.area.entity.FwAreaDivideEntity; +import org.sxkj.fw.area.entity.FwAreaDivideExtEntity; +import org.sxkj.fw.area.param.FwAreaDivideListParam; import org.sxkj.fw.area.vo.FwAreaDivideVO; import org.sxkj.fw.area.vo.FwAreaDivideStatisticsVO; import org.sxkj.fw.area.excel.FwAreaDivideExcel; @@ -51,7 +53,7 @@ * @param sceneId * @return */ - List<FwAreaDivideVO> selectFwAreaDivideList(Integer filterSelected, Long sceneId); + List<FwAreaDivideVO> selectFwAreaDivideList(Integer filterSelected, Long sceneId, String areaTypeKeys, Integer isSetSceneManage, java.time.LocalDateTime flyTime); /** * 根据设备ID获取关联场景名称 @@ -102,4 +104,20 @@ */ List<FwAreaDivideExcel> exportFwAreaDivide(Wrapper<FwAreaDivideEntity> queryWrapper); + /** + * 新增或修改（主表 + 扩展表批量） + * + * @param fwAreaDivide + * @param fwAreaDivideExtList + * @return + */ + boolean saveOrUpdateWithExt(FwAreaDivideEntity fwAreaDivide, List<FwAreaDivideExtEntity> fwAreaDivideExtList); + + /** + * + * @param param + * @return + */ + List<FwAreaDivideVO> selectFwAreaDivideList(FwAreaDivideListParam param); + } -- Gitblit v1.9.3