From 730d1944e3a13c517c77df2b0712df05645a38dd Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期一, 06 一月 2025 16:00:58 +0800
Subject: [PATCH] chartParamList api
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcda/service/impl/ChannelOPCDATagServiceImpl.java | 184 +++++++++++++++++++++++-----------------------
1 files changed, 92 insertions(+), 92 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcda/service/impl/ChannelOPCDATagServiceImpl.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcda/service/impl/ChannelOPCDATagServiceImpl.java
index e274fad..30e1aea 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcda/service/impl/ChannelOPCDATagServiceImpl.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcda/service/impl/ChannelOPCDATagServiceImpl.java
@@ -1,17 +1,21 @@
package com.iailab.module.data.channel.opcda.service.impl;
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.dynamic.datasource.annotation.DSTransactional;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-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.BeanUtils;
import com.iailab.framework.common.util.object.ConvertUtils;
import com.iailab.module.data.channel.opcda.dao.ChannelOPCDATagDao;
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.service.ChannelOPCDATagService;
-import com.iailab.module.data.common.utils.PageUtils;
-import com.iailab.module.data.common.utils.Query;
+import com.iailab.module.data.channel.opcda.vo.OpcDaTagImportExcelVO;
+import com.iailab.module.data.channel.opcda.vo.OpcDaTagPageReqVO;
+import com.iailab.module.data.channel.tag.vo.TagImportRespVO;
+import com.iailab.module.data.common.enums.CommonConstant;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.ss.usermodel.CellType;
import org.apache.poi.xssf.usermodel.XSSFRow;
@@ -19,21 +23,20 @@
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import java.io.File;
import java.io.FileInputStream;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
+
+import static com.iailab.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static com.iailab.module.data.enums.ErrorCodeConstants.*;
/**
- * @author DongYukun
+ * @author lirm
* @Description
- * @createTime 2023年05月08日 15:04:00
+ * @createTime 2024年08月26日
*/
@Slf4j
@Service
@@ -44,34 +47,46 @@
@Value("${iems.upload-dir}")
private String uploadDir;
- /**
- * 分页查询tag
- *
- * @param params
- */
- @Override
- public PageUtils queryPage(Map<String, Object> params) {
- String tagName = (String) params.get("tagName");
- String serverId = (String) params.get("serverId");
- IPage<ChannelOPCDATagEntity> page = this.page(
- new Query<ChannelOPCDATagEntity>().getPage(params),
- new QueryWrapper<ChannelOPCDATagEntity>()
- .like(StringUtils.isNotBlank(tagName), "tag_name", tagName)
- .eq(StringUtils.isNotBlank(serverId), "server_id", serverId)
- .orderByDesc("create_time")
- );
- return new PageUtils(page);
+ @Override
+ public PageResult<ChannelOPCDATagEntity> queryPage(OpcDaTagPageReqVO reqVO) {
+ return channelOPCDATagDao.selectPage(reqVO);
}
- /**
- * 查询tag详情
- *
- * @param id
- */
@Override
public ChannelOPCDATagEntity info(String id) {
return channelOPCDATagDao.selectById(id);
+ }
+
+ @Override
+ public void add(ChannelOPCDATagEntity channelOPCDATagEntity) {
+ channelOPCDATagDao.insert(channelOPCDATagEntity);
+ }
+
+ @Override
+ public void update(ChannelOPCDATagEntity channelOPCDATagEntity) {
+ channelOPCDATagDao.updateById(channelOPCDATagEntity);
+ }
+
+ @Override
+ public void delete(String id) {
+ channelOPCDATagDao.deleteById(id);
+ }
+
+ @Override
+ public List<ChannelOPCDATagDTO> selectAll() {
+ List<ChannelOPCDATagEntity> entityList = channelOPCDATagDao.selectList(null);
+ return ConvertUtils.sourceToTarget(entityList, ChannelOPCDATagDTO.class);
+ }
+
+ @Override
+ public List<ChannelOPCDATagEntity> listByIds(List<String> ids) {
+ return channelOPCDATagDao.selectList(new QueryWrapper<ChannelOPCDATagEntity>().in("id", ids));
+ }
+
+ @Override
+ public void deleteByServerId(String serverId) {
+ channelOPCDATagDao.delete(new QueryWrapper<ChannelOPCDATagEntity>().eq("server_id",serverId));
}
@Override
@@ -82,64 +97,8 @@
}
- /**
- * 添加tag
- *
- * @param channelOPCDATagEntity
- */
@Override
- public void add(ChannelOPCDATagEntity channelOPCDATagEntity) {
- channelOPCDATagDao.insert(channelOPCDATagEntity);
- }
-
- /**
- * 修改tag
- *
- * @param channelOPCDATagEntity
- */
- @Override
- public void update(ChannelOPCDATagEntity channelOPCDATagEntity) {
- channelOPCDATagDao.updateById(channelOPCDATagEntity);
- }
-
- /**
- * 删除tag
- *
- * @param id
- */
- @Override
- public void delete(String id) {
- channelOPCDATagDao.deleteById(id);
- }
-
- @Override
- public List<ChannelOPCDATagDTO> selectAll() {
-
- List<ChannelOPCDATagEntity> entityList = baseMapper.selectList(
- null
- );
- return ConvertUtils.sourceToTarget(entityList, ChannelOPCDATagDTO.class);
- }
-
- @Override
- public List<ChannelOPCDATagEntity> listByIds(List<String> ids) {
- return baseMapper.selectList(new QueryWrapper<ChannelOPCDATagEntity>().in("id", ids));
- }
-
- @Override
- public void deleteByServerId(String serverId) {
- baseMapper.delete(new QueryWrapper<ChannelOPCDATagEntity>().eq("server_id",serverId));
- }
-
- /**
- * 导入Tag
- *
- * @param serverId
- * @param file
- * @throws Exception
- */
- @Override
- @Transactional(rollbackFor = Exception.class)
+ @DSTransactional(rollbackFor = Exception.class)
public void importTag(String serverId, MultipartFile file) throws Exception {
try {
String suffix = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
@@ -163,7 +122,7 @@
tagEntity.setTagName(row.getCell(1).getStringCellValue());
tagEntity.setDataType(row.getCell(2).getStringCellValue());
tagEntity.setItemId(row.getCell(3).getStringCellValue());
- tagEntity.setEnabled(true);
+ tagEntity.setEnabled(CommonConstant.IS_ENABLE);
tagEntity.setServerId(serverId);
dangerList.add(tagEntity);
}
@@ -173,7 +132,7 @@
//getBaseMapper().insertList(dangerList);
dangerList.forEach(item -> {
try {
- getBaseMapper().insert(item);
+ channelOPCDATagDao.insert(item);
} catch (Exception ex) {
log.warn("插入异常：" + item.getTagName());
}
@@ -184,4 +143,45 @@
throw ex;
}
}
+
+ @Override
+ public TagImportRespVO importOpcDaTagList(List<OpcDaTagImportExcelVO> importTags, boolean isUpdateSupport, String serverId) {
+ // 1.1 参数校验
+ if (CollUtil.isEmpty(importTags)) {
+ throw exception(TAG_IMPORT_LIST_IS_EMPTY);
+ }
+ // 2. 遍历，逐个创建 or 更新
+ TagImportRespVO respVO = TagImportRespVO.builder().createTagNames(new ArrayList<>())
+ .updateTagNames(new ArrayList<>()).failureTagNames(new LinkedHashMap<>()).build();
+ importTags.forEach(importTag -> {
+ // 判断如果不存在，再进行插入
+ ChannelOPCDATagEntity existTag = channelOPCDATagDao.selectOne(new QueryWrapper<ChannelOPCDATagEntity>()
+ .eq("server_id", serverId)
+ .eq("tag_name",importTag.getTagName()));
+ if (existTag == null) {
+ ChannelOPCDATagEntity channelOPCDATagEntity = ConvertUtils.sourceToTarget(importTag, ChannelOPCDATagEntity.class);
+ channelOPCDATagEntity.setId(UUID.randomUUID().toString());
+ channelOPCDATagEntity.setEnabled(CommonConstant.IS_ENABLE);
+ channelOPCDATagEntity.setServerId(serverId);
+ channelOPCDATagEntity.setCreateTime(new Date());
+ channelOPCDATagDao.insert(channelOPCDATagEntity);
+
+ respVO.getCreateTagNames().add(channelOPCDATagEntity.getTagName());
+ return;
+ }
+
+ // 如果存在，判断是否允许更新
+ if (!isUpdateSupport) {
+ respVO.getFailureTagNames().put(importTag.getTagName(), TAG_EXISTS.getMsg());
+ return;
+ }
+
+ ChannelOPCDATagEntity updateTag = BeanUtils.toBean(importTag, ChannelOPCDATagEntity.class);
+ updateTag.setId(existTag.getId());
+ baseMapper.updateById(updateTag);
+ respVO.getUpdateTagNames().add(importTag.getTagName());
+ });
+ return respVO;
+ }
+
}
--
Gitblit v1.9.3