feat(能源管理系统): 基础信息配置

1.开发基础信息配置-市电峰谷配置模块删除功能,完成接口冒烟测试并生成接口文档;
2.开发基础信息配置-市电峰谷配置模块详情功能,完成接口冒烟测试并生成接口文档;
3.开发基础信息配置-市电峰谷配置模块分页列表功能,完成接口冒烟测试并生成接口文档;
4.开发基础信息配置-输电线路配置模块新增功能,完成接口冒烟测试并生成接口文档;
5.代码优化,增加实体类基类抽取默认字段,添加公共数据封装方法;

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -3,7 +3,6 @@ package pps.core.base.service;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import org.apache.commons.lang3.StringUtils;
 import pps.core.base.entity.BasePowerLineEnt;
 import pps.core.base.entity.BasePowerLineView;
 import pps.core.base.mapper.BasePowerLineMapper;
@@ -13,6 +12,7 @@ import pps.core.base.service.data.base_power_line_diesel.CreateBasePowerLineDies
 import pps.core.base.service.data.base_power_line_plant.CreateBasePowerLinePlantInput;
 import pps.core.base.service.data.base_power_line_storage.CreateBasePowerLineStorageInput;
 import pps.core.base.service.data.base_power_line_wellhead.CreateBasePowerLineWellheadInput;
+import pps.core.base.utils.BaseEntUtils;
 import pps.core.common.session.PpsUserSession;
 import xstartup.annotation.XService;
 import xstartup.annotation.XText;
@@ -29,7 +29,6 @@ import xstartup.feature.api.annotation.XApiPost;
 import xstartup.feature.mybatis.helper.XMapperHelper;
 import xstartup.helper.XTransactionHelper;
 
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -61,7 +60,7 @@ public class BasePowerLineService {
             BasePowerLineMapper mapper = context.getBean(BasePowerLineMapper.class);
             BasePowerLineEnt entity = XCopyUtils.copyNewObject(input, BasePowerLineEnt.class);
             //新增输电线路
-            this.setBasePowerLineEntDefault(entity, session);
+            BaseEntUtils.setBaseEntDefault(entity, session);
             mapper.insert(entity);
             String lineId = entity.getId();
             //新增井口配置
@@ -88,28 +87,6 @@ public class BasePowerLineService {
         });
     }
 
