From 6c1e7d3ffc39e98782364880bb937081e91059d6 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期五, 11 四月 2025 14:52:23 +0800
Subject: [PATCH] Merge branch 'radio_frequency' of http://114.132.189.42:9002/r/lims-ruoyi-after into radio_frequency

---
 cnas-device/src/main/java/com/ruoyi/device/service/DeviceService.java |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/DeviceService.java b/cnas-device/src/main/java/com/ruoyi/device/service/DeviceService.java
index 72073e9..00e6914 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/service/DeviceService.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/service/DeviceService.java
@@ -8,6 +8,7 @@
 import com.ruoyi.device.dto.DeviceCollectionDto;
 import com.ruoyi.device.dto.DeviceDto;
 import com.ruoyi.device.pojo.Device;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -54,4 +55,19 @@
      * @param response
      */
     void exportEquipmentDetails(HttpServletResponse response);
+
+    /**
+     * 瀵煎叆璁惧
+     * @param list
+     * @return
+     */
+    void importExcel(List<Device> list);
+
+    /**
+     * 鍒ゆ柇璇ヨ澶囨槸鍚﹀彲浠ユ暟閲�
+     * @param managementNumber
+     * @param request
+     * @return
+     */
+    Result<?> determineWhetherToCollectData(String managementNumber, HttpServletRequest request);
 }

--
Gitblit v1.9.3