From 9a869e800b235636097abebadb1bd1cae4206cbc Mon Sep 17 00:00:00 2001 From: value <z1292839451@163.com> Date: 星期二, 04 六月 2024 21:21:57 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- cnas-server/src/main/java/com/yuanchu/mom/service/DeviceService.java | 14 ++++++++++++-- 1 files changed, 12 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 de8f127..9268eda 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,6 +2,8 @@ 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.dto.DeviceDto1; import com.yuanchu.mom.pojo.Device; import java.util.List; @@ -12,7 +14,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); @@ -22,5 +24,13 @@ List<Device> selectEquipmentOverview(); -} + List<Device> authorizedPerson(); + 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); +} -- Gitblit v1.9.3