From b4b4596887770a34f80c31ab849068893094dab5 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期一, 24 二月 2025 10:47:08 +0800
Subject: [PATCH] Merge branch 'master' of http://dlindusit.com:53929/r/iailab-plat
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/dao/DaPointDao.java | 23 +++++++++++++++--------
1 files changed, 15 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..771f23b 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,9 +1,7 @@
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;
@@ -23,7 +21,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 +31,17 @@
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);
+ }
+
+ default DaPointEntity selectByPointNo(String pointNo) {
+ return selectOne("point_no", pointNo);
}
}
--
Gitblit v1.9.3