feat(能源管理系统): 系统开发

1.开发基础信息配置-市电峰谷配置模块删除功能,完成接口冒烟测试并生成接口文档;

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

 package pps.core.base.mapper;
 
-import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 import pps.core.base.entity.BasePriceStrategyDetailView;
-import pps.core.base.entity.BasePriceStrategyMonthEnt;
 
 import java.util.List;
 
@@ -18,14 +16,4 @@ public interface BasePriceStrategyDetailViewMapper {
     BasePriceStrategyDetailView selectOne(BasePriceStrategyDetailView record);
 
     List<BasePriceStrategyDetailView> selectList(BasePriceStrategyDetailView record);
-
-    /**
-     * 删除月份对应详情信息
-     *
-     * @param strategyId 战略id
-     * @param monthList  月清单
-     * @return int
-     */
-    int deleteBatchByStrategyMonth(@Param(value = "strategyId") String strategyId,
-                                   @Param(value = "monthList") List<BasePriceStrategyMonthEnt> monthList);
 }

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

 package pps.core.base.mapper;
 
-import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
-import pps.core.base.entity.BasePriceStrategyMonthEnt;
 import pps.core.base.entity.BasePriceStrategyMonthView;
 
 import java.util.List;
@@ -18,14 +16,4 @@ public interface BasePriceStrategyMonthViewMapper {
     BasePriceStrategyMonthView selectOne(BasePriceStrategyMonthView record);
 
     List<BasePriceStrategyMonthView> selectList(BasePriceStrategyMonthView record);
-
-    /**
-     * 删除月份对应详情信息
-     *
-     * @param strategyId 战略id
-     * @param monthList  月清单
-     * @return int
-     */
-    int deleteBatchByStrategyMonth(@Param(value = "strategyId") String strategyId,
-                                   @Param(value = "monthList") List<BasePriceStrategyMonthEnt> monthList);
 }

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

@@ -8,7 +8,10 @@ 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.*;
+import pps.core.base.mapper.BasePriceStrategyDetailMapper;
+import pps.core.base.mapper.BasePriceStrategyMapper;
+import pps.core.base.mapper.BasePriceStrategyMonthMapper;
+import pps.core.base.mapper.BasePriceStrategyViewMapper;
 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.UpdateBasePriceStrategyMonthInput;
@@ -32,6 +35,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 /**
  * 市电峰谷配置模块
@@ -69,7 +73,9 @@ public class BasePriceStrategyService {
             if (!inputMonths.isEmpty()) {
                 List<BasePriceStrategyMonthEnt> monthList = new ArrayList<>(16);
                 XCopyUtils.copyList(inputMonths, monthList, BasePriceStrategyMonthEnt.class);
-                this.saveStrategyMonthDetail(context, monthList, strategyId, session);
+                BasePriceStrategyMonthMapper monthMapper = context.getBean(BasePriceStrategyMonthMapper.class);
+                BasePriceStrategyDetailMapper detailMapper = context.getBean(BasePriceStrategyDetailMapper.class);
+                this.saveStrategyMonthDetail(monthMapper, detailMapper, monthList, strategyId, session);
             }
             return XServiceResult.OK;
         });
@@ -103,13 +109,24 @@ public class BasePriceStrategyService {
             if (!inputMonths.isEmpty()) {
                 List<BasePriceStrategyMonthEnt> monthList = new ArrayList<>(16);
                 XCopyUtils.copyList(inputMonths, monthList, BasePriceStrategyMonthEnt.class);
+                List<Integer> collect = monthList.stream()
+                        .map(BasePriceStrategyMonthEnt::getStrategyMonth)
+                        .collect(Collectors.toList());
+                BasePriceStrategyMonthMapper monthMapper = context.getBean(BasePriceStrategyMonthMapper.class);
                 //删除月信息
-                BasePriceStrategyMonthViewMapper monthViewMapper = context.getBean(BasePriceStrategyMonthViewMapper.class);
-                monthViewMapper.deleteBatchByStrategyMonth(strategyId, monthList);
+                monthMapper.delete(new QueryWrapper<BasePriceStrategyMonthEnt>()
+                        .lambda()
+                        .eq(BasePriceStrategyMonthEnt::getStrategyId, strategyId)
+                        .in(BasePriceStrategyMonthEnt::getStrategyMonth, collect)
+                );
+                BasePriceStrategyDetailMapper detailMapper = context.getBean(BasePriceStrategyDetailMapper.class);
                 //删除详情
-                BasePriceStrategyDetailViewMapper detailViewMapper = context.getBean(BasePriceStrategyDetailViewMapper.class);
-                detailViewMapper.deleteBatchByStrategyMonth(strategyId, monthList);
-                this.saveStrategyMonthDetail(context, monthList, strategyId, session);
+                detailMapper.delete(new QueryWrapper<BasePriceStrategyDetailEnt>()
+                        .lambda()
+                        .eq(BasePriceStrategyDetailEnt::getStrategyId, strategyId)
+                        .in(BasePriceStrategyDetailEnt::getStrategyMonth, collect)
+                );
+                this.saveStrategyMonthDetail(monthMapper, detailMapper, monthList, strategyId, session);
             }
             XCopyUtils.copyObject(input, entity);
             this.setBasePriceStrategyEntDefault(entity, session);
@@ -235,14 +252,13 @@ public class BasePriceStrategyService {
     /**
      * 保存策略明细
      *
-     * @param context    上下文
+     * @param monthMapper  月映射器
+     * @param detailMapper 细节映射器
      * @param monthList    月清单
      * @param strategyId   战略id
      * @param session      会话
      */
-    private void saveStrategyMonthDetail(XContext context, List<BasePriceStrategyMonthEnt> monthList, String strategyId, PpsUserSession session) {
-        BasePriceStrategyMonthMapper monthMapper = context.getBean(BasePriceStrategyMonthMapper.class);
-        BasePriceStrategyDetailMapper detailMapper = context.getBean(BasePriceStrategyDetailMapper.class);
+    private void saveStrategyMonthDetail(BasePriceStrategyMonthMapper monthMapper, BasePriceStrategyDetailMapper detailMapper, List<BasePriceStrategyMonthEnt> monthList, String strategyId, PpsUserSession session) {
         Integer strategyMonth;
         List<BasePriceStrategyDetailEnt> detailList;
         for (BasePriceStrategyMonthEnt monthEnt : monthList) {

C09-base/pps-core-base/src/main/resources/mybatis/mapper/pps/core/base/BasePriceStrategyDetailViewMapper.xml

@@ -50,14 +50,4 @@
         where
         id=#{id}
     </select>
-
-    <delete id="deleteBatchByStrategyMonth">
-        DELETE
-        FROM base_price_strategy_detail
-        WHERE strategy_id = #{strategyId}
-        AND strategy_month IN
-        <foreach collection="monthList" open="(" close=")" item="item" separator=",">
-            #{item.strategyMonth}
-        </foreach>
-    </delete>
 </mapper>
\ No newline at end of file

C09-base/pps-core-base/src/main/resources/mybatis/mapper/pps/core/base/BasePriceStrategyMonthViewMapper.xml

@@ -40,14 +40,4 @@
         where
         id=#{id}
     </select>
-
-    <delete id="deleteBatchByStrategyMonth">
-        DELETE
-        FROM base_price_strategy_month
-        WHERE strategy_id = #{strategyId}
-        AND strategy_month IN
-        <foreach collection="monthList" open="(" close=")" item="item" separator=",">
-            #{item.strategyMonth}
-        </foreach>
-    </delete>
 </mapper>
\ No newline at end of file