From 0cbbe2c1cbfbf73e02e1796d921c2911c96d370b Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期一, 23 十二月 2024 11:46:31 +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 | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 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 c0678b2..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,28 +1,47 @@
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.dao.BaseDao;
+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.DaPointPageReqVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
+import java.util.Collection;
import java.util.List;
import java.util.Map;
/**
- * @author PanZhibao
+ * @author lirm
* @Description
- * @createTime 2022年07月12日 13:47:00
+ * @createTime 2024年09月2日
*/
+@TenantDS
@Mapper
-public interface DaPointDao extends BaseDao<DaPointEntity> {
+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);
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 DaPointEntity selectByPointName(String pointName) {
+ return selectOne("point_name", pointName);
+ }
}
--
Gitblit v1.9.3