From 8d85246f061e3da623c7b9eb4e323ee724b4de0b Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 13 一月 2025 13:20:01 +0800
Subject: [PATCH] 设备cnas代码搬迁

---
 cnas-server/src/main/java/com/yuanchu/mom/service/DeviceService.java |   22 ++++++++++++++++++++--
 1 files changed, 20 insertions(+), 2 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 d62ed5f..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
@@ -1,8 +1,14 @@
 package com.yuanchu.mom.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+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;
 import java.util.List;
 import java.util.Map;
 
@@ -11,7 +17,9 @@
  */
 public interface DeviceService extends IService<Device> {
 
-    Map<String, Object> selectDeviceParameter(com.baomidou.mybatisplus.extension.plugins.pagination.Page page, Device itemParameter);
+    List<User> selectUserList();
+
+    Map<String, Object> selectDeviceParameter(Page page, DeviceDto itemParameter,Boolean laboratoryNameIsNull);
 
     int addDeviceParameter(Device itemParameter);
 
@@ -27,5 +35,15 @@
 
     List<Device> selectDevicePrincipal();
 
-}
+    List<Device> selectDeviceByCategory(String inspectionItem, String inspectionItemSubclass);
 
+    Device selectDeviceByCode(String code);
+
+    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