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

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

BREAKING CHANGE: 无

Closes 无

[skip ci]

C09-base/pps-core-base/src/main/java/pps/core/base/enums/BusinessError.java

@@ -17,6 +17,7 @@ public enum BusinessError implements XError {
     WellheadReferenceLine(2005, "当前井口已被线路引用"),
     WellheadReferenceSpace(2006, "当前井口已被间开引用"),
     WellNumberExists(2007, "井号已存在"),
+    MakerNumberExists(2008, "出场编号已存在"),
     ;
 
     private int code;

C09-base/pps-core-base/src/main/java/pps/core/base/service/BaseDieselGeneratorService.java

@@ -42,12 +42,25 @@ import java.util.Objects;
 @XService
 public class BaseDieselGeneratorService {
 
-    @XText("新增")
+    /**
+     * 柴发设备模块--新增
+     * POST /base/base-diesel-generator/create-base-diesel-generator
+     * 接口ID：105601993
+     * 接口地址：https://app.apifox.com/project/3196988/apis/api-105601993
+     *
+     * @param context 上下文
+     * @param input   输入
+     * @return {@link XServiceResult}
+     */
+    @XText("柴发设备模块--新增")
     @XApiAnonymous
     @XApiPost
     public XServiceResult createBaseDieselGenerator(XContext context, CreateBaseDieselGeneratorInput input) {
+        BaseDieselGeneratorMapper mapper = context.getBean(BaseDieselGeneratorMapper.class);
+        if (this.checkMakerNumberExists(mapper, input.getMakerNumber(), null)) {
+            return XServiceResult.error(context, BusinessError.MakerNumberExists);
+        }
         return XTransactionHelper.begin(context, () -> {
-            BaseDieselGeneratorMapper mapper = context.getBean(BaseDieselGeneratorMapper.class);
             BaseDieselGeneratorEnt entity = XCopyUtils.copyNewObject(input, BaseDieselGeneratorEnt.class);
             PpsUserSession session = context.getSession(PpsUserSession.class);
             BaseUtils.setBaseModelDefault(entity, session);
@@ -56,16 +69,29 @@ public class BaseDieselGeneratorService {
         });
     }
 
-    @XText("更新")
+    /**
+     * 柴发设备模块--修改
+     * POST /base/base-diesel-generator/update-base-diesel-generator
+     * 接口ID：105601994
+     * 接口地址：https://app.apifox.com/project/3196988/apis/api-105601994
+     *
+     * @param context 上下文
+     * @param input   输入
+     * @return {@link XServiceResult}
+     */
+    @XText("柴发设备模块--修改")
     @XApiAnonymous
     @XApiPost
     public XServiceResult updateBaseDieselGenerator(XContext context, UpdateBaseDieselGeneratorInput input) {
+        BaseDieselGeneratorMapper mapper = context.getBean(BaseDieselGeneratorMapper.class);
+        if (this.checkMakerNumberExists(mapper, input.getMakerNumber(), input.getId())) {
+            return XServiceResult.error(context, BusinessError.MakerNumberExists);
+        }
+        BaseDieselGeneratorEnt entity = this.selectOneByDieselId(input.getId(), mapper);
+        if (Objects.isNull(entity)) {
+            return XServiceResult.error(context, XError.NotFound);
+        }
         return XTransactionHelper.begin(context, () -> {
-            BaseDieselGeneratorMapper mapper = context.getBean(BaseDieselGeneratorMapper.class);
-            BaseDieselGeneratorEnt entity = this.selectOneByDieselId(input.getId(), mapper);
-            if (Objects.isNull(entity)) {
-                return XServiceResult.error(context, XError.NotFound);
-            }
             XCopyUtils.copyObject(input, entity);
             PpsUserSession session = context.getSession(PpsUserSession.class);
             BaseUtils.setBaseModelDefault(entity, session);
@@ -74,7 +100,17 @@ public class BaseDieselGeneratorService {
         });
     }
 
-    @XText("删除")
+    /**
+     * 柴发设备模块--删除
+     * POST /base/base-diesel-generator/delete-base-diesel-generator
+     * 接口ID：105601998
+     * 接口地址：https://app.apifox.com/project/3196988/apis/api-105601998
+     *
+     * @param context 上下文
+     * @param input   输入
+     * @return {@link XServiceResult}
+     */
+    @XText("柴发设备模块--删除")
     @XApiAnonymous
     @XApiPost
     public XServiceResult deleteBaseDieselGenerator(XContext context, DeleteBaseDieselGeneratorInput input) {
@@ -98,7 +134,17 @@ public class BaseDieselGeneratorService {
         });
     }
 
-    @XText("根据id获取详情")
+    /**
+     * 柴发设备模块--详情
+     * GET /base/base-diesel-generator/get-base-diesel-generator
+     * 接口ID：105601991
+     * 接口地址：https://app.apifox.com/project/3196988/apis/api-105601991
+     *
+     * @param context 上下文
+     * @param input   输入
+     * @return {@link XSingleResult}<{@link GetBaseDieselGeneratorOutput}>
+     */
+    @XText("柴发设备模块--详情")
     @XApiAnonymous
     @XApiGet
     public XSingleResult<GetBaseDieselGeneratorOutput> getBaseDieselGenerator(XContext context, GetBaseDieselGeneratorInput input) {
@@ -112,7 +158,7 @@ public class BaseDieselGeneratorService {
     }
 
     /**
-     * 分页查询
+     * 柴发设备模块--分页查询
      * GET /base/base-diesel-generator/query-base-diesel-generator
      * 接口ID：105601992
      * 接口地址：https://app.apifox.com/project/3196988/apis/api-105601992
@@ -121,7 +167,7 @@ public class BaseDieselGeneratorService {
      * @param input   输入
      * @return {@link XPageResult}<{@link QueryBaseDieselGeneratorOutput}>
      */
-    @XText("分页查询")
+    @XText("柴发设备模块--分页查询")
     @XApiAnonymous
     @XApiGet
     public XPageResult<QueryBaseDieselGeneratorOutput> queryBaseDieselGenerator(XContext context, QueryBaseDieselGeneratorInput input) {
@@ -176,4 +222,21 @@ public class BaseDieselGeneratorService {
                 .eq(BaseModel::getId, dieselId)
         );
     }
+
+    /**
+     * 检查编号是否存在
+     *
+     * @param mapper      映射器
+     * @param makerNumber 出场编号
+     * @param id          id
+     * @return boolean
+     */
+    private boolean checkMakerNumberExists(BaseDieselGeneratorMapper mapper, String makerNumber, String id) {
+        Long count = mapper.selectCount(new LambdaQueryWrapper<BaseDieselGeneratorEnt>()
+                .eq(BaseModel::getIsDeleted, BusinessConstant.ONE)
+                .eq(BaseDieselGeneratorEnt::getMakerNumber, makerNumber)
+                .ne(StringUtils.isNotEmpty(id), BaseModel::getId, id)
+        );
+        return count > 0;
+    }
 }
\ No newline at end of file

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_diesel_generator/CreateBaseDieselGeneratorInput.java

 package pps.core.base.service.data.base_diesel_generator;
 
+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 CreateBaseDieselGeneratorInput {
 
     @XText("组织机构ID")
+    @NotBlank(message = "缺少组织机构ID")
     private String ouId;
 
     @XText("组织机构name")
     private String ouName;
 
     @XText("设备名称")
+    @NotBlank(message = "缺少设备名称")
     private String deviceName;
 
     @XText("出厂编号")
+    @NotBlank(message = "缺少出厂编号")
     private String makerNumber;
 
     @XText("柴发设备机组型号key(字典获取)")
@@ -26,9 +38,10 @@ public class CreateBaseDieselGeneratorInput {
     private String unitTypeName;
 
     @XText("常用功率(KW)")
+    @NotNull(message = "缺少常用功率")
     private BigDecimal normalPower;
 
     @XText("备用功率(KW)")
+    @NotNull(message = "缺少备用功率")
     private BigDecimal standbyPower;
-
 }

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_diesel_generator/DeleteBaseDieselGeneratorInput.java

@@ -2,9 +2,16 @@ package pps.core.base.service.data.base_diesel_generator;
 
 import lombok.Data;
 import xstartup.annotation.XText;
+
+/**
+ * 柴发设备
+ *
+ * @author ZWT
+ * @date 2023/10/20
+ */
 @Data
 public class DeleteBaseDieselGeneratorInput {
+
     @XText("ID")
     private String id;
-
 }

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_diesel_generator/GetBaseDieselGeneratorInput.java

@@ -2,9 +2,16 @@ package pps.core.base.service.data.base_diesel_generator;
 
 import lombok.Data;
 import xstartup.annotation.XText;
+
+/**
+ * 柴发设备
+ *
+ * @author ZWT
+ * @date 2023/10/20
+ */
 @Data
 public class GetBaseDieselGeneratorInput {
+
     @XText("ID")
     private String id;
-
 }

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_diesel_generator/UpdateBaseDieselGeneratorInput.java

 package pps.core.base.service.data.base_diesel_generator;
 
+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 UpdateBaseDieselGeneratorInput {
+
     @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 deviceName;
 
     @XText("出厂编号")
+    @NotBlank(message = "缺少出厂编号")
     private String makerNumber;
 
     @XText("柴发设备机组型号key(字典获取)")
@@ -28,9 +42,10 @@ public class UpdateBaseDieselGeneratorInput {
     private String unitTypeName;
 
     @XText("常用功率(KW)")
+    @NotNull(message = "缺少常用功率")
     private BigDecimal normalPower;
 
     @XText("备用功率(KW)")
+    @NotNull(message = "缺少备用功率")
     private BigDecimal standbyPower;
-
 }