feat(能源管理系统): 间开制度管理

1.新建数据库表:
	基础间开:
		space_institution_institution
间开制度详情
		space_institution_wellhead
间开制度井口配置
		space_institution_duration
间开制度小间开时段配置

	定期校准:
		space_calibration_period
周期设定
		space_calibration_history
执行历史

	长期:
		space_optimize_long_period	长期间开优化周期记录
		space_optimize_long_wellhead
长期间开优化井口记录
		space_optimize_long_duration
长期间开优化井口制度记录

	中短期:
		space_optimize_mid_period
中短期间开优化周期记录
		space_optimize_mid_wellhead
中短期间开优化井口记录
		space_optimize_mid_duration
中短期间开优化井口制度记录

	短期:
		space_optimize_short_period
短期间开优化周期记录
		space_optimize_short_wellhead
短期间开优化井口记录
		space_optimize_short_duration 短期间开优化井口制度记录
2.生成代码

BREAKING CHANGE: 无

Closes 无

[skip ci]

C09-base/pps-core-base/src/main/java/pps/core/base/entity/BasePowerLineDiesel.java → C09-base/pps-core-base/src/main/java/pps/core/base/entity/BasePowerLineDieselEnt.java

@@ -16,7 +16,7 @@ import java.io.Serializable;
  */
 @Data
 @TableName("base_power_line_diesel")
