diff --git a/src/main/java/cn/workde/module/drone/coding/dto/AttributeValueDto.java b/src/main/java/cn/workde/module/drone/coding/dto/AttributeValueDto.java new file mode 100644 index 0000000..4616455 --- /dev/null +++ b/src/main/java/cn/workde/module/drone/coding/dto/AttributeValueDto.java @@ -0,0 +1,44 @@ +package cn.workde.module.drone.coding.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.util.List; + +@Data +public class AttributeValueDto { + + @Schema(description = "属性分类集合") + private List attributeClassificationList; + + @Data + static class AttributeClassificationDTO { + @Schema(description = "属性分类Id") + private String attributeClassificationId; + @Schema(description = "属性分类名称") + private String attributeClassificationName; + @Schema(description = "属性集合") + private List attributeList; + } + + @Data + static class AttributeDTO { + @Schema(description = "MFC ID") + private String mfcId; + @Schema(description = "批次ID") + private String batchesId; + @Schema(description = "属性Id") + private String attributeId; + @Schema(description = "属性名称") + private String attributeName; + @Schema(description = "属性描述") + private String attributeDescription; + @Schema(description = "属性备注") + private String attributeRemarks; + @Schema(description = "是否锁定") + private Boolean locked; + @Schema(description = "属性数值") + private String attributeValue; + } + +} diff --git a/src/main/java/cn/workde/module/drone/coding/entity/Attribute.java b/src/main/java/cn/workde/module/drone/coding/entity/Attribute.java index d021880..d2b99dd 100644 --- a/src/main/java/cn/workde/module/drone/coding/entity/Attribute.java +++ b/src/main/java/cn/workde/module/drone/coding/entity/Attribute.java @@ -34,5 +34,8 @@ public class Attribute extends BaseEntity { @Schema(description = "属性备注") private String attributeRemarks; + @Schema(description = "是否锁定") + private Boolean locked; + } diff --git a/src/main/java/cn/workde/module/drone/coding/entity/AttributeValueBackup.java b/src/main/java/cn/workde/module/drone/coding/entity/AttributeValueBackup.java new file mode 100644 index 0000000..6c0ea1d --- /dev/null +++ b/src/main/java/cn/workde/module/drone/coding/entity/AttributeValueBackup.java @@ -0,0 +1,33 @@ +package cn.workde.module.drone.coding.entity; + +import cn.workde.core.base.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 无人机属性数值备份(AttributeValueBackup)表实体类 + * + * @author makejava + * @since 2024-09-06 10:49:54 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@TableName(value = "dss_drone_coding_attribute_value_backup") +public class AttributeValueBackup extends BaseEntity { + + @Schema(description = "批次ID") + private String batchesId; + + @Schema(description = "属性分类ID") + private String attributeClassificationId; + + @Schema(description = "属性ID") + private String attributeId; + + @Schema(description = "属性数值") + private String attributeValue; + +} + diff --git a/src/main/java/cn/workde/module/drone/coding/vo/AttributeVo.java b/src/main/java/cn/workde/module/drone/coding/vo/AttributeVo.java index a669bb6..ac9d7d0 100644 --- a/src/main/java/cn/workde/module/drone/coding/vo/AttributeVo.java +++ b/src/main/java/cn/workde/module/drone/coding/vo/AttributeVo.java @@ -2,6 +2,7 @@ package cn.workde.module.drone.coding.vo; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.Data; @Data @@ -21,4 +22,8 @@ public class AttributeVo { @Schema(description = "属性备注") // @NotBlank(message = "属性备注不能为空") private String attributeRemarks; + + @Schema(description = "是否锁定") + @NotNull(message = "请选择是否锁定") + private Boolean locked; }