From 423b6ee5d477e4ec5bd45e25f2bbef8186c86600 Mon Sep 17 00:00:00 2001 From: cuizhibin Date: Fri, 11 Apr 2025 15:49:17 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=9C=BA=E7=BB=84=E3=80=81=E9=83=A8=E4=BB=B6?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dite/znpt/domain/entity/DefectEntity.java | 2 +- .../znpt/domain/entity/FileInfoEntity.java | 4 ++++ .../znpt/domain/entity/PersonnelEntity.java | 4 ++++ .../znpt/domain/entity/ProjectEntity.java | 9 ++++----- .../znpt/domain/entity/TCompanyEntity.java | 8 ++++++++ .../znpt/domain/entity/TurbineEntity.java | 20 +++++++++++++++++-- 6 files changed, 39 insertions(+), 8 deletions(-) diff --git a/demo/src/main/java/com/dite/znpt/domain/entity/DefectEntity.java b/demo/src/main/java/com/dite/znpt/domain/entity/DefectEntity.java index f3ad703..f9c4448 100644 --- a/demo/src/main/java/com/dite/znpt/domain/entity/DefectEntity.java +++ b/demo/src/main/java/com/dite/znpt/domain/entity/DefectEntity.java @@ -55,7 +55,7 @@ public class DefectEntity extends AuditableEntity implements Serializable { @TableField("chord_length") private BigDecimal chordLength; - @ApiModelProperty("处理建议") + @ApiModelProperty("图片路径") @TableField("image_path") private String imagePath; diff --git a/demo/src/main/java/com/dite/znpt/domain/entity/FileInfoEntity.java b/demo/src/main/java/com/dite/znpt/domain/entity/FileInfoEntity.java index de8f9c5..10870dd 100644 --- a/demo/src/main/java/com/dite/znpt/domain/entity/FileInfoEntity.java +++ b/demo/src/main/java/com/dite/znpt/domain/entity/FileInfoEntity.java @@ -33,5 +33,9 @@ public class FileInfoEntity extends AuditableEntity implements Serializable { @ApiModelProperty("minio相对路径") @TableField("minio_path") private String minioPath; + + @ApiModelProperty("业务类型，字典file_business_type") + @TableField("business_type") + private String businessType; } diff --git a/demo/src/main/java/com/dite/znpt/domain/entity/PersonnelEntity.java b/demo/src/main/java/com/dite/znpt/domain/entity/PersonnelEntity.java index d1da33f..3559dc8 100644 --- a/demo/src/main/java/com/dite/znpt/domain/entity/PersonnelEntity.java +++ b/demo/src/main/java/com/dite/znpt/domain/entity/PersonnelEntity.java @@ -41,5 +41,9 @@ public class PersonnelEntity extends AuditableEntity implements Serializable { @ApiModelProperty("密码") @TableField("password") private String password; + + @ApiModelProperty("1正常0禁用") + @TableField("status") + private Integer status; } diff --git a/demo/src/main/java/com/dite/znpt/domain/entity/ProjectEntity.java b/demo/src/main/java/com/dite/znpt/domain/entity/ProjectEntity.java index 2821ca2..c529bf3 100644 --- a/demo/src/main/java/com/dite/znpt/domain/entity/ProjectEntity.java +++ b/demo/src/main/java/com/dite/znpt/domain/entity/ProjectEntity.java @@ -38,10 +38,6 @@ public class ProjectEntity extends AuditableEntity implements Serializable { @TableField("farm_address") private String farmAddress; - @ApiModelProperty("委托单位") - @TableField("client_id") - private String clientId; - @ApiModelProperty("检查方式，字典method_id") @TableField("method_id") private String methodId; @@ -53,6 +49,9 @@ public class ProjectEntity extends AuditableEntity implements Serializable { @ApiModelProperty("风机型号") @TableField("turbine_model") private String turbineModel; + + @ApiModelProperty("项目状态，字典project_status") + @TableField("status") + private String status; } - diff --git a/demo/src/main/java/com/dite/znpt/domain/entity/TCompanyEntity.java b/demo/src/main/java/com/dite/znpt/domain/entity/TCompanyEntity.java index 26c82fd..9cdcada 100644 --- a/demo/src/main/java/com/dite/znpt/domain/entity/TCompanyEntity.java +++ b/demo/src/main/java/com/dite/znpt/domain/entity/TCompanyEntity.java @@ -33,5 +33,13 @@ public class TCompanyEntity extends AuditableEntity implements Serializable { @ApiModelProperty("公司地址") @TableField("address") private String address; + + @ApiModelProperty("联系人") + @TableField("contact") + private String contact; + + @ApiModelProperty("电话") + @TableField("phone") + private String phone; } diff --git a/demo/src/main/java/com/dite/znpt/domain/entity/TurbineEntity.java b/demo/src/main/java/com/dite/znpt/domain/entity/TurbineEntity.java index 94efacf..c97cf0b 100644 --- a/demo/src/main/java/com/dite/znpt/domain/entity/TurbineEntity.java +++ b/demo/src/main/java/com/dite/znpt/domain/entity/TurbineEntity.java @@ -23,11 +23,27 @@ public class TurbineEntity extends AuditableEntity implements Serializable { private static final long serialVersionUID = -38088185643803512L; @ApiModelProperty("机组号") - @TableId(value = "turbine_code", type = IdType.ASSIGN_ID) - private String turbineCode; + @TableId(value = "turbine_id", type = IdType.ASSIGN_ID) + private String turbineId; @ApiModelProperty("项目id") @TableField("project_id") private String projectId; + + @ApiModelProperty("机组名称") + @TableField("turbine_name") + private String turbineName; + + @ApiModelProperty("机组描述") + @TableField("turbine_desc") + private String turbineDesc; + + @ApiModelProperty("机组厂商") + @TableField("manufacturer") + private String manufacturer; + + @ApiModelProperty("机组型号") + @TableField("model") + private String model; }