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/modbus/service/ChannelModbusTagService.java | 23 +++++++++--------------
1 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/modbus/service/ChannelModbusTagService.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/modbus/service/ChannelModbusTagService.java
index e2abf72..6548e13 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/modbus/service/ChannelModbusTagService.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/modbus/service/ChannelModbusTagService.java
@@ -1,24 +1,26 @@
package com.iailab.module.data.channel.modbus.service;
-import com.iailab.module.data.common.utils.PageUtils;
+import com.iailab.framework.common.pojo.PageResult;
import com.iailab.module.data.channel.modbus.dto.ChannelModbusTagDTO;
import com.iailab.module.data.channel.modbus.entity.ChannelModBusTagEntity;
+import com.iailab.module.data.channel.modbus.vo.ModBusTagImportExcelVO;
+import com.iailab.module.data.channel.modbus.vo.ModBusTagPageReqVO;
+import com.iailab.module.data.channel.tag.vo.TagImportRespVO;
import java.util.List;
-import java.util.Map;
/**
- * @author DongYukun
+ * @author lirm
* @Description
- * @createTime 2023年05月08日 15:04:00
+ * @createTime 2024年08月27日
*/
public interface ChannelModbusTagService {
/**
* 分页查询tag
*
- * @param params
+ * @param reqVO
*/
- PageUtils queryPage(Map<String, Object> params);
+ PageResult<ChannelModBusTagEntity> queryPage(ModBusTagPageReqVO reqVO);
/**
* 查询tag详情
@@ -70,12 +72,5 @@
*/
void deleteByDeviceName(String name);
-// /**
-// * 导入Tag
-// *
-// * @param device
-// * @param file
-// * @throws Exception
-// */
-// void importTag(String device, MultipartFile file) throws Exception;
+ TagImportRespVO importModBusTagList(List<ModBusTagImportExcelVO> importTags, boolean isUpdateSupport, String device);
}
--
Gitblit v1.9.3