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/opcua/dao/ChannelOPCUATagDao.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcua/dao/ChannelOPCUATagDao.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcua/dao/ChannelOPCUATagDao.java
index 00d1ddb..c154be9 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcua/dao/ChannelOPCUATagDao.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcua/dao/ChannelOPCUATagDao.java
@@ -1,19 +1,25 @@
package com.iailab.module.data.channel.opcua.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.opcua.entity.ChannelOPCUATagEntity;
-import com.iailab.module.data.channel.opcua.entity.ChannelOPCUATagEntity;
-import com.iailab.module.data.channel.opcua.entity.ChannelOPCUATagEntity;
-import com.iailab.module.data.channel.opcua.entity.ChannelOPCUATagEntity;
+import com.iailab.module.data.channel.opcua.vo.OpcUaTagPageReqVO;
import org.apache.ibatis.annotations.Mapper;
/**
- * @author DongYukun
+ * @author lirm
* @Description
- * @createTime 2023年05月8日 15:01:00
+ * @createTime 2024年08月26日
*/
@TenantDS
@Mapper
-public interface ChannelOPCUATagDao extends BaseMapper<ChannelOPCUATagEntity> {
+public interface ChannelOPCUATagDao extends BaseMapperX<ChannelOPCUATagEntity> {
+ default PageResult<ChannelOPCUATagEntity> selectPage(OpcUaTagPageReqVO reqVO) {
+ return selectPage(reqVO, new LambdaQueryWrapperX<ChannelOPCUATagEntity>()
+ .likeIfPresent(ChannelOPCUATagEntity::getTagName, reqVO.getTagName())
+ .likeIfPresent(ChannelOPCUATagEntity::getDevice, reqVO.getDevice())
+ .orderByDesc(ChannelOPCUATagEntity::getCreateTime));
+ }
}
--
Gitblit v1.9.3