From 76743b009ca5ea67557fcab597b332f8d1947813 Mon Sep 17 00:00:00 2001 From: dengzedong <dengzedong@email> Date: 星期二, 24 十二月 2024 14:09:04 +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 | 12 ++++++------ 1 files changed, 6 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..89299ae 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,21 +27,21 @@ 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); List<DaPointDTO> getMathPoint(Map<String, Object> params); + List<DaPointDTO> getCumulatePoint(Map<String, Object> params); + 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