From 1f7276770b69e5c8b3c10d70a57b7de18003f5a0 Mon Sep 17 00:00:00 2001
From: houzhongjian <houzhongyi@126.com>
Date: 星期三, 06 十一月 2024 14:17:55 +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/service/ChannelOPCDATagService.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcda/service/ChannelOPCDATagService.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcda/service/ChannelOPCDATagService.java
index c0594a6..09f9810 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcda/service/ChannelOPCDATagService.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcda/service/ChannelOPCDATagService.java
@@ -3,12 +3,12 @@
import com.iailab.framework.common.pojo.PageResult;
import com.iailab.module.data.channel.opcda.dto.ChannelOPCDATagDTO;
import com.iailab.module.data.channel.opcda.entity.ChannelOPCDATagEntity;
+import com.iailab.module.data.channel.opcda.vo.OpcDaTagImportExcelVO;
import com.iailab.module.data.channel.opcda.vo.OpcDaTagPageReqVO;
-import com.iailab.module.data.common.utils.PageUtils;
+import com.iailab.module.data.channel.tag.vo.TagImportRespVO;
import org.springframework.web.multipart.MultipartFile;
import java.util.List;
-import java.util.Map;
/**
* @author lirm
@@ -36,4 +36,7 @@
void update(ChannelOPCDATagEntity channelOPCDATagEntity);
void delete(String id);
+
+ TagImportRespVO importOpcDaTagList(List<OpcDaTagImportExcelVO> importTags, boolean isUpdateSupport, String serverId);
+
}
--
Gitblit v1.9.3