From eb975b40828b3a930fb38b75c739a7385b14ee12 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期四, 03 四月 2025 14:48:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/radio_frequency' into radio_frequency
---
cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceMapper.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceMapper.java b/cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceMapper.java
index 2f2c500..e7b0af4 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceMapper.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceMapper.java
@@ -1,20 +1,21 @@
package com.ruoyi.device.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.device.dto.DeviceDto;
import com.ruoyi.device.pojo.Device;
+import com.ruoyi.framework.mybatis_config.MyBaseMapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
+import java.util.Set;
/**
* 璁惧(Device)琛ㄦ暟鎹簱璁块棶灞�
*/
-public interface DeviceMapper extends BaseMapper<Device> {
+public interface DeviceMapper extends MyBaseMapper<Device> {
IPage<Device> selectDeviceParameter(Page page, QueryWrapper<Device> ew);
List<Device> selectEquipmentOverview(Page page, QueryWrapper<Device> ew);
@@ -29,9 +30,6 @@
//鑾峰彇鍥剧墖鏁版嵁
void selectDeviceImage(@Param(value = "name") String name ,@Param(value = "id") Integer id);
- //鏌ヨ璁惧璐熻矗浜�
- List<Device> selectDevicePrincipal();
-
IPage<DeviceDto> selectDeviceParameterPage(Page page, @Param("ew") QueryWrapper<DeviceDto> queryWrappers, @Param("laboratoryNameIsNull") Boolean laboratoryNameIsNull);
List<Map<String, Object>> getInspectionItemSubclass(@Param("id") Integer id);
@@ -39,5 +37,7 @@
List<Map<String, Object>> treeDevice(@Param("deviceName") String deviceName);
DeviceDto selectDeviceByCode(Integer id);
+
+ List<Device> selectByKeys(@Param("keys") Set<DeviceDto> keys);
}
--
Gitblit v1.9.3