From 234b0ac195934b34c06045b2d2ef0f10e239dd8e Mon Sep 17 00:00:00 2001 From: zhuo <2089219845@qq.com> Date: 星期三, 23 四月 2025 00:06:54 +0800 Subject: [PATCH] 系统合并 --- cnas-device/src/main/java/com/ruoyi/device/service/DeviceMaintenanceService.java | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-) diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/DeviceMaintenanceService.java b/cnas-device/src/main/java/com/ruoyi/device/service/DeviceMaintenanceService.java index 6ba0be6..8830d9f 100644 --- a/cnas-device/src/main/java/com/ruoyi/device/service/DeviceMaintenanceService.java +++ b/cnas-device/src/main/java/com/ruoyi/device/service/DeviceMaintenanceService.java @@ -3,21 +3,28 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.device.excel.DeviceMaintenanceExport; +import com.ruoyi.common.core.domain.Result; +import com.ruoyi.device.dto.DeviceMaintenanceDto; import com.ruoyi.device.pojo.DeviceMaintenance; import javax.servlet.http.HttpServletResponse; -import java.util.List; +/** + * 璁惧缁存姢淇濆吇 + */ public interface DeviceMaintenanceService extends IService<DeviceMaintenance> { - IPage<DeviceMaintenance> getDeviceMaintenancePage(Page page, Integer deviceId, String deviceNumber); - /** - * 瀵煎嚭Word璁惧缁存姢璁板綍 - * + * 璁惧缁存姢鍒嗛〉鏌ヨ + * @return + */ + IPage<DeviceMaintenanceDto> selectDeviceMaintenancePage(Page page, DeviceMaintenanceDto deviceMaintenance); + + /** + * 瀵煎嚭璁惧缁存姢淇濆吇 * @param deviceId * @param response + * @return */ - void exportMaintenanceRecord(Integer deviceId, HttpServletResponse response); + void exportDeviceMaintenance(Integer deviceId, HttpServletResponse response); } -- Gitblit v1.9.3