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 | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 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 4fcf398..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 @@ -3,6 +3,7 @@ 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; @@ -16,8 +17,10 @@ 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 @@ -59,4 +62,19 @@ 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