From db184afd0c5bf3359b44eb0251fa5b07386eb3ff Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期三, 06 十一月 2024 09:48:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/modbus/dao/ChannelModBusDeviceDao.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/modbus/dao/ChannelModBusDeviceDao.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/modbus/dao/ChannelModBusDeviceDao.java
index efc4510..7c6463f 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/modbus/dao/ChannelModBusDeviceDao.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/modbus/dao/ChannelModBusDeviceDao.java
@@ -1,10 +1,11 @@
package com.iailab.module.data.channel.modbus.dao;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.iailab.framework.common.pojo.PageResult;
+import com.iailab.framework.mybatis.core.mapper.BaseMapperX;
+import com.iailab.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.iailab.framework.tenant.core.db.dynamic.TenantDS;
import com.iailab.module.data.channel.modbus.entity.ChannelModBusDeviceEntity;
-import com.iailab.module.data.channel.modbus.entity.ChannelModBusDeviceEntity;
-import com.iailab.module.data.channel.modbus.entity.ChannelModBusDeviceEntity;
-import com.iailab.module.data.channel.modbus.entity.ChannelModBusDeviceEntity;
+import com.iailab.module.data.channel.modbus.vo.ModBusDevicePageReqVO;
import org.apache.ibatis.annotations.Mapper;
/**
@@ -12,7 +13,15 @@
* @Description
* @createTime 2023年04月24日 11:33:00
*/
+@TenantDS
@Mapper
-public interface ChannelModBusDeviceDao extends BaseMapper<ChannelModBusDeviceEntity> {
+public interface ChannelModBusDeviceDao extends BaseMapperX<ChannelModBusDeviceEntity> {
+
+ default PageResult<ChannelModBusDeviceEntity> selectPage(ModBusDevicePageReqVO reqVO) {
+ return selectPage(reqVO, new LambdaQueryWrapperX<ChannelModBusDeviceEntity>()
+ .likeIfPresent(ChannelModBusDeviceEntity::getName, reqVO.getName())
+ .likeIfPresent(ChannelModBusDeviceEntity::getAddress, reqVO.getAddress())
+ .orderByDesc(ChannelModBusDeviceEntity::getCreateTime));
+ }
}
--
Gitblit v1.9.3