From 1f7276770b69e5c8b3c10d70a57b7de18003f5a0 Mon Sep 17 00:00:00 2001
From: houzhongjian <houzhongyi@126.com>
Date: 星期三, 06 十一月 2024 14:17: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/dao/DaPointDao.java | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/dao/DaPointDao.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/dao/DaPointDao.java
index fc14b78..e122d5a 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/dao/DaPointDao.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/dao/DaPointDao.java
@@ -27,6 +27,8 @@
IPage<DaPointDTO> getPageList(IPage<DaPointEntity> page, @Param("params") DaPointPageReqVO reqVO);
+ List<DaPointDTO> getList(DaPointPageReqVO reqVO);
+
List<DaPointDTO> getConstantPoint(Map<String, Object> params);
List<DaPointDTO> getMeasurePoint(Map<String, Object> params);
@@ -35,13 +37,9 @@
default IPage<DaPointDTO> selectPageList(DaPointPageReqVO reqVO) {
return getPageList(getPage(reqVO), reqVO);
- };
-
- default PageResult<DaPointEntity> selectExcelList(DaPointPageReqVO reqVO) {
- return selectPage(reqVO,new QueryWrapper<>());
}
- default DaPointEntity selectByPointName(String pointName){
+ default DaPointEntity selectByPointName(String pointName) {
return selectOne("point_name", pointName);
- };
+ }
}
--
Gitblit v1.9.3