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/point/service/DaPointService.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 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 de84219..0249769 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,9 @@
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.entity.DaPointEntity;
-import com.iailab.module.data.point.vo.DaPointPageReqVO;
+import com.iailab.module.data.point.vo.*;
import java.util.List;
import java.util.Map;
@@ -18,7 +18,7 @@
DaPointDTO info(String id);
- DaPointDTO getSimpleInfoById(String id);
+ ApiPointDTO getSimpleInfoById(String id);
DaPointDTO getSimpleInfoByNo(String no);
@@ -44,6 +44,12 @@
List<DaPointDTO> getMathPoint(List<String> pointNos);
+ 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);
@@ -54,4 +60,13 @@
void updateDefaultValue(DaPointDTO dto);
+ PointImportRespVO importPointList(List<PointImportExcelVO> importPoints, boolean isUpdateSupport);
+
+ List<DaPointDTO> getList(DaPointPageReqVO exportReqVO);
+
+ List<DaPointDTO> getConstantPoint(DaPointPageReqVO reqVO);
+
+ List<DaPointDTO> getMeasurePoint(DaPointPageReqVO reqVO);
+
+ List<DaPointDTO> getMathPoint(DaPointPageReqVO reqVO);
}
--
Gitblit v1.9.3