feat(能源管理系统): 基础信息配置,间开制度管理

1.优化基础信息配置-柴发设备模块新增,修改,删除,查询接口,优化代码结构增加事务处理;
2.优化基础信息配置-储能设备模块新增,修改,删除,查询接口,优化代码结构增加事务处理;
3.优化基础信息配置-井口设备模块新增,修改,删除,查询接口,优化代码结构增加事务处理;
4.优化基础信息配置-光伏电站模块新增,修改,删除,查询接口,优化代码结构增加事务处理;
5.修改间开制度管理-长期间开优化模块详情接口,增加查询已优化时间周期逻辑,修改接口文档完成冒烟测试;
6.修改间开制度管理-中短期间开优化模块详情接口,增加查询已优化时间周期逻辑,修改接口文档完成冒烟测试;
7.修改间开制度管理业务操作工具类,增加通过开始时间和结束时间获取时间区间的方法;
8.添加业务异常枚举;

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

+package pps.core.base.enums;
+
+import xstartup.error.XError;
+
+/**
+ * 业务错误
+ *
+ * @author ZWT
+ * @date 2023/09/12
+ */
+public enum BusinessError implements XError {
+    DieselReference(2000, "当前柴发设备已被引用"),
+    StorageReference(2001, "当前储能设备已被引用"),
+    PhotovoltaicReference(2002, "当前光伏电站已被引用"),
+    LineReference(2003, "当前线路已被引用"),
+    StrategyReference(2004, "当前策略已被引用"),
+    WellheadReference(2005, "当前井口已被引用"),
+    ;
+
+    private int code;
+    private String text;
+
+    BusinessError(int code, String text) {
+        this.code = code;
+        this.text = text;
+    }
+
+    @Override
+    public int getCode() {
+        return 0;
+    }
+
+    @Override
+    public String getText() {
+        return null;
+    }
+}

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import pps.core.base.entity.BaseDieselGeneratorEnt;
 import pps.core.base.entity.BasePowerLineDieselEnt;
+import pps.core.base.enums.BusinessError;
 import pps.core.base.mapper.BaseDieselGeneratorMapper;
 import pps.core.base.mapper.BasePowerLineDieselMapper;
 import pps.core.base.service.data.base_diesel_generator.*;
