From 4006777cc118ac160fce81f6781b33a6b6307a3b Mon Sep 17 00:00:00 2001 From: linwei <872216696@qq.com> Date: Fri, 30 Jan 2026 15:30:20 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/IFwDefenseSceneManageService.java | 22 +++++++++++++++++++--- 1 files changed, 19 insertions(+), 3 deletions(-) diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/IFwDefenseSceneManageService.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/IFwDefenseSceneManageService.java index b5a0f9d..ac0960b 100644 --- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/IFwDefenseSceneManageService.java +++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/IFwDefenseSceneManageService.java @@ -17,7 +17,7 @@ package org.sxkj.fw.area.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; -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; @@ -36,10 +36,26 @@ * 自定义分页 * * @param page - * @param fwDefenseSceneManage + * @param fwDefenseSceneManagePageParam * @return */ - IPage<FwDefenseSceneManageVO> selectFwDefenseSceneManagePage(IPage<FwDefenseSceneManageVO> page, FwDefenseSceneManageDTO fwDefenseSceneManage); + IPage<FwDefenseSceneManageVO> selectFwDefenseSceneManagePage(IPage<FwDefenseSceneManageVO> page, FwDefenseSceneManagePageParam fwDefenseSceneManagePageParam); + + /** + * 详情 + * + * @param id + * @return + */ + FwDefenseSceneManageVO selectFwDefenseSceneManageDetail(Long id); + + /** + * 列表（按时间过滤有效区间） + * + * @param time + * @return + */ + List<FwDefenseSceneManageVO> selectFwDefenseSceneManageList(java.util.Date time); /** -- Gitblit v1.9.3