From 9a4d5981d798bc93042b247837e0e8209ff298b3 Mon Sep 17 00:00:00 2001 From: 潘志宝 <979469083@qq.com> Date: 星期二, 25 二月 2025 15:05:50 +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/ArcPointDataDao.java | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/dao/ArcPointDataDao.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/dao/ArcPointDataDao.java index 83dc064..4f64d33 100644 --- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/dao/ArcPointDataDao.java +++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/dao/ArcPointDataDao.java @@ -1,11 +1,24 @@ package com.iailab.module.data.point.dao; 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.entity.ArcPointDataEntity; +import com.iailab.module.data.point.entity.ArcPointDataEntity; +import com.iailab.module.data.point.vo.ArcPointDataPageReqVO; import org.apache.ibatis.annotations.Mapper; @TenantDS @Mapper -public interface ArcPointDataDao extends BaseDao<ArcPointDataEntity> { +public interface ArcPointDataDao extends BaseMapperX<ArcPointDataEntity> { + + default PageResult<ArcPointDataEntity> selectPage(ArcPointDataPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX<ArcPointDataEntity>() + .eq(ArcPointDataEntity::getArcId, reqVO.getArcId()) + .ge(reqVO.getStartTime()!=null, ArcPointDataEntity::getCreateTime, reqVO.getStartTime()) + .le(reqVO.getEndTime()!=null, ArcPointDataEntity::getCreateTime, reqVO.getEndTime()) + .orderByDesc(ArcPointDataEntity::getCreateTime)); + } } -- Gitblit v1.9.3