-public class BasePowerLineDiesel extends BaseModel implements Serializable {
+public class BasePowerLineDieselEnt extends BaseModel implements Serializable {
 
     @XText("线路ID")
     @TableField

C09-base/pps-core-base/src/main/java/pps/core/base/entity/BasePowerLine.java → C09-base/pps-core-base/src/main/java/pps/core/base/entity/BasePowerLineEnt.java

@@ -16,7 +16,7 @@ import java.io.Serializable;
  */
 @Data
 @TableName("base_power_line")
-public class BasePowerLine extends BaseModel implements Serializable {
+public class BasePowerLineEnt extends BaseModel implements Serializable {
 
     @XText("组织机构ID")
     @TableField

C09-base/pps-core-base/src/main/java/pps/core/base/entity/BasePowerLinePlant.java → C09-base/pps-core-base/src/main/java/pps/core/base/entity/BasePowerLinePlantEnt.java

@@ -16,7 +16,7 @@ import java.io.Serializable;
  */
 @Data
 @TableName("base_power_line_plant")
-public class BasePowerLinePlant extends BaseModel implements Serializable {
+public class BasePowerLinePlantEnt extends BaseModel implements Serializable {
 
     @XText("线路ID")
     @TableField

C09-base/pps-core-base/src/main/java/pps/core/base/entity/BasePowerLineStorage.java → C09-base/pps-core-base/src/main/java/pps/core/base/entity/BasePowerLineStorageEnt.java

@@ -16,7 +16,7 @@ import java.io.Serializable;
  */
 @Data
 @TableName("base_power_line_storage")
-public class BasePowerLineStorage extends BaseModel implements Serializable {
+public class BasePowerLineStorageEnt extends BaseModel implements Serializable {
 
     @XText("线路ID")
     @TableField

C09-base/pps-core-base/src/main/java/pps/core/base/entity/BasePowerLineWellhead.java → C09-base/pps-core-base/src/main/java/pps/core/base/entity/BasePowerLineWellheadEnt.java

@@ -16,7 +16,7 @@ import java.io.Serializable;
  */
 @Data
 @TableName("base_power_line_wellhead")
-public class BasePowerLineWellhead extends BaseModel implements Serializable {
+public class BasePowerLineWellheadEnt extends BaseModel implements Serializable {
 
     @XText("线路ID")
     @TableField

C09-base/pps-core-base/src/main/java/pps/core/base/entity/BasePriceStrategyDetail.java → C09-base/pps-core-base/src/main/java/pps/core/base/entity/BasePriceStrategyDetailEnt.java

@@ -17,7 +17,7 @@ import java.math.BigDecimal;
  */
 @Data
 @TableName("base_price_strategy_detail")
-public class BasePriceStrategyDetail extends BaseModel implements Serializable {
+public class BasePriceStrategyDetailEnt extends BaseModel implements Serializable {
 
     @XText("市电峰谷配置ID")
     @TableField

C09-base/pps-core-base/src/main/java/pps/core/base/entity/BasePriceStrategy.java → C09-base/pps-core-base/src/main/java/pps/core/base/entity/BasePriceStrategyEnt.java

@@ -17,7 +17,7 @@ import java.math.BigDecimal;
  */
 @Data
 @TableName("base_price_strategy")
-public class BasePriceStrategy extends BaseModel implements Serializable {
+public class BasePriceStrategyEnt extends BaseModel implements Serializable {
 
     @XText("策略名称")
     @TableField

C09-base/pps-core-base/src/main/java/pps/core/base/entity/BasePriceStrategyMonth.java → C09-base/pps-core-base/src/main/java/pps/core/base/entity/BasePriceStrategyMonthEnt.java

@@ -18,7 +18,7 @@ import java.util.List;
  */
 @Data
 @TableName("base_price_strategy_month")
-public class BasePriceStrategyMonth extends BaseModel implements Serializable {
+public class BasePriceStrategyMonthEnt extends BaseModel implements Serializable {
 
     @XText("市电峰谷配置ID")
     @TableField
@@ -33,5 +33,5 @@ public class BasePriceStrategyMonth extends BaseModel implements Serializable {
      */
     @TableField(exist = false)
     @Valid
-    private List<BasePriceStrategyDetail> details;
+    private List<BasePriceStrategyDetailEnt> details;
 }

C09-base/pps-core-base/src/main/java/pps/core/base/mapper/BasePowerLineDieselMapper.java

@@ -2,8 +2,8 @@ package pps.core.base.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.springframework.stereotype.Repository;
-import pps.core.base.entity.BasePowerLineDiesel;
+import pps.core.base.entity.BasePowerLineDieselEnt;
 
 @Repository(value="pps.core.base.mapper.BasePowerLineDieselMapper")
-public interface BasePowerLineDieselMapper extends BaseMapper<BasePowerLineDiesel> {
+public interface BasePowerLineDieselMapper extends BaseMapper<BasePowerLineDieselEnt> {
 }

C09-base/pps-core-base/src/main/java/pps/core/base/mapper/BasePowerLineMapper.java

@@ -2,7 +2,7 @@ package pps.core.base.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.springframework.stereotype.Repository;
-import pps.core.base.entity.BasePowerLine;
+import pps.core.base.entity.BasePowerLineEnt;
 
 /**
  * 输电线路配置
@@ -11,5 +11,5 @@ import pps.core.base.entity.BasePowerLine;
  * @date 2023/08/25
  */
 @Repository(value = "pps.core.base.mapper.BasePowerLineMapper")
-public interface BasePowerLineMapper extends BaseMapper<BasePowerLine> {
+public interface BasePowerLineMapper extends BaseMapper<BasePowerLineEnt> {
 }

C09-base/pps-core-base/src/main/java/pps/core/base/mapper/BasePowerLinePlantMapper.java

@@ -2,7 +2,7 @@ package pps.core.base.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.springframework.stereotype.Repository;
-import pps.core.base.entity.BasePowerLinePlant;
+import pps.core.base.entity.BasePowerLinePlantEnt;
 
 /**
  * 输电线路光伏配置
@@ -11,5 +11,5 @@ import pps.core.base.entity.BasePowerLinePlant;
  * @date 2023/08/28
  */
 @Repository(value = "pps.core.base.mapper.BasePowerLinePlantMapper")
-public interface BasePowerLinePlantMapper extends BaseMapper<BasePowerLinePlant> {
+public interface BasePowerLinePlantMapper extends BaseMapper<BasePowerLinePlantEnt> {
 }

C09-base/pps-core-base/src/main/java/pps/core/base/mapper/BasePowerLineStorageMapper.java

@@ -2,7 +2,7 @@ package pps.core.base.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.springframework.stereotype.Repository;
-import pps.core.base.entity.BasePowerLineStorage;
+import pps.core.base.entity.BasePowerLineStorageEnt;
 
 /**
  * 输电线路储能配置
@@ -11,5 +11,5 @@ import pps.core.base.entity.BasePowerLineStorage;
  * @date 2023/08/28
  */
 @Repository(value = "pps.core.base.mapper.BasePowerLineStorageMapper")
-public interface BasePowerLineStorageMapper extends BaseMapper<BasePowerLineStorage> {
+public interface BasePowerLineStorageMapper extends BaseMapper<BasePowerLineStorageEnt> {
 }

C09-base/pps-core-base/src/main/java/pps/core/base/mapper/BasePowerLineWellheadMapper.java

@@ -2,7 +2,7 @@ package pps.core.base.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.springframework.stereotype.Repository;
-import pps.core.base.entity.BasePowerLineWellhead;
+import pps.core.base.entity.BasePowerLineWellheadEnt;
 
 /**
  * 输电线路井口配置
@@ -11,5 +11,5 @@ import pps.core.base.entity.BasePowerLineWellhead;
  * @date 2023/08/28
  */
 @Repository(value = "pps.core.base.mapper.BasePowerLineWellheadMapper")
-public interface BasePowerLineWellheadMapper extends BaseMapper<BasePowerLineWellhead> {
+public interface BasePowerLineWellheadMapper extends BaseMapper<BasePowerLineWellheadEnt> {
 }

C09-base/pps-core-base/src/main/java/pps/core/base/mapper/BasePriceStrategyDetailMapper.java

@@ -2,7 +2,7 @@ package pps.core.base.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.springframework.stereotype.Repository;
-import pps.core.base.entity.BasePriceStrategyDetail;
+import pps.core.base.entity.BasePriceStrategyDetailEnt;
 
 /**
  * 市电峰谷当月明细配置
@@ -11,5 +11,5 @@ import pps.core.base.entity.BasePriceStrategyDetail;
  * @date 2023/08/24
  */
 @Repository(value = "pps.core.base.mapper.BasePriceStrategyDetailMapper")
-public interface BasePriceStrategyDetailMapper extends BaseMapper<BasePriceStrategyDetail> {
+public interface BasePriceStrategyDetailMapper extends BaseMapper<BasePriceStrategyDetailEnt> {
 }

C09-base/pps-core-base/src/main/java/pps/core/base/mapper/BasePriceStrategyMapper.java

@@ -2,7 +2,7 @@ package pps.core.base.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.springframework.stereotype.Repository;
-import pps.core.base.entity.BasePriceStrategy;
+import pps.core.base.entity.BasePriceStrategyEnt;
 
 /**
  * 市电峰谷策略
@@ -11,5 +11,5 @@ import pps.core.base.entity.BasePriceStrategy;
  * @date 2023/08/24
  */
 @Repository(value = "pps.core.base.mapper.BasePriceStrategyMapper")
-public interface BasePriceStrategyMapper extends BaseMapper<BasePriceStrategy> {
+public interface BasePriceStrategyMapper extends BaseMapper<BasePriceStrategyEnt> {
 }

C09-base/pps-core-base/src/main/java/pps/core/base/mapper/BasePriceStrategyMonthMapper.java

@@ -2,7 +2,7 @@ package pps.core.base.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.springframework.stereotype.Repository;
-import pps.core.base.entity.BasePriceStrategyMonth;
+import pps.core.base.entity.BasePriceStrategyMonthEnt;
 
 /**
  * 市电峰谷月配置
@@ -11,7 +11,7 @@ import pps.core.base.entity.BasePriceStrategyMonth;
  * @date 2023/08/24
  */
 @Repository(value = "pps.core.base.mapper.BasePriceStrategyMonthMapper")
-public interface BasePriceStrategyMonthMapper extends BaseMapper<BasePriceStrategyMonth> {
+public interface BasePriceStrategyMonthMapper extends BaseMapper<BasePriceStrategyMonthEnt> {
 
 
 }

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

@@ -64,7 +64,7 @@ public class BasePowerLineService {
         PpsUserSession session = context.getSession(PpsUserSession.class);
         return XTransactionHelper.begin(context, () -> {
             BasePowerLineMapper mapper = context.getBean(BasePowerLineMapper.class);
-            BasePowerLine entity = XCopyUtils.copyNewObject(input, BasePowerLine.class);
+            BasePowerLineEnt entity = XCopyUtils.copyNewObject(input, BasePowerLineEnt.class);
             //新增输电线路
             BaseUtils.setBaseModelDefault(entity, session);
             mapper.insert(entity);
@@ -92,7 +92,7 @@ public class BasePowerLineService {
         String ouId = input.getOuId();
         return XTransactionHelper.begin(context, () -> {
             BasePowerLineMapper mapper = context.getBean(BasePowerLineMapper.class);
-            BasePowerLine entity = this.selectOneByLineId(lineId, mapper);
+            BasePowerLineEnt entity = this.selectOneByLineId(lineId, mapper);
             if (Objects.isNull(entity)) {
                 return XServiceResult.error(context, XError.NotFound);
             }
@@ -123,7 +123,7 @@ public class BasePowerLineService {
         //todo: 检查是否被其它功能引用
         return XTransactionHelper.begin(context, () -> {
             BasePowerLineMapper mapper = context.getBean(BasePowerLineMapper.class);
-            BasePowerLine entity = this.selectOneByLineId(lineId, mapper);
+            BasePowerLineEnt entity = this.selectOneByLineId(lineId, mapper);
             if (Objects.isNull(entity)) {
                 return XServiceResult.error(context, XError.NotFound);
             }
@@ -268,15 +268,15 @@ public class BasePowerLineService {
         String lineTypeKey = input.getLineTypeKey();
         String strategyId = input.getStrategyId();
         BasePowerLineMapper mapper = context.getBean(BasePowerLineMapper.class);
-        List<BasePowerLine> selectList = mapper.selectList(new LambdaQueryWrapper<BasePowerLine>()
-                .select(BaseModel::getId, BasePowerLine::getLineName)
+        List<BasePowerLineEnt> selectList = mapper.selectList(new LambdaQueryWrapper<BasePowerLineEnt>()
+                .select(BaseModel::getId, BasePowerLineEnt::getLineName)
                 .eq(StringUtils.isNotBlank(lineId), BaseModel::getId, lineId)
-                .eq(StringUtils.isNotBlank(ouId), BasePowerLine::getOuId, ouId)
-                .eq(StringUtils.isNotBlank(upperLineId), BasePowerLine::getUpperLineId, upperLineId)
-                .like(StringUtils.isNotBlank(lineName), BasePowerLine::getLineName, lineName)
-                .eq(StringUtils.isNotBlank(gridTypeKey), BasePowerLine::getGridTypeKey, gridTypeKey)
-                .eq(StringUtils.isNotBlank(lineTypeKey), BasePowerLine::getLineTypeKey, lineTypeKey)
-                .eq(StringUtils.isNotBlank(strategyId), BasePowerLine::getStrategyId, strategyId)
+                .eq(StringUtils.isNotBlank(ouId), BasePowerLineEnt::getOuId, ouId)
+                .eq(StringUtils.isNotBlank(upperLineId), BasePowerLineEnt::getUpperLineId, upperLineId)
+                .like(StringUtils.isNotBlank(lineName), BasePowerLineEnt::getLineName, lineName)
+                .eq(StringUtils.isNotBlank(gridTypeKey), BasePowerLineEnt::getGridTypeKey, gridTypeKey)
+                .eq(StringUtils.isNotBlank(lineTypeKey), BasePowerLineEnt::getLineTypeKey, lineTypeKey)
+                .eq(StringUtils.isNotBlank(strategyId), BasePowerLineEnt::getStrategyId, strategyId)
                 .orderByDesc(BaseModel::getModifyTime)
         );
         List<DynamicQueryBasePowerLineOutput> lineOutputList = XCopyUtils.copyNewList(selectList, DynamicQueryBasePowerLineOutput.class);
@@ -321,12 +321,12 @@ public class BasePowerLineService {
      *
      * @param lineId 行id
      * @param mapper 映射器
-     * @return {@link BasePowerLine}
+     * @return {@link BasePowerLineEnt}
      */
-    private BasePowerLine selectOneByLineId(String lineId, BasePowerLineMapper mapper) {
-        return mapper.selectOne(new QueryWrapper<BasePowerLine>()
+    private BasePowerLineEnt selectOneByLineId(String lineId, BasePowerLineMapper mapper) {
+        return mapper.selectOne(new QueryWrapper<BasePowerLineEnt>()
                 .lambda()
-                .eq(BasePowerLine::getId, lineId));
+                .eq(BasePowerLineEnt::getId, lineId));
     }
 
     /**
@@ -344,43 +344,43 @@ public class BasePowerLineService {
                                   List wellheadInputs, List plantInputs, List storageInputs, List dieselInputs) {
         //新增井口配置
         if (CollUtil.isNotEmpty(wellheadInputs)) {
-            List<BasePowerLineWellhead> wellheads = XCopyUtils.copyNewList(wellheadInputs, BasePowerLineWellhead.class);
-            for (BasePowerLineWellhead wellhead : wellheads) {
+            List<BasePowerLineWellheadEnt> wellheads = XCopyUtils.copyNewList(wellheadInputs, BasePowerLineWellheadEnt.class);
+            for (BasePowerLineWellheadEnt wellhead : wellheads) {
                 wellhead.setLineId(lineId);
                 wellhead.setOuId(ouId);
                 BaseUtils.setBaseModelDefault(wellhead, session);
             }
-            BaseUtils.batchInsert(BasePowerLineWellheadMapper.class, BasePowerLineWellhead.class, wellheads);
+            BaseUtils.batchInsert(BasePowerLineWellheadMapper.class, BasePowerLineWellheadEnt.class, wellheads);
         }
         //新增光伏配置
         if (CollUtil.isNotEmpty(plantInputs)) {
-            List<BasePowerLinePlant> plants = XCopyUtils.copyNewList(plantInputs, BasePowerLinePlant.class);
-            for (BasePowerLinePlant plant : plants) {
+            List<BasePowerLinePlantEnt> plants = XCopyUtils.copyNewList(plantInputs, BasePowerLinePlantEnt.class);
+            for (BasePowerLinePlantEnt plant : plants) {
                 plant.setLineId(lineId);
                 plant.setOuId(ouId);
                 BaseUtils.setBaseModelDefault(plant, session);
             }
-            BaseUtils.batchInsert(BasePowerLinePlantMapper.class, BasePowerLinePlant.class, plants);
+            BaseUtils.batchInsert(BasePowerLinePlantMapper.class, BasePowerLinePlantEnt.class, plants);
         }
         //新增储能配置
         if (CollUtil.isNotEmpty(storageInputs)) {
-            List<BasePowerLineStorage> storages = XCopyUtils.copyNewList(storageInputs, BasePowerLineStorage.class);
-            for (BasePowerLineStorage storage : storages) {
+            List<BasePowerLineStorageEnt> storages = XCopyUtils.copyNewList(storageInputs, BasePowerLineStorageEnt.class);
+            for (BasePowerLineStorageEnt storage : storages) {
                 storage.setLineId(lineId);
                 storage.setOuId(ouId);
                 BaseUtils.setBaseModelDefault(storage, session);
             }
-            BaseUtils.batchInsert(BasePowerLineStorageMapper.class, BasePowerLineStorage.class, storages);
+            BaseUtils.batchInsert(BasePowerLineStorageMapper.class, BasePowerLineStorageEnt.class, storages);
         }
         //新增柴发配置
         if (CollUtil.isNotEmpty(dieselInputs)) {
-            List<BasePowerLineDiesel> diesels = XCopyUtils.copyNewList(dieselInputs, BasePowerLineDiesel.class);
-            for (BasePowerLineDiesel diesel : diesels) {
+            List<BasePowerLineDieselEnt> diesels = XCopyUtils.copyNewList(dieselInputs, BasePowerLineDieselEnt.class);
+            for (BasePowerLineDieselEnt diesel : diesels) {
                 diesel.setLineId(lineId);
                 diesel.setOuId(ouId);
                 BaseUtils.setBaseModelDefault(diesel, session);
             }
-            BaseUtils.batchInsert(BasePowerLineDieselMapper.class, BasePowerLineDiesel.class, diesels);
+            BaseUtils.batchInsert(BasePowerLineDieselMapper.class, BasePowerLineDieselEnt.class, diesels);
         }
     }
 
@@ -393,23 +393,23 @@ public class BasePowerLineService {
     private void deleteLineRelation(XContext context, String lineId) {
         //删除井口关联信息
         BasePowerLineWellheadMapper wellheadMapper = context.getBean(BasePowerLineWellheadMapper.class);
-        wellheadMapper.delete(new LambdaQueryWrapper<BasePowerLineWellhead>()
-                .eq(BasePowerLineWellhead::getLineId, lineId)
+        wellheadMapper.delete(new LambdaQueryWrapper<BasePowerLineWellheadEnt>()
+                .eq(BasePowerLineWellheadEnt::getLineId, lineId)
         );
         //删除光伏关联信息
         BasePowerLinePlantMapper plantMapper = context.getBean(BasePowerLinePlantMapper.class);
-        plantMapper.delete(new LambdaQueryWrapper<BasePowerLinePlant>()
-                .eq(BasePowerLinePlant::getLineId, lineId)
+        plantMapper.delete(new LambdaQueryWrapper<BasePowerLinePlantEnt>()
+                .eq(BasePowerLinePlantEnt::getLineId, lineId)
         );
         //删除储能关联信息
         BasePowerLineStorageMapper storageMapper = context.getBean(BasePowerLineStorageMapper.class);
-        storageMapper.delete(new LambdaQueryWrapper<BasePowerLineStorage>()
-                .eq(BasePowerLineStorage::getLineId, lineId)
+        storageMapper.delete(new LambdaQueryWrapper<BasePowerLineStorageEnt>()
+                .eq(BasePowerLineStorageEnt::getLineId, lineId)
         );
         //删除柴发关联信息
         BasePowerLineDieselMapper dieselMapper = context.getBean(BasePowerLineDieselMapper.class);
-        dieselMapper.delete(new LambdaQueryWrapper<BasePowerLineDiesel>()
-                .eq(BasePowerLineDiesel::getLineId, lineId)
+        dieselMapper.delete(new LambdaQueryWrapper<BasePowerLineDieselEnt>()
+                .eq(BasePowerLineDieselEnt::getLineId, lineId)
         );
     }
 }

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

@@ -62,13 +62,13 @@ public class BasePriceStrategyService {
         PpsUserSession session = context.getSession(PpsUserSession.class);
         return XTransactionHelper.begin(context, () -> {
             BasePriceStrategyMapper mapper = context.getBean(BasePriceStrategyMapper.class);
-            BasePriceStrategy entity = XCopyUtils.copyNewObject(input, BasePriceStrategy.class);
+            BasePriceStrategyEnt entity = XCopyUtils.copyNewObject(input, BasePriceStrategyEnt.class);
             BaseUtils.setBaseModelDefault(entity, session);
             mapper.insert(entity);
             String strategyId = entity.getId();
             List<CreateBasePriceStrategyMonthInput> inputMonths = input.getMonths();
             if (CollUtil.isNotEmpty(inputMonths)) {
-                List<BasePriceStrategyMonth> monthList = XCopyUtils.copyNewList(inputMonths, BasePriceStrategyMonth.class);
+                List<BasePriceStrategyMonthEnt> monthList = XCopyUtils.copyNewList(inputMonths, BasePriceStrategyMonthEnt.class);
                 BasePriceStrategyMonthMapper monthMapper = context.getBean(BasePriceStrategyMonthMapper.class);
                 this.saveStrategyMonthDetail(monthMapper, monthList, strategyId, session);
             }
@@ -91,30 +91,30 @@ public class BasePriceStrategyService {
         String strategyId = input.getId();
         return XTransactionHelper.begin(context, () -> {
             BasePriceStrategyMapper mapper = context.getBean(BasePriceStrategyMapper.class);
-            BasePriceStrategy entity = mapper.selectOne(new LambdaQueryWrapper<BasePriceStrategy>()
+            BasePriceStrategyEnt entity = mapper.selectOne(new LambdaQueryWrapper<BasePriceStrategyEnt>()
                     .eq(BaseModel::getId, strategyId));
             if (Objects.isNull(entity)) {
                 return XServiceResult.error(context, XError.NotFound);
             }
             List<UpdateBasePriceStrategyMonthInput> inputMonths = input.getMonths();
             if (CollUtil.isNotEmpty(inputMonths)) {
-                List<BasePriceStrategyMonth> monthList = XCopyUtils.copyNewList(inputMonths, BasePriceStrategyMonth.class);
+                List<BasePriceStrategyMonthEnt> monthList = XCopyUtils.copyNewList(inputMonths, BasePriceStrategyMonthEnt.class);
                 List<String> collect = monthList.stream()
-                        .map(BasePriceStrategyMonth::getStrategyMonth)
+                        .map(BasePriceStrategyMonthEnt::getStrategyMonth)
                         .collect(Collectors.toList());
                 BasePriceStrategyMonthMapper monthMapper = context.getBean(BasePriceStrategyMonthMapper.class);
                 //删除月信息
-                monthMapper.delete(new QueryWrapper<BasePriceStrategyMonth>()
+                monthMapper.delete(new QueryWrapper<BasePriceStrategyMonthEnt>()
                         .lambda()
-                        .eq(BasePriceStrategyMonth::getStrategyId, strategyId)
-                        .in(BasePriceStrategyMonth::getStrategyMonth, collect)
+                        .eq(BasePriceStrategyMonthEnt::getStrategyId, strategyId)
+                        .in(BasePriceStrategyMonthEnt::getStrategyMonth, collect)
                 );
                 BasePriceStrategyDetailMapper detailMapper = context.getBean(BasePriceStrategyDetailMapper.class);
                 //删除详情
-                detailMapper.delete(new QueryWrapper<BasePriceStrategyDetail>()
+                detailMapper.delete(new QueryWrapper<BasePriceStrategyDetailEnt>()
                         .lambda()
-                        .eq(BasePriceStrategyDetail::getStrategyId, strategyId)
-                        .in(BasePriceStrategyDetail::getStrategyMonth, collect)
+                        .eq(BasePriceStrategyDetailEnt::getStrategyId, strategyId)
+                        .in(BasePriceStrategyDetailEnt::getStrategyMonth, collect)
                 );
                 this.saveStrategyMonthDetail(monthMapper, monthList, strategyId, session);
             }
@@ -143,21 +143,21 @@ public class BasePriceStrategyService {
         }
         return XTransactionHelper.begin(context, () -> {
             BasePriceStrategyMapper mapper = context.getBean(BasePriceStrategyMapper.class);
-            BasePriceStrategy entity = mapper.selectOne(new LambdaQueryWrapper<BasePriceStrategy>()
+            BasePriceStrategyEnt entity = mapper.selectOne(new LambdaQueryWrapper<BasePriceStrategyEnt>()
                     .eq(BaseModel::getId, strategyId));
             if (Objects.isNull(entity)) {
                 return XServiceResult.error(context, XError.NotFound);
             }
             //删除月数据
             BasePriceStrategyMonthMapper monthMapper = context.getBean(BasePriceStrategyMonthMapper.class);
-            monthMapper.delete(new QueryWrapper<BasePriceStrategyMonth>()
+            monthMapper.delete(new QueryWrapper<BasePriceStrategyMonthEnt>()
                     .lambda()
-                    .eq(BasePriceStrategyMonth::getStrategyId, strategyId));
+                    .eq(BasePriceStrategyMonthEnt::getStrategyId, strategyId));
             //删除明细数据
             BasePriceStrategyDetailMapper detailMapper = context.getBean(BasePriceStrategyDetailMapper.class);
-            detailMapper.delete(new QueryWrapper<BasePriceStrategyDetail>()
+            detailMapper.delete(new QueryWrapper<BasePriceStrategyDetailEnt>()
                     .lambda()
-                    .eq(BasePriceStrategyDetail::getStrategyId, strategyId));
+                    .eq(BasePriceStrategyDetailEnt::getStrategyId, strategyId));
             mapper.deleteById(entity);
             return XServiceResult.OK;
         });
@@ -176,39 +176,39 @@ public class BasePriceStrategyService {
     public XSingleResult<GetBasePriceStrategyOutput> getBasePriceStrategy(XContext context, GetBasePriceStrategyInput input) {
         BasePriceStrategyMapper mapper = context.getBean(BasePriceStrategyMapper.class);
         String strategyId = input.getId();
-        QueryWrapper<BasePriceStrategy> queryWrapper = new QueryWrapper<>();
+        QueryWrapper<BasePriceStrategyEnt> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda()
-                .select(BasePriceStrategy::getId,
-                        BasePriceStrategy::getPolicyName,
-                        BasePriceStrategy::getAreaCode,
-                        BasePriceStrategy::getStrategyYear,
-                        BasePriceStrategy::getIsFixedPrice,
-                        BasePriceStrategy::getFixedElectricityPrice)
-                .eq(BasePriceStrategy::getId, strategyId);
-        BasePriceStrategy entity = mapper.selectOne(queryWrapper);
+                .select(BasePriceStrategyEnt::getId,
+                        BasePriceStrategyEnt::getPolicyName,
+                        BasePriceStrategyEnt::getAreaCode,
+                        BasePriceStrategyEnt::getStrategyYear,
+                        BasePriceStrategyEnt::getIsFixedPrice,
+                        BasePriceStrategyEnt::getFixedElectricityPrice)
+                .eq(BasePriceStrategyEnt::getId, strategyId);
+        BasePriceStrategyEnt entity = mapper.selectOne(queryWrapper);
         if (Objects.isNull(entity)) {
             return XSingleResult.error(context, XError.NotFound);
         }
         GetBasePriceStrategyOutput output = XCopyUtils.copyNewObject(entity, GetBasePriceStrategyOutput.class);
         //查月份
         BasePriceStrategyMonthMapper monthMapper = context.getBean(BasePriceStrategyMonthMapper.class);
-        List<BasePriceStrategyMonth> monthEntList = monthMapper.selectList(new QueryWrapper<BasePriceStrategyMonth>()
+        List<BasePriceStrategyMonthEnt> monthEntList = monthMapper.selectList(new QueryWrapper<BasePriceStrategyMonthEnt>()
                 .lambda()
-                .select(BasePriceStrategyMonth::getId, BasePriceStrategyMonth::getStrategyMonth)
-                .eq(BasePriceStrategyMonth::getStrategyId, strategyId));
+                .select(BasePriceStrategyMonthEnt::getId, BasePriceStrategyMonthEnt::getStrategyMonth)
+                .eq(BasePriceStrategyMonthEnt::getStrategyId, strategyId));
         if (CollUtil.isNotEmpty(monthEntList)) {
             List<GetBasePriceStrategyMonthOutput> months = XCopyUtils.copyNewList(monthEntList, GetBasePriceStrategyMonthOutput.class);
             //查明细
             BasePriceStrategyDetailMapper detailMapper = context.getBean(BasePriceStrategyDetailMapper.class);
-            List<BasePriceStrategyDetail> detailEntList = detailMapper.selectList(new QueryWrapper<BasePriceStrategyDetail>()
+            List<BasePriceStrategyDetailEnt> detailEntList = detailMapper.selectList(new QueryWrapper<BasePriceStrategyDetailEnt>()
                     .lambda()
-                    .select(BasePriceStrategyDetail::getStrategyMonth,
-                            BasePriceStrategyDetail::getPeriodTypeKey,
-                            BasePriceStrategyDetail::getStartTime,
-                            BasePriceStrategyDetail::getEndTime,
-                            BasePriceStrategyDetail::getElectrovalence,
-                            BasePriceStrategyDetail::getInternalSettlementPrice)
-                    .eq(BasePriceStrategyDetail::getStrategyId, strategyId));
+                    .select(BasePriceStrategyDetailEnt::getStrategyMonth,
+                            BasePriceStrategyDetailEnt::getPeriodTypeKey,
+                            BasePriceStrategyDetailEnt::getStartTime,
+                            BasePriceStrategyDetailEnt::getEndTime,
+                            BasePriceStrategyDetailEnt::getElectrovalence,
+                            BasePriceStrategyDetailEnt::getInternalSettlementPrice)
+                    .eq(BasePriceStrategyDetailEnt::getStrategyId, strategyId));
             if (CollUtil.isNotEmpty(detailEntList)) {
                 Map<String, String> dictMap = ServiceUtil.getDictMap(context, DictTypeConstant.TIME_FRAME);
                 List<GetBasePriceStrategyDetailOutput> detailOutputs = XCopyUtils.copyNewList(detailEntList, GetBasePriceStrategyDetailOutput.class);
@@ -277,13 +277,13 @@ public class BasePriceStrategyService {
         String strategyYear = input.getStrategyYear();
         Integer isFixedPrice = input.getIsFixedPrice();
         BasePriceStrategyMapper mapper = context.getBean(BasePriceStrategyMapper.class);
-        List<BasePriceStrategy> selectList = mapper.selectList(new LambdaQueryWrapper<BasePriceStrategy>()
-                .select(BaseModel::getId, BasePriceStrategy::getPolicyName)
+        List<BasePriceStrategyEnt> selectList = mapper.selectList(new LambdaQueryWrapper<BasePriceStrategyEnt>()
+                .select(BaseModel::getId, BasePriceStrategyEnt::getPolicyName)
                 .eq(StringUtils.isNotBlank(id), BaseModel::getId, id)
-                .like(StringUtils.isNotBlank(policyName), BasePriceStrategy::getPolicyName, policyName)
-                .eq(Objects.nonNull(areaCode), BasePriceStrategy::getAreaCode, areaCode)
-                .eq(Objects.nonNull(strategyYear), BasePriceStrategy::getStrategyYear, strategyYear)
-                .eq(Objects.nonNull(isFixedPrice), BasePriceStrategy::getIsFixedPrice, isFixedPrice)
+                .like(StringUtils.isNotBlank(policyName), BasePriceStrategyEnt::getPolicyName, policyName)
+                .eq(Objects.nonNull(areaCode), BasePriceStrategyEnt::getAreaCode, areaCode)
+                .eq(Objects.nonNull(strategyYear), BasePriceStrategyEnt::getStrategyYear, strategyYear)
+                .eq(Objects.nonNull(isFixedPrice), BasePriceStrategyEnt::getIsFixedPrice, isFixedPrice)
                 .orderByDesc(BaseModel::getModifyTime)
         );
         List<DynamicQueryBasePriceStrategyOutput> strategyOutputList = XCopyUtils.copyNewList(selectList, DynamicQueryBasePriceStrategyOutput.class);
@@ -301,8 +301,8 @@ public class BasePriceStrategyService {
      */
     private boolean checkStrategyIsReference(XContext context, String strategyId) {
         BasePowerLineMapper mapper = context.getBean(BasePowerLineMapper.class);
-        Long count = mapper.selectCount(new LambdaQueryWrapper<BasePowerLine>()
-                .eq(BasePowerLine::getStrategyId, strategyId)
+        Long count = mapper.selectCount(new LambdaQueryWrapper<BasePowerLineEnt>()
+                .eq(BasePowerLineEnt::getStrategyId, strategyId)
         );
         return count > 0;
     }
@@ -315,21 +315,21 @@ public class BasePriceStrategyService {
      * @param strategyId  战略id
      * @param session     会话
      */
-    private void saveStrategyMonthDetail(BasePriceStrategyMonthMapper monthMapper, List<BasePriceStrategyMonth> monthList, String strategyId, PpsUserSession session) {
+    private void saveStrategyMonthDetail(BasePriceStrategyMonthMapper monthMapper, List<BasePriceStrategyMonthEnt> monthList, String strategyId, PpsUserSession session) {
         String strategyMonth;
-        List<BasePriceStrategyDetail> detailList;
-        for (BasePriceStrategyMonth monthEnt : monthList) {
+        List<BasePriceStrategyDetailEnt> detailList;
+        for (BasePriceStrategyMonthEnt monthEnt : monthList) {
             monthEnt.setStrategyId(strategyId);
             BaseUtils.setBaseModelDefault(monthEnt, session);
             monthMapper.insert(monthEnt);
             strategyMonth = monthEnt.getStrategyMonth();
             detailList = monthEnt.getDetails();
-            for (BasePriceStrategyDetail detailEnt : detailList) {
+            for (BasePriceStrategyDetailEnt detailEnt : detailList) {
                 detailEnt.setStrategyId(strategyId);
                 detailEnt.setStrategyMonth(strategyMonth);
                 BaseUtils.setBaseModelDefault(detailEnt, session);
             }
-            BaseUtils.batchInsert(BasePriceStrategyDetailMapper.class, BasePriceStrategyDetail.class, detailList);
+            BaseUtils.batchInsert(BasePriceStrategyDetailMapper.class, BasePriceStrategyDetailEnt.class, detailList);
         }
     }
 }
\ No newline at end of file