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

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

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -42,12 +42,25 @@ import java.util.Objects;
 @XService
 public class BaseEnergyStorageDeviceService {
 
-    @XText("新增")
+    /**
+     * 储能设备模块--新增
+     * POST /base/base-energy-storage-device/create-base-energy-storage-device
+     * 接口ID：105602202
+     * 接口地址：https://app.apifox.com/project/3196988/apis/api-105602202
+     *
+     * @param context 上下文
+     * @param input   输入
+     * @return {@link XServiceResult}
+     */
+    @XText("储能设备模块--新增")
     @XApiAnonymous
     @XApiPost
     public XServiceResult createBaseEnergyStorageDevice(XContext context, CreateBaseEnergyStorageDeviceInput input) {
+        BaseEnergyStorageDeviceMapper mapper = context.getBean(BaseEnergyStorageDeviceMapper.class);
+        if (this.checkMakerNumberExists(mapper, input.getMakerNumber(), null)) {
+            return XServiceResult.error(context, BusinessError.MakerNumberExists);
+        }
         return XTransactionHelper.begin(context, () -> {
-            BaseEnergyStorageDeviceMapper mapper = context.getBean(BaseEnergyStorageDeviceMapper.class);
             BaseEnergyStorageDeviceEnt entity = XCopyUtils.copyNewObject(input, BaseEnergyStorageDeviceEnt.class);
             PpsUserSession session = context.getSession(PpsUserSession.class);
             BaseUtils.setBaseModelDefault(entity, session);
@@ -56,16 +69,29 @@ public class BaseEnergyStorageDeviceService {
         });
     }
 
-    @XText("更新")
+    /**
+     * 储能设备模块--修改
+     * POST /base/base-energy-storage-device/update-base-energy-storage-device
+     * 接口ID：105602203
+     * 接口地址：https://app.apifox.com/project/3196988/apis/api-105602203
+     *
+     * @param context 上下文
+     * @param input   输入
+     * @return {@link XServiceResult}
+     */
+    @XText("储能设备模块--修改")
     @XApiAnonymous
     @XApiPost
     public XServiceResult updateBaseEnergyStorageDevice(XContext context, UpdateBaseEnergyStorageDeviceInput input) {
+        BaseEnergyStorageDeviceMapper mapper = context.getBean(BaseEnergyStorageDeviceMapper.class);
+        if (this.checkMakerNumberExists(mapper, input.getMakerNumber(), input.getId())) {
+            return XServiceResult.error(context, BusinessError.MakerNumberExists);
+        }
+        BaseEnergyStorageDeviceEnt entity = this.selectOneByDeviceId(input.getId(), mapper);
+        if (Objects.isNull(entity)) {
+            return XServiceResult.error(context, XError.NotFound);
+        }
         return XTransactionHelper.begin(context, () -> {
-            BaseEnergyStorageDeviceMapper mapper = context.getBean(BaseEnergyStorageDeviceMapper.class);
-            BaseEnergyStorageDeviceEnt entity = this.selectOneByDeviceId(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 BaseEnergyStorageDeviceService {
         });
     }
 
-    @XText("删除")
+    /**
+     * 储能设备模块--删除
+     * POST /base/base-energy-storage-device/delete-base-energy-storage-device
+     * 接口ID：105602204
+     * 接口地址：https://app.apifox.com/project/3196988/apis/api-105602204
+     *
+     * @param context 上下文
+     * @param input   输入
+     * @return {@link XServiceResult}
+     */
+    @XText("储能设备模块--删除")
     @XApiAnonymous
     @XApiPost
     public XServiceResult deleteBaseEnergyStorageDevice(XContext context, DeleteBaseEnergyStorageDeviceInput input) {
@@ -98,7 +134,17 @@ public class BaseEnergyStorageDeviceService {
         });
     }
 
-    @XText("根据id获取详情")
+    /**
+     * 储能设备模块--详情
+     * GET /base/base-energy-storage-device/get-base-energy-storage-device
+     * 接口ID：105602200
+     * 接口地址：https://app.apifox.com/project/3196988/apis/api-105602200
+     *
+     * @param context 上下文
+     * @param input   输入
+     * @return {@link XSingleResult}<{@link GetBaseEnergyStorageDeviceOutput}>
+     */
+    @XText("储能设备模块--详情")
     @XApiAnonymous
     @XApiGet
     public XSingleResult<GetBaseEnergyStorageDeviceOutput> getBaseEnergyStorageDevice(XContext context, GetBaseEnergyStorageDeviceInput input) {
@@ -112,7 +158,7 @@ public class BaseEnergyStorageDeviceService {
     }
 
     /**
-     * 分页查询
+     * 储能设备模块--分页查询
      * GET /base/base-energy-storage-device/query-base-energy-storage-device
      * 接口ID：105602201
      * 接口地址：https://app.apifox.com/project/3196988/apis/api-105602201
@@ -121,7 +167,7 @@ public class BaseEnergyStorageDeviceService {
      * @param input   输入
      * @return {@link XPageResult}<{@link QueryBaseEnergyStorageDeviceOutput}>
      */
-    @XText("分页查询")
+    @XText("储能设备模块--分页查询")
     @XApiAnonymous
     @XApiGet
     public XPageResult<QueryBaseEnergyStorageDeviceOutput> queryBaseEnergyStorageDevice(XContext context, QueryBaseEnergyStorageDeviceInput input) {
@@ -176,4 +222,21 @@ public class BaseEnergyStorageDeviceService {
                 .eq(BaseModel::getId, deviceId)
         );
     }
+
+    /**
+     * 检查编号是否存在
+     *
+     * @param mapper      映射器
+     * @param makerNumber 出场编号
+     * @param id          id
+     * @return boolean
+     */
+    private boolean checkMakerNumberExists(BaseEnergyStorageDeviceMapper mapper, String makerNumber, String id) {
+        Long count = mapper.selectCount(new LambdaQueryWrapper<BaseEnergyStorageDeviceEnt>()
+                .eq(BaseModel::getIsDeleted, BusinessConstant.ONE)
+                .eq(BaseEnergyStorageDeviceEnt::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_energy_storage_device/CreateBaseEnergyStorageDeviceInput.java

 package pps.core.base.service.data.base_energy_storage_device;
 
-import com.baomidou.mybatisplus.annotation.TableField;
+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 CreateBaseEnergyStorageDeviceInput {
 
     @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(字典获取)")
@@ -27,20 +38,22 @@ public class CreateBaseEnergyStorageDeviceInput {
     private String storageModelName;
 
     @XText("设备容量(KWh)")
+    @NotNull(message = "缺少设备容量")
     private BigDecimal apparatusCapacity;
 
     @XText("额定放电功率(KW)")
+    @NotNull(message = "缺少额定放电功率")
     private BigDecimal ratedDischargePower;
 
     @XText("额定充电功率(KW)")
+    @NotNull(message = "缺少额定充电功率")
     private BigDecimal ratedChargingPower;
+
     @XText("额定放电深度")
-    @TableField
+    @NotNull(message = "缺少额定放电深度")
     private BigDecimal ratedDischargeDepth;
 
     @XText("额定放电效率")
-    @TableField
+    @NotNull(message = "缺少额定放电效率")
     private BigDecimal ratedDischargeEfficiency;
-
-
 }

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_energy_storage_device/DeleteBaseEnergyStorageDeviceInput.java

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

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_energy_storage_device/GetBaseEnergyStorageDeviceInput.java

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

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_energy_storage_device/UpdateBaseEnergyStorageDeviceInput.java

 package pps.core.base.service.data.base_energy_storage_device;
 
-import com.baomidou.mybatisplus.annotation.TableField;
+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 UpdateBaseEnergyStorageDeviceInput {
+
     @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(字典获取)")
@@ -29,20 +42,22 @@ public class UpdateBaseEnergyStorageDeviceInput {
     private String storageModelName;
 
     @XText("设备容量(KWh)")
+    @NotNull(message = "缺少设备容量")
     private BigDecimal apparatusCapacity;
 
     @XText("额定放电功率(KW)")
+    @NotNull(message = "缺少额定放电功率")
     private BigDecimal ratedDischargePower;
 
     @XText("额定充电功率(KW)")
+    @NotNull(message = "缺少额定充电功率")
     private BigDecimal ratedChargingPower;
 
     @XText("额定放电深度")
-    @TableField
+    @NotNull(message = "缺少额定放电深度")
     private BigDecimal ratedDischargeDepth;
 
     @XText("额定放电效率")
-    @TableField
+    @NotNull(message = "缺少额定放电效率")
     private BigDecimal ratedDischargeEfficiency;
-
 }