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/dao/DaPointDao.java | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 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..2c71f09 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,12 +1,11 @@
package com.iailab.module.data.point.dao;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.iailab.framework.common.pojo.PageResult;
import com.iailab.framework.mybatis.core.mapper.BaseMapperX;
-import com.iailab.framework.mybatis.core.query.LambdaQueryWrapperX;
import com.iailab.framework.tenant.core.db.dynamic.TenantDS;
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 org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -23,7 +22,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 +32,21 @@
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);
+
+ List<DaPointDTO> getExtremalPoint(Map<String, Object> params);
+
+ Long getPointCount(DaPointCountReqVO reqVO);
+
+ default IPage<DaPointDTO> selectPageList(DaPointPageReqVO reqVO) {
+ return getPageList(getPage(reqVO), reqVO);
+ }
+
+ default DaPointEntity selectByPointName(String pointName) {
+ return selectOne("point_name", pointName);
+ }
+
+ default DaPointEntity selectByPointNo(String pointNo) {
+ return selectOne("point_no", pointNo);
}
}
--
Gitblit v1.9.3