From a28ca3f36d0ace05966a8c0fac1e4b5fe921f882 Mon Sep 17 00:00:00 2001
From: houzhongjian <houzhongyi@126.com>
Date: 星期三, 30 十月 2024 16:25:12 +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/ChannelOPCDATagDao.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcda/dao/ChannelOPCDATagDao.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcda/dao/ChannelOPCDATagDao.java
index 638d384..ca00cdb 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcda/dao/ChannelOPCDATagDao.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcda/dao/ChannelOPCDATagDao.java
@@ -1,14 +1,29 @@
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.ChannelOPCDATagEntity;
+import com.iailab.module.data.channel.opcda.entity.ChannelOPCDATagEntity;
+import com.iailab.module.data.channel.opcda.vo.OpcDaDevicePageReqVO;
+import com.iailab.module.data.channel.opcda.vo.OpcDaTagPageReqVO;
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 ChannelOPCDATagDao extends BaseMapper<ChannelOPCDATagEntity> {
+public interface ChannelOPCDATagDao extends BaseMapperX<ChannelOPCDATagEntity> {
+
+ default PageResult<ChannelOPCDATagEntity> selectPage(OpcDaTagPageReqVO reqVO) {
+ return selectPage(reqVO, new LambdaQueryWrapperX<ChannelOPCDATagEntity>()
+ .likeIfPresent(ChannelOPCDATagEntity::getTagName, reqVO.getTagName())
+ .likeIfPresent(ChannelOPCDATagEntity::getServerId, reqVO.getServerId())
+ .orderByDesc(ChannelOPCDATagEntity::getCreateTime));
+ }
}
--
Gitblit v1.9.3