@@ -77,7 +78,7 @@ public class BaseDieselGeneratorService extends BaseService {
     public XServiceResult deleteBaseDieselGenerator(XContext context, DeleteBaseDieselGeneratorInput input) {
         String dieselId = input.getId();
         if (this.checkDieselIsReference(context, dieselId)) {
-            return XServiceResult.error(992, "当前柴发设备已被引用");
+            return XServiceResult.error(context, BusinessError.DieselReference);
         }
         return XTransactionHelper.begin(context, () -> {
             BaseDieselGeneratorMapper mapper = context.getBean(BaseDieselGeneratorMapper.class);

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import pps.core.base.entity.BaseEnergyStorageDeviceEnt;
 import pps.core.base.entity.BasePowerLineStorageEnt;
+import pps.core.base.enums.BusinessError;
 import pps.core.base.mapper.BaseEnergyStorageDeviceMapper;
 import pps.core.base.mapper.BasePowerLineStorageMapper;
 import pps.core.base.service.data.base_energy_storage_device.*;
@@ -77,7 +78,7 @@ public class BaseEnergyStorageDeviceService extends BaseService {
     public XServiceResult deleteBaseEnergyStorageDevice(XContext context, DeleteBaseEnergyStorageDeviceInput input) {
         String storageId = input.getId();
         if (this.checkStorageIsReference(context, storageId)) {
-            return XServiceResult.error(992, "当前储能设备已被引用");
+            return XServiceResult.error(context, BusinessError.StorageReference);
         }
         return XTransactionHelper.begin(context, () -> {
             BaseEnergyStorageDeviceMapper mapper = context.getBean(BaseEnergyStorageDeviceMapper.class);

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

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import pps.core.base.entity.BasePhotovoltaicPlantEnt;
 import pps.core.base.entity.BasePowerLineEnt;
 import pps.core.base.entity.BasePowerLinePlantEnt;
+import pps.core.base.enums.BusinessError;
 import pps.core.base.mapper.BasePhotovoltaicPlantMapper;
 import pps.core.base.mapper.BasePowerLinePlantMapper;
 import pps.core.base.service.data.base_photovoltaic_plant.*;
@@ -85,7 +86,7 @@ public class BasePhotovoltaicPlantService extends BaseService {
     public XServiceResult deleteBasePhotovoltaicPlant(XContext context, DeleteBasePhotovoltaicPlantInput input) {
         String plantId = input.getId();
         if (this.checkPhotovoltaicIsReference(context, plantId)) {
-            return XServiceResult.error(992, "当前光伏电站已被引用");
+            return XServiceResult.error(context, BusinessError.PhotovoltaicReference);
         }
         return XTransactionHelper.begin(context, () -> {
             BasePhotovoltaicPlantMapper mapper = context.getBean(BasePhotovoltaicPlantMapper.class);

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

@@ -8,6 +8,7 @@ import com.github.pagehelper.PageInfo;
 import com.github.pagehelper.page.PageMethod;
 import org.apache.commons.lang3.StringUtils;
 import pps.core.base.entity.*;
+import pps.core.base.enums.BusinessError;
 import pps.core.base.mapper.*;
 import pps.core.base.service.data.base_power_line.*;
 import pps.core.base.service.data.base_power_line_diesel.GetBasePowerLineDieselViewOutput;
@@ -142,7 +143,7 @@ public class BasePowerLineService {
     public XServiceResult deleteBasePowerLine(XContext context, DeleteBasePowerLineInput input) {
         String lineId = input.getId();
         if (ServiceUtil.checkLineIsReference(context, lineId)) {
-            return XServiceResult.error(992, "当前线路已被引用");
+            return XServiceResult.error(context, BusinessError.LineReference);
         }
         return XTransactionHelper.begin(context, () -> {
             BasePowerLineMapper mapper = context.getBean(BasePowerLineMapper.class);

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

@@ -9,6 +9,7 @@ import com.github.pagehelper.PageInfo;
 import com.github.pagehelper.page.PageMethod;
 import org.apache.commons.lang3.StringUtils;
 import pps.core.base.entity.*;
+import pps.core.base.enums.BusinessError;
 import pps.core.base.mapper.*;
 import pps.core.base.service.data.base_price_strategy.*;
 import pps.core.base.service.data.base_price_strategy_detail.GetBasePriceStrategyDetailOutput;
@@ -140,7 +141,7 @@ public class BasePriceStrategyService {
     public XServiceResult deleteBasePriceStrategy(XContext context, DeleteBasePriceStrategyInput input) {
         String strategyId = input.getId();
         if (this.checkStrategyIsReference(context, strategyId)) {
-            return XServiceResult.error(992, "当前策略已被引用");
+            return XServiceResult.error(context, BusinessError.StrategyReference);
         }
         return XTransactionHelper.begin(context, () -> {
             BasePriceStrategyMapper mapper = context.getBean(BasePriceStrategyMapper.class);

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

@@ -7,6 +7,7 @@ import org.apache.commons.lang3.StringUtils;
 import pps.core.base.entity.BaseDieselGeneratorEnt;
 import pps.core.base.entity.BasePowerLineWellheadEnt;
 import pps.core.base.entity.BaseWellheadEnt;
+import pps.core.base.enums.BusinessError;
 import pps.core.base.mapper.BasePowerLineWellheadMapper;
 import pps.core.base.mapper.BaseWellheadMapper;
 import pps.core.base.service.data.base_wellhead.*;
@@ -79,7 +80,7 @@ public class BaseWellheadService extends BaseService {
     public XServiceResult deleteBaseWellhead(XContext context, DeleteBaseWellheadInput input) {
         String wellheadId = input.getId();
         if (this.checkWellheadIsReference(context, wellheadId)) {
-            return XServiceResult.error(992, "当前井口已被引用");
+            return XServiceResult.error(context, BusinessError.WellheadReference);
         }
         return XTransactionHelper.begin(context, () -> {
             BaseWellheadMapper mapper = context.getBean(BaseWellheadMapper.class);

C11-space/pps-core-space/src/main/java/pps/core/space/enums/BusinessError.java

+package pps.core.space.enums;
+
+import xstartup.error.XError;
+
+/**
+ * 业务错误
+ *
+ * @author ZWT
+ * @date 2023/09/12
+ */
+public enum BusinessError implements XError {
+    LineExists(2100, "当前线路已设定周期"),
+    RepeatSetting(2101, "请勿重复设定"),
+    ;
+
+    private int code;
+    private String text;
+
+    BusinessError(int code, String text) {
+        this.code = code;
+        this.text = text;
+    }
+
+    @Override
+    public int getCode() {
+        return 0;
+    }
+
+    @Override
+    public String getText() {
+        return null;
+    }
+}

C11-space/pps-core-space/src/main/java/pps/core/space/service/SpaceCalibrationService.java

@@ -11,6 +11,7 @@ import pps.core.common.utils.BaseUtils;
 import pps.core.space.entity.SpaceCalibrationHistoryView;
 import pps.core.space.entity.SpaceCalibrationPeriodEnt;
 import pps.core.space.entity.SpaceInstitutionWellheadEnt;
+import pps.core.space.enums.BusinessError;
 import pps.core.space.mapper.SpaceCalibrationHistoryViewMapper;
 import pps.core.space.mapper.SpaceCalibrationPeriodMapper;
 import pps.core.space.mapper.SpaceInstitutionWellheadMapper;
@@ -69,7 +70,7 @@ public class SpaceCalibrationService {
             SpaceCalibrationPeriodMapper mapper = context.getBean(SpaceCalibrationPeriodMapper.class);
             SpaceCalibrationPeriodEnt periodEnt = this.getPeriodEntByParam(mapper, input.getLineId(), input.getOuId());
             if (Objects.nonNull(periodEnt)) {
-                return XServiceResult.error(992, "当前线路已设定周期");
+                return XServiceResult.error(context, BusinessError.LineExists);
             }
             SpaceCalibrationPeriodEnt entity = XCopyUtils.copyNewObject(input, SpaceCalibrationPeriodEnt.class);
             BaseUtils.setBaseModelDefault(entity, session);

C11-space/pps-core-space/src/main/java/pps/core/space/service/SpaceInstitutionDetailService.java

@@ -14,6 +14,7 @@ import pps.core.common.entity.BaseModel;
 import pps.core.common.session.PpsUserSession;
 import pps.core.common.utils.BaseUtils;
 import pps.core.space.entity.*;
+import pps.core.space.enums.BusinessError;
 import pps.core.space.mapper.*;
 import pps.core.space.service.data.space_institution_detail.*;
 import pps.core.space.service.data.space_institution_duration.GetSpaceInstitutionDurationViewOutput;
@@ -284,9 +285,6 @@ public class SpaceInstitutionDetailService {
     public XServiceResult updateBasicInstitution(XContext context, UpdateSpaceInstitutionDetailInput input) {
         String ouId = input.getOuId();
         String lineId = input.getLineId();
-        if (StringUtils.isAnyBlank(ouId, lineId)) {
-            return XServiceResult.error(992, "缺少必填项");
-        }
         String institutionId = input.getId();
         return XTransactionHelper.begin(context, () -> {
             SpaceInstitutionDetailMapper mapper = context.getBean(SpaceInstitutionDetailMapper.class);
@@ -296,7 +294,7 @@ public class SpaceInstitutionDetailService {
             }
             Integer isCurrentBasic = entity.getIsCurrentBasic();
             if (isCurrentBasic.equals(BusinessConstant.ZERO)) {
-                return XServiceResult.error(992, "请勿重复设定");
+                return XServiceResult.error(context, BusinessError.RepeatSetting);
             }
             //关闭当前基础制度
             mapper.update(null, new LambdaUpdateWrapper<SpaceInstitutionDetailEnt>()