-    /**
-     * 设置输电线路配置默认值
-     *
-     * @param entity  实体
-     * @param session 会话
-     */
-    private void setBasePowerLineEntDefault(BasePowerLineEnt entity, PpsUserSession session) {
-        String id = entity.getId();
-        Date now = new Date();
-        String userId = session.getId();
-        String userName = session.getUserName();
-        if (StringUtils.isEmpty(id)) {
-            entity.setCreateById(userId);
-            entity.setCreateByName(userName);
-            entity.setCreateTime(now);
-        }
-        entity.setModifyById(userId);
-        entity.setModifyByName(userName);
-        entity.setModifyTime(now);
-    }
-
-
     @XApiAnonymous
     @XApiPost
     public XServiceResult updateBasePowerLine(XContext context, UpdateBasePowerLineInput input) {

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

@@ -7,7 +7,10 @@ import org.apache.commons.lang3.StringUtils;
 import pps.cloud.system.service.SystemAreaService;
 import pps.cloud.system.service.data.GetSysAreaInput;
 import pps.cloud.system.service.data.GetSysAreaOutput;
-import pps.core.base.entity.*;
+import pps.core.base.entity.BasePriceStrategyDetailEnt;
+import pps.core.base.entity.BasePriceStrategyEnt;
+import pps.core.base.entity.BasePriceStrategyMonthEnt;
+import pps.core.base.entity.BasePriceStrategyView;
 import pps.core.base.mapper.BasePriceStrategyDetailMapper;
 import pps.core.base.mapper.BasePriceStrategyMapper;
 import pps.core.base.mapper.BasePriceStrategyMonthMapper;
@@ -16,6 +19,7 @@ import pps.core.base.service.data.base_price_strategy.*;
 import pps.core.base.service.data.base_price_strategy_month.CreateBasePriceStrategyMonthInput;
 import pps.core.base.service.data.base_price_strategy_month.GetBasePriceStrategyMonthOutput;
 import pps.core.base.service.data.base_price_strategy_month.UpdateBasePriceStrategyMonthInput;
+import pps.core.base.utils.BaseEntUtils;
 import pps.core.common.session.PpsUserSession;
 import xstartup.annotation.XService;
 import xstartup.annotation.XText;
@@ -31,7 +35,6 @@ import xstartup.feature.api.annotation.XApiGet;
 import xstartup.feature.api.annotation.XApiPost;
 import xstartup.helper.XTransactionHelper;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -65,7 +68,7 @@ public class BasePriceStrategyService {
         return XTransactionHelper.begin(context, () -> {
             BasePriceStrategyMapper mapper = context.getBean(BasePriceStrategyMapper.class);
             BasePriceStrategyEnt entity = XCopyUtils.copyNewObject(input, BasePriceStrategyEnt.class);
-            this.setBasePriceStrategyEntDefault(entity, session);
+            BaseEntUtils.setBaseEntDefault(entity, session);
             mapper.insert(entity);
             String strategyId = entity.getId();
             List<CreateBasePriceStrategyMonthInput> inputMonths = input.getMonths();
@@ -126,7 +129,7 @@ public class BasePriceStrategyService {
                 this.saveStrategyMonthDetail(monthMapper, detailMapper, monthList, strategyId, session);
             }
             XCopyUtils.copyObject(input, entity);
-            this.setBasePriceStrategyEntDefault(entity, session);
+            BaseEntUtils.setBaseEntDefault(entity, session);
             mapper.updateById(entity);
             return XServiceResult.OK;
         });
@@ -288,37 +291,16 @@ public class BasePriceStrategyService {
         List<BasePriceStrategyDetailEnt> detailList;
         for (BasePriceStrategyMonthEnt monthEnt : monthList) {
             monthEnt.setStrategyId(strategyId);
-            this.setBasePriceStrategyEntDefault(monthEnt, session);
+            BaseEntUtils.setBaseEntDefault(monthEnt, session);
             monthMapper.insert(monthEnt);
             strategyMonth = monthEnt.getStrategyMonth();
             detailList = monthEnt.getDetails();
             for (BasePriceStrategyDetailEnt detailEnt : detailList) {
                 detailEnt.setStrategyId(strategyId);
                 detailEnt.setStrategyMonth(strategyMonth);
-                this.setBasePriceStrategyEntDefault(detailEnt, session);
+                BaseEntUtils.setBaseEntDefault(detailEnt, session);
                 detailMapper.insert(detailEnt);
             }
         }
     }
-
-    /**
-     * 设置市电峰谷策略默认值
-     *
-     * @param entity  实体
-     * @param session 会话
-     */
-    private void setBasePriceStrategyEntDefault(BaseEnt entity, PpsUserSession session) {
-        String id = entity.getId();
-        Date now = new Date();
-        String userId = session.getId();
-        String userName = session.getUserName();
-        if (StringUtils.isEmpty(id)) {
-            entity.setCreateById(userId);
-            entity.setCreateByName(userName);
-            entity.setCreateTime(now);
-        }
-        entity.setModifyById(userId);
-        entity.setModifyByName(userName);
-        entity.setModifyTime(now);
-    }
 }

C09-base/pps-core-base/src/main/java/pps/core/base/utils/BaseEntUtils.java

+package pps.core.base.utils;
+
+import org.apache.commons.lang3.StringUtils;
+import pps.core.base.entity.BaseEnt;
+import pps.core.common.session.PpsUserSession;
+
+import java.util.Date;
+
+/**
+ * 封装工具类
+ *
+ * @author ZWT
+ * @date 2023/08/25 16:08
+ */
+public class BaseEntUtils {
+
+    /**
+     * 设置市电峰谷策略默认值
+     *
+     * @param entity  实体
+     * @param session 会话
+     */
+    public static void setBaseEntDefault(BaseEnt entity, PpsUserSession session) {
+        String id = entity.getId();
+        Date now = new Date();
+        String userId = session.getId();
+        String userName = session.getUserName();
+        if (StringUtils.isEmpty(id)) {
+            entity.setCreateById(userId);
+            entity.setCreateByName(userName);
+            entity.setCreateTime(now);
+        }
+        entity.setModifyById(userId);
+        entity.setModifyByName(userName);
+        entity.setModifyTime(now);
+    }
+}