缺陷的实体信息修改

core/src/main/java/com/dite/znpt/domain/entity/DefectEntity.java

@@ -2,6 +2,7 @@ package com.dite.znpt.domain.entity;
 
 import java.math.BigDecimal;
 import java.io.Serializable;
+import java.time.LocalDateTime;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.dite.znpt.domain.AuditableEntity;
@@ -29,16 +30,26 @@ public class DefectEntity extends AuditableEntity implements Serializable {
     @TableId(value = "defect_id", type = IdType.ASSIGN_UUID)
     private String defectId;
 
-    @ExcelProperty("机组id")
-    @ApiModelProperty("机组id")
-    @TableField("turbine_code")
-    private String turbineId;
-
     @ExcelProperty("部件id")
     @ApiModelProperty("部件id")
     @TableField("part_id")
     private String partId;
 
+    @ExcelProperty("缺陷编码")
+    @ApiModelProperty("缺陷编码")
+    @TableField("defect_code")
+    private String defectCode;
+
+    @ExcelProperty("缺陷名称")
+    @ApiModelProperty("缺陷名称")
+    @TableField("defect_name")
+    private String defectName;
+
+    @ExcelProperty("缺陷部位")
+    @ApiModelProperty("缺陷部位")
+    @TableField("defect_position")
+    private String defectPosition;
+
     @ExcelProperty("缺陷类型，枚举DefectTypeEnum")
     @ApiModelProperty("缺陷类型，枚举DefectTypeEnum")
     @TableField("defect_type")
@@ -49,11 +60,35 @@ public class DefectEntity extends AuditableEntity implements Serializable {
     @TableField("defect_level")
     private String defectLevel;
 
+    @ExcelProperty("维修状态，枚举RepairStatusEnum")
+    @ApiModelProperty("维修状态，枚举RepairStatusEnum")
+    @TableField("repair_status")
+    private String repairStatus;
 
-    @ExcelProperty("图片路径")
+    @ExcelProperty("检测时间")
-    @ApiModelProperty("图片路径")
+    @ApiModelProperty("检测时间")
-    @TableField("defect_image_path")
+    @TableField("detection_time")
-    private String defectImagePath;
+    private LocalDateTime detectionTime;
+
+    @ExcelProperty("来源")
+    @ApiModelProperty("来源")
+    @TableField("source")
+    private String source;
+
+    @ExcelProperty("弦向")
+    @ApiModelProperty("弦向")
+    @TableField("chordwise")
+    private Integer chordwise;
+
+    @ExcelProperty("轴向")
+    @ApiModelProperty("轴向")
+    @TableField("axial")
+    private Integer axial;
+
+    @ExcelProperty("标注信息")
+    @ApiModelProperty("标注信息")
+    @TableField("label_info")
+    private String labelInfo;
 
     @ExcelProperty("说明")
     @ApiModelProperty("说明")

core/src/main/java/com/dite/znpt/enums/DefectLevel.java

@@ -1,9 +0,0 @@
-package com.dite.znpt.enums;
-
-/**
- * @Author: gaoxiong
- * @Date: 2025/4/24 21:44
- * @Description:
- */
-public enum DefectLevel {
-}

core/src/main/java/com/dite/znpt/enums/DefectLevelEnum.java

@@ -0,0 +1,50 @@
+package com.dite.znpt.enums;
+
+import cn.hutool.json.JSONObject;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author: gaoxiong
+ * @Date: 2025/4/24 21:44
+ * @Description:
+ */
+public enum DefectLevelEnum {
+    SLIGHT("SLIGHT", "轻微缺陷"),
+    GENERAL("GENERAL", "一般缺陷"),
+    SERIOUS("SERIOUS", "比较严重"),
+    CRITICAL("CRITICAL", "非常严重");
+
+    private final String code;
+    private final String desc;
+
+    DefectLevelEnum(String code, String desc){
+        this.code = code;
+        this.desc = desc;
+    }
+
+    public static DefectLevelEnum getByCode(String code){
+        for (DefectLevelEnum e : DefectLevelEnum.values() ) {
+            if(e.code.equals(code)){
+                return e;
+            }
+        }
+        return null;
+    }
+
+    public static String getDescByCode(String code){
+        DefectLevelEnum e = getByCode(code);
+        return null == e ? null : e.desc;
+    }
+
+    public static List<JSONObject> listAll(){
+        List<JSONObject> list = new ArrayList<>(DefectLevelEnum.values().length);
+        for (DefectLevelEnum e : DefectLevelEnum.values() ) {
+            JSONObject jsonObject = new JSONObject();
+            jsonObject.set(e.code, e.desc);
+            list.add(jsonObject);
+        }
+        return list;
+    }
+}

core/src/main/java/com/dite/znpt/enums/DefectTypeEnum.java

@@ -1,9 +1,58 @@
 package com.dite.znpt.enums;
 
+import cn.hutool.json.JSONObject;
+
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @Author: gaoxiong
  * @Date: 2025/4/24 21:43
  * @Description:
  */
 public enum DefectTypeEnum {
+    CRAZE("CRAZE", "合缝开裂"),
+    ABRASION("ABRASION", "合缝磨损"),
+    LEATHER_BREAKAGE("LEATHER_BREAKAGE", "蒙皮破损"),
+    FABRIC_BREAKAGE("FABRIC_BREAKAGE", "布层破损"),
+    PART_BREAKAGE(" PART_BREAKAGE", "局部破损"),
+    TOTAL_DAMAGE("TOTAL_DAMAGE", "累计损伤"),
+    LAYER_SHED("LAYER_SHED", "涂层脱落"),
+    PAINT_SHEDDING("PAINT_SHEDDING", "风损掉漆"),
+    SURFACE_CRACK("SURFACE_CRACK", "表面裂纹"),
+    CHORDWISE_CRACK("CHORDWISE_CRACK", "弦向裂纹"),
+    AXIAL_CRACK("AXIAL_CRACK", "轴向裂纹"),
+    WRINKLE("WRINKLE", "褶皱");
+
+    private final String code;
+    private final String desc;
+
+    DefectTypeEnum(String code, String desc){
+        this.code = code;
+        this.desc = desc;
+    }
+
+    public static DefectTypeEnum getByCode(String code){
+        for (DefectTypeEnum e : DefectTypeEnum.values() ) {
+            if(e.code.equals(code)){
+                return e;
+            }
+        }
+        return null;
+    }
+
+    public static String getDescByCode(String code){
+        DefectTypeEnum e = getByCode(code);
+        return null == e ? null : e.desc;
+    }
+
+    public static List<JSONObject> listAll(){
+        List<JSONObject> list = new ArrayList<>(DefectTypeEnum.values().length);
+        for (DefectTypeEnum e : DefectTypeEnum.values() ) {
+            JSONObject jsonObject = new JSONObject();
+            jsonObject.set(e.code, e.desc);
+            list.add(jsonObject);
+        }
+        return list;
+    }
 }

web/src/main/resources/application-dev.yml

@@ -84,7 +84,7 @@ spring:
 
 sip-config:
   name: 信令服务
-  ip: 127.0.0.1
+  ip: 192.168.0.207
   port: 1074
   charset: gb2312
   domain: 3402000000
@@ -100,23 +100,23 @@ zlm-config:
   # 公网ip
   publicHost:
   # 接口ip
-  apiHost: 127.0.0.1
+  apiHost: 192.168.0.207
   # 接口端口
-  apiPort: 30186
+  apiPort: 8080
   # 密钥
-  secretKey: JvVotkdN01y4qZHlrJsdq4gD7n9rK6wV
+  secretKey: 6Q76ivvVOQDsnnfOSKbtVzcYpbgy4n1G
   # 流id前缀
   streamPrefix:
   # rtp ip
-  rtpHost: 127.0.0.1
+  rtpHost: 192.168.0.207
   # rtp 端口
-  rtpPort: 30186
+  rtpPort: 8080
   # 动态端口起始值
   dynamicPortStart: 30150
   # 动态端口结束值
   dynamicPortEnd: 30185
 
 upload:
-    temp-path: D:\Upload\Temp
+    temp-path: F:\Upload\Temp
-    perm-path: D:\Upload\Perm
+    perm-path: F:\Upload\Perm