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 | 19 +++++++++++++------
1 files changed, 13 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 d977988..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
@@ -1,5 +1,6 @@
package com.iailab.module.data.point.dao;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.iailab.framework.common.pojo.PageResult;
import com.iailab.framework.mybatis.core.mapper.BaseMapperX;
@@ -11,6 +12,7 @@
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
+import java.util.Collection;
import java.util.List;
import java.util.Map;
@@ -23,7 +25,9 @@
@Mapper
public interface DaPointDao extends BaseMapperX<DaPointEntity> {
- IPage<DaPointDTO> getPageList(IPage<DaPointEntity> page, @Param("params") Map<String, Object> params);
+ IPage<DaPointDTO> getPageList(IPage<DaPointEntity> page, @Param("params") DaPointPageReqVO reqVO);
+
+ List<DaPointDTO> getList(DaPointPageReqVO reqVO);
List<DaPointDTO> getConstantPoint(Map<String, Object> params);
@@ -31,10 +35,13 @@
List<DaPointDTO> getMathPoint(Map<String, Object> params);
- default PageResult<DaPointEntity> selectPage(DaPointPageReqVO reqVO) {
- return selectPage(reqVO, new LambdaQueryWrapperX<DaPointEntity>()
- .likeIfPresent(DaPointEntity::getPointNo, reqVO.getPointNo())
- .likeIfPresent(DaPointEntity::getPointName, reqVO.getPointName())
- .orderByDesc(DaPointEntity::getCreateTime));
+ List<DaPointDTO> getCumulatePoint(Map<String, Object> params);
+
+ default IPage<DaPointDTO> selectPageList(DaPointPageReqVO reqVO) {
+ return getPageList(getPage(reqVO), reqVO);
+ }
+
+ default DaPointEntity selectByPointName(String pointName) {
+ return selectOne("point_name", pointName);
}
}
--
Gitblit v1.9.3