From f7e880deb0612ba5efe96e6ce229abd8c19bc6e7 Mon Sep 17 00:00:00 2001 From: 潘志宝 <979469083@qq.com> Date: 星期二, 03 九月 2024 09:08:23 +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/ChannelOPCUADeviceDao.java | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-) diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcua/dao/ChannelOPCUADeviceDao.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcua/dao/ChannelOPCUADeviceDao.java index 43099f5..519ccb6 100644 --- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcua/dao/ChannelOPCUADeviceDao.java +++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcua/dao/ChannelOPCUADeviceDao.java @@ -1,21 +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.ChannelOPCUADeviceEntity; -import com.iailab.module.data.channel.opcua.entity.ChannelOPCUADeviceEntity; -import com.iailab.module.data.channel.opcua.entity.ChannelOPCUADeviceEntity; -import com.iailab.module.data.channel.opcua.entity.ChannelOPCUADeviceEntity; +import com.iailab.module.data.channel.opcua.vo.OpcUaDevicePageReqVO; 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 ChannelOPCUADeviceDao extends BaseMapper<ChannelOPCUADeviceEntity> { +public interface ChannelOPCUADeviceDao extends BaseMapperX<ChannelOPCUADeviceEntity> { + default PageResult<ChannelOPCUADeviceEntity> selectPage(OpcUaDevicePageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX<ChannelOPCUADeviceEntity>() + .likeIfPresent(ChannelOPCUADeviceEntity::getServerName, reqVO.getServerName())); + } } -- Gitblit v1.9.3