From 280ca0c6a4a1e73ab4516d4850dedb5a43541594 Mon Sep 17 00:00:00 2001
From: Jay <csj123456>
Date: 星期一, 20 一月 2025 15:25:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/ind/IndItemApiImpl.java | 35 +++++++++++++++++++++++++++++++++--
1 files changed, 33 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..317e493 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
@@ -5,13 +5,17 @@
import com.iailab.module.data.api.ind.dto.ApiIndItemQueryDTO;
import com.iailab.module.data.api.ind.dto.ApiIndItemValueDTO;
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 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
@@ -31,17 +35,44 @@
@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().doubleValue());
+ 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().doubleValue());
+ 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);
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3