From c0fd46ed9c7ddf7a3ea4e6a972474e9a62c68a1a Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 22 七月 2024 19:59:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cnas-server/src/main/java/com/yuanchu/mom/service/DeviceService.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 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 99fb7fb..2ae0473 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
@@ -2,8 +2,11 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.yuanchu.mom.dto.DeviceDto;
import com.yuanchu.mom.pojo.Device;
+import com.yuanchu.mom.vo.Result;
+import javax.servlet.http.HttpServletRequest;
import java.util.List;
import java.util.Map;
@@ -12,7 +15,7 @@
*/
public interface DeviceService extends IService<Device> {
- Map<String, Object> selectDeviceParameter(Page page, Device itemParameter);
+ Map<String, Object> selectDeviceParameter(Page page, DeviceDto itemParameter);
int addDeviceParameter(Device itemParameter);
@@ -24,7 +27,13 @@
List<Device> authorizedPerson();
- List<Device> search( Integer status, String deviceName, String specificationModel, String largeCategory);
+ List<Device> search(Integer status, String deviceName, String specificationModel, String largeCategory);
+ List<Device> selectDevicePrincipal();
+
+ List<Device> selectDeviceByCategory(String inspectionItem, String inspectionItemSubclass);
+
+ Device selectDeviceByCode(String code);
+
+ Result<?> dataAcquisition(HttpServletRequest request, Integer id, String entrustCode, String sampleCode);
}
-
--
Gitblit v1.9.3