bingyi/ruoyi-vue-pro
1
0
Fork 0
mirror of https://gitee.com/zhijiantianya/ruoyi-vue-pro.git synced 2026-06-06 02:38:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master-jdk17' into master-jdk17

Browse Source
This commit is contained in:
YunaiV
2026-05-23 10:34:42 +08:00
parent d1242003b1 a08526d855
commit 3b97b1b0a4
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/schema/views/data.ts.vm
View File

@ -123,6 +123,7 @@ export function useFormSchema(): VbenFormSchema[] {
#elseif($column.htmlType == "inputNumber")## 数字输入框
component: 'InputNumber',
componentProps: {
class: '!w-full',
min: 0,
placeholder: '请输入${comment}',
},
@ -339,6 +340,7 @@ export function use${subSimpleClassName}FormSchema(): VbenFormSchema[] {
#elseif($column.htmlType == "inputNumber")## 数字输入框
component: 'InputNumber',
componentProps: {
class: '!w-full',
min: 0,
placeholder: '请输入${comment}',
},
@ -572,6 +574,7 @@ export function use${subSimpleClassName}GridColumns(): VxeTableGridOptions<${api
#elseif($column.htmlType == "inputNumber")## 数字输入框
component: 'InputNumber',
componentProps: {
class: '!w-full',
min: 0,
placeholder: '请输入${comment}',
},
@ -613,4 +616,4 @@ export function use${subSimpleClassName}GridColumns(): VxeTableGridOptions<${api
}
#end
#end
#end
#end

2
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/alert/vo/recrod/IotAlertRecordPageReqVO.java
View File

@ -17,7 +17,7 @@ public class IotAlertRecordPageReqVO extends PageParam {
private Long configId;
@Schema(description = "告警级别", example = "1")
private Integer level;
private Integer configLevel;
@Schema(description = "产品编号", example = "2050")
private Long productId;

2
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/alert/IotAlertRecordMapper.java
View File

@ -22,7 +22,7 @@ public interface IotAlertRecordMapper extends BaseMapperX<IotAlertRecordDO> {
default PageResult<IotAlertRecordDO> selectPage(IotAlertRecordPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<IotAlertRecordDO>()
.eqIfPresent(IotAlertRecordDO::getConfigId, reqVO.getConfigId())
.eqIfPresent(IotAlertRecordDO::getConfigLevel, reqVO.getLevel())
.eqIfPresent(IotAlertRecordDO::getConfigLevel, reqVO.getConfigLevel())
.eqIfPresent(IotAlertRecordDO::getProductId, reqVO.getProductId())
.eqIfPresent(IotAlertRecordDO::getDeviceId, reqVO.getDeviceId())
.eqIfPresent(IotAlertRecordDO::getProcessStatus, reqVO.getProcessStatus())