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 | 75 ++++++++++++++++++++++++++++++++++++-
1 files changed, 73 insertions(+), 2 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 edabdfc..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
@@ -17,18 +17,24 @@
package org.sxkj.fw.area.service;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
+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;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseService;
import java.util.List;
+import java.util.Map;
/**
* 区域划分表 服务类
*
* @author lw
- * @since 2026-01-07
+ * @since 2026-01-08
*/
public interface IFwAreaDivideService extends BaseService<FwAreaDivideEntity> {
/**
@@ -38,8 +44,57 @@
* @param fwAreaDivide
* @return
*/
- IPage<FwAreaDivideVO> selectFwAreaDividePage(IPage<FwAreaDivideVO> page, FwAreaDivideVO fwAreaDivide);
+ IPage<FwAreaDivideVO> selectFwAreaDividePage(IPage<FwAreaDivideVO> page, FwAreaDivideDTO fwAreaDivide);
+ /**
+ * 列表
+ *
+ * @param filterSelected
+ * @param sceneId
+ * @return
+ */
+ List<FwAreaDivideVO> selectFwAreaDivideList(Integer filterSelected, Long sceneId, String areaTypeKeys, Integer isSetSceneManage, java.time.LocalDateTime flyTime);
+
+ /**
+ * 根据设备ID获取关联场景名称
+ *
+ * @param deviceIds
+ * @return
+ */
+ Map<Long, String> selectSceneNameByDeviceIds(List<Long> deviceIds);
+
+ /**
+ * 根据设备ID判断是否绑定区域
+ *
+ * @param deviceId
+ * @return
+ */
+ boolean existsAreaByDeviceId(Long deviceId);
+
+ /**
+ * 统计分页
+ *
+ * @param page
+ * @param fwAreaDivideStatistics
+ * @return
+ */
+ IPage<FwAreaDivideStatisticsVO> selectFwAreaDivideStatisticsPage(IPage<FwAreaDivideStatisticsVO> page, FwAreaDivideStatisticsDTO fwAreaDivideStatistics);
+
+ /**
+ * 统计详情
+ *
+ * @param fwAreaDivideStatistics
+ * @return
+ */
+ FwAreaDivideStatisticsVO selectFwAreaDivideStatisticsDetail(FwAreaDivideStatisticsDTO fwAreaDivideStatistics);
+
+ /**
+ * 详情
+ *
+ * @param id
+ * @return
+ */
+ FwAreaDivideVO selectFwAreaDivideDetail(Long id);
/**
* 导出数据
@@ -49,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