From dbf33d1b5a562088e6b16c7c346cbe9432676460 Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期二, 29 四月 2025 19:27:23 +0800
Subject: [PATCH] 时序数据存档插入code、createTime
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/ind/IndItemApiImpl.java | 51 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 49 insertions(+), 2 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/ind/IndItemApiImpl.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/ind/IndItemApiImpl.java
index 93f346f..cf5cefd 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/ind/IndItemApiImpl.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/ind/IndItemApiImpl.java
@@ -1,17 +1,25 @@
package com.iailab.module.data.api.ind;
+import com.iailab.framework.common.pojo.PageResult;
import com.iailab.framework.common.util.object.ConvertUtils;
import com.iailab.module.data.api.ind.dto.ApiIndItemDTO;
import com.iailab.module.data.api.ind.dto.ApiIndItemQueryDTO;
import com.iailab.module.data.api.ind.dto.ApiIndItemValueDTO;
+import com.iailab.module.data.api.ind.dto.ApiIndItemValuePageReqVO;
import com.iailab.module.data.ind.collection.IndItemCollector;
+import com.iailab.module.data.ind.item.entity.IndItemEntity;
import com.iailab.module.data.ind.item.service.IndItemService;
import com.iailab.module.data.ind.item.vo.IndItemValueVO;
+import com.iailab.module.data.ind.value.service.IndItemValueService;
+import com.iailab.module.data.ind.value.vo.IndItemValuePageReqVO;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RestController;
+import java.util.ArrayList;
import java.util.List;
+import java.util.Set;
/**
* @author PanZhibao
@@ -28,20 +36,59 @@
@Autowired
private IndItemService indItemService;
+ @Autowired
+ private IndItemValueService indItemValueService;
+
+
@Override
public List<ApiIndItemValueDTO> queryIndItemDefaultValue(String itemNo){
List<IndItemValueVO> list = indItemCollector.queryValue(itemNo);
- return ConvertUtils.sourceToTarget(list, ApiIndItemValueDTO.class);
+ List<ApiIndItemValueDTO> result = new ArrayList<>(list.size());
+ list.forEach(item -> {
+ if (item != null) {
+ ApiIndItemValueDTO indItemValueDTO = new ApiIndItemValueDTO();
+ indItemValueDTO.setDataTime(item.getDataTime());
+ indItemValueDTO.setDataValue(item.getDataValue());
+ result.add(indItemValueDTO);
+ }
+ });
+ return result;
}
@Override
public List<ApiIndItemValueDTO> queryIndItemHistoryValue(ApiIndItemQueryDTO dto) {
List<IndItemValueVO> list = indItemCollector.queryValue(dto.getItemNo(), dto.getStart(), dto.getEnd());
- return ConvertUtils.sourceToTarget(list, ApiIndItemValueDTO.class);
+ List<ApiIndItemValueDTO> result = new ArrayList<>(list.size());
+ list.forEach(item -> {
+ if (item != null) {
+ ApiIndItemValueDTO indItemValueDTO = new ApiIndItemValueDTO();
+ indItemValueDTO.setDataTime(item.getDataTime());
+ indItemValueDTO.setDataValue(item.getDataValue());
+ result.add(indItemValueDTO);
+ }
+ });
+ return result;
}
@Override
public ApiIndItemDTO getInfoById(String id) {
return ConvertUtils.sourceToTarget(indItemService.get(id), ApiIndItemDTO.class);
}
+
+ @Override
+ public List<ApiIndItemDTO> getInfoByIds(Set<String> indIds) {
+ if (CollectionUtils.isEmpty(indIds)) {
+ return new ArrayList<>();
+ }
+ List<IndItemEntity> inds = indItemService.getInfoByIds(indIds);
+ return ConvertUtils.sourceToTarget(inds,ApiIndItemDTO.class);
+ }
+
+ @Override
+ public PageResult<ApiIndItemValueDTO> queryIndItemValuePage(ApiIndItemValuePageReqVO dto) {
+ IndItemValuePageReqVO reqVO = ConvertUtils.sourceToTarget(dto, IndItemValuePageReqVO.class);
+ List<IndItemValueVO> result = indItemValueService.getValueList(reqVO);
+ List<ApiIndItemValueDTO> list = ConvertUtils.sourceToTarget(result, ApiIndItemValueDTO.class);
+ return new PageResult<>(list, (long) list.size());
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3