From 48c064d5395ac6a56ba381913219e90f0e4bac8d Mon Sep 17 00:00:00 2001
From: liriming <1343021927@qq.com>
Date: 星期二, 14 一月 2025 14:23:12 +0800
Subject: [PATCH] 根据计算点编号查询测点集合

---
 iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/dao/DaPointDao.java |   24 ++++++++++++++++--------
 1 files changed, 16 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..60d66ba 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,16 +1,17 @@
 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.api.point.dto.ApiPointDTO;
 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.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -23,7 +24,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 +34,15 @@
 
     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);
+    }
+
+    IPage<ApiPointDTO> getPointPage(IPage<DaPointEntity> page, @Param("paramsMap") HashMap map);
+
+    default DaPointEntity selectByPointName(String pointName) {
+        return selectOne("point_name", pointName);
     }
 }

--
Gitblit v1.9.3