feat(能源管理系统): 测试问题修复

1.修改基础信息配置--井口配置模块,新增/修改接口,增加井口编号重复校验及必填项校验逻辑;
2.修改基础信息配置--井口配置模块,修改接口,解决部分字段丢失导致数据未更新问题;

BREAKING CHANGE: 无

Closes 无

[skip ci]

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_wellhead/DeleteBaseWellheadInput.java

 package pps.core.base.service.data.base_wellhead;
 
+import lombok.Data;
 import xstartup.annotation.XText;
 
+/**
+ * 井口配置
+ *
+ * @author ZWT
+ * @date 2023/10/20
+ */
+@Data
 public class DeleteBaseWellheadInput {
+
     @XText("ID")
     private String id;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-
 }

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_wellhead/GetBaseWellheadInput.java

 package pps.core.base.service.data.base_wellhead;
 
+import lombok.Data;
 import xstartup.annotation.XText;
 
+/**
+ * 井口配置
+ *
+ * @author ZWT
+ * @date 2023/10/20
+ */
+@Data
 public class GetBaseWellheadInput {
+
     @XText("ID")
     private String id;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-
 }

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_wellhead/QueryBaseWellheadInput.java

@@ -8,7 +8,7 @@ import xstartup.base.data.XPageInput;
 import java.math.BigDecimal;
 
 /**
- * 井口
+ * 井口配置
  *
  * @author ZWT
  * @date 2023/09/25

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_wellhead/UpdateBaseWellheadInput.java

 package pps.core.base.service.data.base_wellhead;
 
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
 import xstartup.annotation.XText;
 
 import java.math.BigDecimal;
 
+/**
+ * 井口配置
+ *
+ * @author ZWT
+ * @date 2023/10/20
+ */
+@Data
 public class UpdateBaseWellheadInput {
+
     @XText("ID")
+    @NotBlank(message = "缺少井口ID")
     private String id;
 
     @XText("组织机构ID")
+    @NotBlank(message = "缺少组织机构ID")
     private String ouId;
 
+    @XText("组织机构name")
+    private String ouName;
+
     @XText("井号")
+    @NotBlank(message = "缺少井号")
     private String wellNumber;
 
     @XText("运行类型key(字典获取)")
+    @NotBlank(message = "缺少运行类型")
     private String runTypeKey;
 
+    @XText("运行类型name(字典获取)")
+    private String runTypeName;
+
     @XText("运行功率(KW)")
+    @NotNull(message = "缺少运行功率")
     private BigDecimal serviceRating;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public String getOuId() {
-        return this.ouId;
-    }
-
-    public void setOuId(String value) {
-        this.ouId = value;
-    }
-
-    public String getWellNumber() {
-        return this.wellNumber;
-    }
-
-    public void setWellNumber(String value) {
-        this.wellNumber = value;
-    }
-
-    public String getRunTypeKey() {
-        return this.runTypeKey;
-    }
-
-    public void setRunTypeKey(String value) {
-        this.runTypeKey = value;
-    }
-
-    public BigDecimal getServiceRating() {
-        return this.serviceRating;
-    }
-
-    public void setServiceRating(BigDecimal value) {
-        this.serviceRating = value;
-    }
-
 }