From 7cbee82d2572041332eb69bc2d0d9c6a93492efe Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期二, 15 十月 2024 11:52:48 +0800
Subject: [PATCH] HttpCollectorIhDB
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/modbus/service/impl/ChannelModbusDeviceServiceImpl.java | 21 +++++----------------
1 files changed, 5 insertions(+), 16 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/modbus/service/impl/ChannelModbusDeviceServiceImpl.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/modbus/service/impl/ChannelModbusDeviceServiceImpl.java
index aaeb70d..313949b 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/modbus/service/impl/ChannelModbusDeviceServiceImpl.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/modbus/service/impl/ChannelModbusDeviceServiceImpl.java
@@ -1,12 +1,10 @@
package com.iailab.module.data.channel.modbus.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.iailab.framework.common.pojo.PageResult;
import com.iailab.framework.common.util.object.ConvertUtils;
-import com.iailab.module.data.common.utils.PageUtils;
-import com.iailab.module.data.common.utils.Query;
+import com.iailab.module.data.channel.modbus.vo.ModBusDevicePageReqVO;
import com.iailab.module.data.channel.modbus.dao.ChannelModBusDeviceDao;
import com.iailab.module.data.channel.modbus.dto.ChannelModBusDeviceDTO;
import com.iailab.module.data.channel.modbus.entity.ChannelModBusDeviceEntity;
@@ -33,20 +31,11 @@
/**
* 分页查询设备
*
- * @param params
+ * @param reqVO
*/
@Override
- public PageUtils queryPage(Map<String, Object> params) {
-
- String name = (String) params.get("name");
-
- IPage<ChannelModBusDeviceEntity> page = this.page(
- new Query<ChannelModBusDeviceEntity>().getPage(params),
- new QueryWrapper<ChannelModBusDeviceEntity>()
- .like(StringUtils.isNotBlank(name), "name", name)
- .orderByDesc("create_time")
- );
- return new PageUtils(page);
+ public PageResult<ChannelModBusDeviceEntity> queryPage(ModBusDevicePageReqVO reqVO) {
+ return channelModBusDeviceDao.selectPage(reqVO);
}
/**
--
Gitblit v1.9.3