liwenlong/fys-Multi-tenant
1
0
Fork 0
forked from dyf/fys-Multi-tenant
Code Pull Requests Activity

新增设备分组

Browse Source
This commit is contained in:
daiyongfei
2025-08-13 19:29:04 +08:00
parent 72cab138a7
commit 1af4b165f2
11 changed files with 305 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/bo/DeviceGroupBo.java
View File

@ -1,5 +1,7 @@
package com.fuyuanshen.equipment.domain.bo;
import com.fuyuanshen.common.core.validate.AddGroup;
import com.fuyuanshen.common.core.validate.EditGroup;
import com.fuyuanshen.equipment.domain.DeviceGroup;
import com.fuyuanshen.common.mybatis.core.domain.BaseEntity;
import io.github.linpeilie.annotations.AutoMapper;
@ -21,7 +23,7 @@ public class DeviceGroupBo extends BaseEntity {
/**
* 主键ID
*/
@NotNull(message = "主键ID不能为空", groups = { EditGroup.class })
// @NotNull(message = "主键ID不能为空", groups = { EditGroup.class })
private Long id;
/**
@ -33,7 +35,7 @@ public class DeviceGroupBo extends BaseEntity {
/**
* 状态：0-禁用，1-正常
*/
@NotNull(message = "状态：0-禁用，1-正常不能为空", groups = { AddGroup.class, EditGroup.class })
// @NotNull(message = "状态：0-禁用，1-正常不能为空", groups = { AddGroup.class, EditGroup.class })
private Long status;
/**
@ -49,7 +51,7 @@ public class DeviceGroupBo extends BaseEntity {
/**
* 删除标记：0-未删除，1-已删除
*/
@NotNull(message = "删除标记：0-未删除，1-已删除不能为空", groups = { AddGroup.class, EditGroup.class })
// @NotNull(message = "删除标记：0-未删除，1-已删除不能为空", groups = { AddGroup.class, EditGroup.class })
private Long isDeleted;

2
fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/bo/DeviceRepairRecordsBo.java
View File

@ -1,5 +1,7 @@
package com.fuyuanshen.equipment.domain.bo;
import com.fuyuanshen.common.core.validate.AddGroup;
import com.fuyuanshen.common.core.validate.EditGroup;
import com.fuyuanshen.equipment.domain.DeviceRepairRecords;
import com.fuyuanshen.common.mybatis.core.domain.BaseEntity;
import io.github.linpeilie.annotations.AutoMapper;

6
fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DeviceGroupVo.java
View File

@ -11,7 +11,7 @@ import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
/**
@ -64,5 +64,9 @@ public class DeviceGroupVo implements Serializable {
@ExcelProperty(value = "删除标记：0-未删除，1-已删除")
private Long isDeleted;
/**
* 嵌套子分组
*/
private List<DeviceGroupVo> children;
}