mirror of
https://github.com/YunaiV/ruoyi-vue-pro.git
synced 2026-04-19 13:28:38 +00:00
feat:【iot】新增数据目的类型字段及其查询条件
This commit is contained in:
@@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.iot.controller.admin.rule.vo.data.sink;
|
|||||||
import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
|
import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
|
||||||
import cn.iocoder.yudao.framework.common.pojo.PageParam;
|
import cn.iocoder.yudao.framework.common.pojo.PageParam;
|
||||||
import cn.iocoder.yudao.framework.common.validation.InEnum;
|
import cn.iocoder.yudao.framework.common.validation.InEnum;
|
||||||
|
import cn.iocoder.yudao.module.iot.enums.rule.IotDataSinkTypeEnum;
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import org.springframework.format.annotation.DateTimeFormat;
|
import org.springframework.format.annotation.DateTimeFormat;
|
||||||
@@ -22,6 +23,10 @@ public class IotDataSinkPageReqVO extends PageParam {
|
|||||||
@InEnum(CommonStatusEnum.class)
|
@InEnum(CommonStatusEnum.class)
|
||||||
private Integer status;
|
private Integer status;
|
||||||
|
|
||||||
|
@Schema(description = "数据目的类型", example = "1")
|
||||||
|
@InEnum(IotDataSinkTypeEnum.class)
|
||||||
|
private Integer type;
|
||||||
|
|
||||||
@Schema(description = "创建时间")
|
@Schema(description = "创建时间")
|
||||||
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
|
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
|
||||||
private LocalDateTime[] createTime;
|
private LocalDateTime[] createTime;
|
||||||
|
|||||||
@@ -21,6 +21,7 @@ public interface IotDataSinkMapper extends BaseMapperX<IotDataSinkDO> {
|
|||||||
return selectPage(reqVO, new LambdaQueryWrapperX<IotDataSinkDO>()
|
return selectPage(reqVO, new LambdaQueryWrapperX<IotDataSinkDO>()
|
||||||
.likeIfPresent(IotDataSinkDO::getName, reqVO.getName())
|
.likeIfPresent(IotDataSinkDO::getName, reqVO.getName())
|
||||||
.eqIfPresent(IotDataSinkDO::getStatus, reqVO.getStatus())
|
.eqIfPresent(IotDataSinkDO::getStatus, reqVO.getStatus())
|
||||||
|
.eqIfPresent(IotDataSinkDO::getType, reqVO.getType())
|
||||||
.betweenIfPresent(IotDataSinkDO::getCreateTime, reqVO.getCreateTime())
|
.betweenIfPresent(IotDataSinkDO::getCreateTime, reqVO.getCreateTime())
|
||||||
.orderByDesc(IotDataSinkDO::getId));
|
.orderByDesc(IotDataSinkDO::getId));
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user