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/opcda/dao/ChannelOPCDADeviceDao.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcda/dao/ChannelOPCDADeviceDao.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcda/dao/ChannelOPCDADeviceDao.java
index 8d84401..e3ce918 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcda/dao/ChannelOPCDADeviceDao.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcda/dao/ChannelOPCDADeviceDao.java
@@ -1,18 +1,26 @@
package com.iailab.module.data.channel.opcda.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.opcda.entity.ChannelOPCDADeviceEntity;
+import com.iailab.module.data.channel.opcda.vo.OpcDaDevicePageReqVO;
import org.apache.ibatis.annotations.Mapper;
/**
- * @author PanZhibao
+ * @author lirm
* @Description
- * @createTime 2023年04月26日 11:31:00
+ * @createTime 2024年08月26日
*/
@TenantDS
@Mapper
-public interface ChannelOPCDADeviceDao extends BaseMapper<ChannelOPCDADeviceEntity> {
+public interface ChannelOPCDADeviceDao extends BaseMapperX<ChannelOPCDADeviceEntity> {
+ default PageResult<ChannelOPCDADeviceEntity> selectPage(OpcDaDevicePageReqVO reqVO) {
+ return selectPage(reqVO, new LambdaQueryWrapperX<ChannelOPCDADeviceEntity>()
+ .likeIfPresent(ChannelOPCDADeviceEntity::getServerName, reqVO.getServerName())
+ .orderByDesc(ChannelOPCDADeviceEntity::getCreateTime));
+ }
}
--
Gitblit v1.9.3