From 74205424049d169a8d3bbabb74b4c8c9adf1ec99 Mon Sep 17 00:00:00 2001 From: zhuo <2089219845@qq.com> Date: 星期六, 15 二月 2025 16:05:51 +0800 Subject: [PATCH] 设备列表查询接口修改 --- cnas-server/src/main/java/com/yuanchu/mom/service/DeviceService.java | 30 +++++++++++++++++++++++++++--- 1 files changed, 27 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..707b560 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,14 @@ 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 javax.servlet.http.HttpServletResponse; import java.util.List; import java.util.Map; @@ -12,7 +18,9 @@ */ public interface DeviceService extends IService<Device> { - Map<String, Object> selectDeviceParameter(Page page, Device itemParameter); + List<User> selectUserList(); + + Map<String, Object> selectDeviceParameter(Page page, DeviceDto itemParameter,Boolean laboratoryNameIsNull); int addDeviceParameter(Device itemParameter); @@ -24,7 +32,23 @@ 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(Integer id); + + 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); + + void exportDeviceFile(Integer deviceId, HttpServletResponse response); + + void exportEquipmentDetails(HttpServletResponse response); } - -- Gitblit v1.9.3