From fc7ebc6bf97d7c4a4a8911c7a5d7cadcbda24719 Mon Sep 17 00:00:00 2001
From: houzhongjian <houzhongyi@126.com>
Date: 星期四, 12 六月 2025 17:41:47 +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 | 28 ++++++++++++++++++++++++++--
1 files changed, 26 insertions(+), 2 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..988eb1c 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.entity.DaPointEntity;
+import com.iailab.module.data.point.vo.DaPointCountReqVO;
import com.iailab.module.data.point.vo.DaPointPageReqVO;
+import com.iailab.module.data.point.vo.PointImportExcelVO;
+import com.iailab.module.data.point.vo.PointImportRespVO;
import java.util.List;
import java.util.Map;
@@ -18,7 +21,7 @@
DaPointDTO info(String id);
- DaPointDTO getSimpleInfoById(String id);
+ ApiPointDTO getSimpleInfoById(String id);
DaPointDTO getSimpleInfoByNo(String no);
@@ -44,6 +47,16 @@
List<DaPointDTO> getMathPoint(List<String> pointNos);
+ List<DaPointDTO> getCumulatePoint(String freq);
+
+ List<DaPointDTO> getCumulatePoint(List<String> pointNos);
+
+ List<DaPointDTO> getCumulatePoint(DaPointPageReqVO reqVO);
+
+ List<DaPointDTO> getExtremalPoint(String freq);
+
+ List<DaPointDTO> getExtremalPoint(List<String> pointNos);
+
DaPointDTO getByNo(String pointNo);
List<DaPointDTO> getByNos(List<String> pointNos);
@@ -54,4 +67,15 @@
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);
+
+ Long getPointCount(DaPointCountReqVO reqVO);
}
--
Gitblit v1.9.3