From 60fa13f76afe72a6f48416de2904d58164859382 Mon Sep 17 00:00:00 2001 From: houzhongjian <houzhongyi@126.com> Date: 星期五, 17 一月 2025 13:51:55 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/service/DaPointService.java | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/service/DaPointService.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/service/DaPointService.java index d2bb00c..f2d0dec 100644 --- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/service/DaPointService.java +++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/service/DaPointService.java @@ -1,9 +1,12 @@ package com.iailab.module.data.point.service; import com.iailab.framework.common.pojo.PageResult; +import com.iailab.module.data.api.point.dto.ApiPointDTO; import com.iailab.module.data.point.dto.DaPointDTO; import com.iailab.module.data.point.vo.*; +import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -17,7 +20,7 @@ DaPointDTO info(String id); - DaPointDTO getSimpleInfoById(String id); + ApiPointDTO getSimpleInfoById(String id); DaPointDTO getSimpleInfoByNo(String no); @@ -45,6 +48,10 @@ List<DaPointDTO> getCumulatePoint(String freq); + List<DaPointDTO> getCumulatePoint(List<String> pointNos); + + List<DaPointDTO> getCumulatePoint(DaPointPageReqVO reqVO); + DaPointDTO getByNo(String pointNo); List<DaPointDTO> getByNos(List<String> pointNos); -- Gitblit v1.9.3