From 3adcc36797b576b6c6f793e0eeac41068b6dd717 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 14 一月 2025 11:26:00 +0800
Subject: [PATCH] 1.14调整
---
cnas-server/src/main/java/com/yuanchu/mom/service/DeviceService.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/service/DeviceService.java b/cnas-server/src/main/java/com/yuanchu/mom/service/DeviceService.java
index a7de1e7..4f08b8b 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/service/DeviceService.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/service/DeviceService.java
@@ -5,6 +5,7 @@
import com.yuanchu.mom.dto.ADto;
import com.yuanchu.mom.dto.DeviceDto;
import com.yuanchu.mom.pojo.Device;
+import com.yuanchu.mom.pojo.User;
import com.yuanchu.mom.vo.Result;
import javax.servlet.http.HttpServletRequest;
@@ -16,7 +17,9 @@
*/
public interface DeviceService extends IService<Device> {
- Map<String, Object> selectDeviceParameter(Page page, DeviceDto itemParameter);
+ List<User> selectUserList();
+
+ Map<String, Object> selectDeviceParameter(Page page, DeviceDto itemParameter,Boolean laboratoryNameIsNull);
int addDeviceParameter(Device itemParameter);
@@ -39,4 +42,8 @@
Result<?> dataAcquisition(HttpServletRequest request, Integer id, String entrustCode, String sampleCode);
List<ADto> menu();
+
+ List<Map<String, Object>> treeDevice(String deviceName);
+
+ Result<?> determineWhetherToCollectData(String managementNumber, HttpServletRequest request);
}
--
Gitblit v1.9.3