From aa0382e44311f9f7e62a688c8fcaa9c69a512e0f Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期二, 24 十二月 2024 15:15:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/plan/PlanItemApiImpl.java | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 51 insertions(+), 1 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/plan/PlanItemApiImpl.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/plan/PlanItemApiImpl.java
index e679c6b..be43446 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/plan/PlanItemApiImpl.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/plan/PlanItemApiImpl.java
@@ -1,15 +1,26 @@
package com.iailab.module.data.api.plan;
import com.iailab.framework.common.util.object.ConvertUtils;
+import com.iailab.module.data.api.plan.dto.ApiPlanDataDTO;
+import com.iailab.module.data.api.plan.dto.ApiPlanItemDTO;
+import com.iailab.module.data.api.point.dto.ApiPointDTO;
import com.iailab.module.data.common.ApiDataQueryDTO;
import com.iailab.module.data.common.ApiDataValueDTO;
import com.iailab.module.data.plan.item.collection.PlanItemCollector;
+import com.iailab.module.data.plan.item.entity.PlanItemEntity;
+import com.iailab.module.data.plan.item.service.PlanItemService;
+import com.iailab.module.data.plan.item.vo.PlanItemDataVO;
import com.iailab.module.data.plan.item.vo.PlanItemValueVO;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RestController;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
import java.util.List;
+import java.util.Set;
/**
* @author PanZhibao
@@ -18,13 +29,52 @@
*/
@RestController // 提供 RESTful API 接口，给 Feign 调用
@Validated
-public class PlanItemApiImpl implements PlanItemApi{
+public class PlanItemApiImpl implements PlanItemApi {
@Autowired
private PlanItemCollector planItemCollector;
+ @Autowired
+ private PlanItemService planItemService;
+
+ @Override
public List<ApiDataValueDTO> queryPlanItemHistoryValue(ApiDataQueryDTO dto) {
List<PlanItemValueVO> list = planItemCollector.queryValue(dto.getItemNo(), dto.getStart(), dto.getEnd());
return ConvertUtils.sourceToTarget(list, ApiDataValueDTO.class);
}
+
+ @Override
+ public LinkedHashMap<String, List<ApiPlanDataDTO>> queryPlanItemRecordValue(ApiDataQueryDTO dto) {
+ LinkedHashMap<String, List<ApiPlanDataDTO>> result = new LinkedHashMap<>();
+ if (CollectionUtils.isEmpty(dto.getItemNos())) {
+ return result;
+ }
+ dto.getItemNos().forEach(item -> {
+ List<PlanItemDataVO> list = planItemCollector.getSourceValue(item, dto.getStart(), dto.getEnd());
+ result.put(item, ConvertUtils.sourceToTarget(list, ApiPlanDataDTO.class));
+ });
+ return result;
+ }
+
+ @Override
+ public ApiPlanItemDTO getInfoByNo(String itemNo){
+ PlanItemEntity entity = planItemService.getInfoByNo(itemNo);
+ return ConvertUtils.sourceToTarget(entity, ApiPlanItemDTO.class);
+ }
+
+ @Override
+ public ApiPlanItemDTO getInfoById(String itemNo){
+ PlanItemEntity entity = planItemService.get(itemNo);
+ return ConvertUtils.sourceToTarget(entity, ApiPlanItemDTO.class);
+ }
+
+ @Override
+ public List<ApiPlanItemDTO> getInfoByIds(Set<String> planIds) {
+ if (CollectionUtils.isEmpty(planIds)) {
+ return new ArrayList<>();
+ }
+ List<PlanItemEntity> plans = planItemService.getInfoByIds(planIds);
+ return ConvertUtils.sourceToTarget(plans,ApiPlanItemDTO.class);
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.3