From dbc7e62be76ff48b26461ffaef9c3fc87be018cb Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 11 Feb 2026 11:05:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneManageMapper.java | 41 ++++++++++++++++++++++++++++++++++++++---
1 files changed, 38 insertions(+), 3 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneManageMapper.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneManageMapper.java
index 476920a..c727fc0 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneManageMapper.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneManageMapper.java
@@ -16,7 +16,7 @@
*/
package org.sxkj.fw.area.mapper;
-import org.sxkj.fw.area.dto.FwDefenseSceneManageDTO;
+import org.sxkj.fw.area.param.FwDefenseSceneManagePageParam;
import org.sxkj.fw.area.entity.FwDefenseSceneManageEntity;
import org.sxkj.fw.area.vo.FwDefenseSceneManageVO;
import org.sxkj.fw.area.excel.FwDefenseSceneManageExcel;
@@ -24,6 +24,9 @@
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
+import org.sxkj.fw.common.FwBaseInfo;
+
+import java.util.Date;
import java.util.List;
/**
@@ -38,10 +41,26 @@
* 自定义分页
*
* @param page
- * @param fwDefenseSceneManage
+ * @param fwDefenseSceneManagePageParam
* @return
*/
- List<FwDefenseSceneManageVO> selectFwDefenseSceneManagePage(IPage page, FwDefenseSceneManageDTO fwDefenseSceneManage);
+ List<FwDefenseSceneManageVO> selectFwDefenseSceneManagePage(IPage page, FwDefenseSceneManagePageParam fwDefenseSceneManagePageParam);
+
+ /**
+ * 详情
+ *
+ * @param id
+ * @return
+ */
+ FwDefenseSceneManageVO selectFwDefenseSceneManageDetail(@Param("id") Long id);
+
+ /**
+ * 列表（按时间过滤有效区间）
+ *
+ * @param time
+ * @return
+ */
+ List<FwDefenseSceneManageVO> selectFwDefenseSceneManageList(@Param("time") java.util.Date time);
/**
@@ -52,4 +71,20 @@
*/
List<FwDefenseSceneManageExcel> exportFwDefenseSceneManage(@Param("ew") Wrapper<FwDefenseSceneManageEntity> queryWrapper);
+ /**
+ * 根据场景管理ID获取所有相关设备ID
+ *
+ * @param id 场景管理表(ja_fw_defense_scene_manage)的主键ID
+ * @return 设备ID字符串列表，每个元素是逗号分隔的设备ID字符串
+ * @throws Exception 数据库查询异常
+ */
+ List<Long> selectDeviceId(Long id);
+
+ /**
+ *
+ * @param fwBaseInfo
+ * @param time
+ * @return
+ */
+ List<FwDefenseSceneManageVO> selectFwDefenseSceneManageCockpitList(@Param("fwBaseInfo") FwBaseInfo fwBaseInfo, @Param("time") Date time);
}
--
Gitblit v1.9.3