得到的

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/service/ThirdDataAccessCloudServiceImpl.java

@@ -113,36 +113,7 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
                             .build()
             );
         }
-        return XTransactionHelper.begin(context, () -> {
-            //删除重复数据
-            ThirdActivePowerMapper powerMapper = context.getBean(ThirdActivePowerMapper.class);
-            powerMapper.delete(queryWrapper);
-            ThirdActivePowerViewMapper mapper = context.getBean(ThirdActivePowerViewMapper.class);
-            //保存历史数据
-            if (CollUtil.isNotEmpty(dtoList)) {
-                if (dtoList.size() > BaseUtils.BATCH_SIZE) {
-                    List<List<ThirdActivePowerView>> subList = BaseUtils.getSubList(dtoList);
-                    subList.forEach(mapper::batchInsertList);
-                } else {
-                    mapper.batchInsertList(dtoList);
-                }
-            }
-            ThirdActivePowerDailyUpdateViewMapper dailyMapper = context.getBean(ThirdActivePowerDailyUpdateViewMapper.class);
-            //删除当日最新数据
-            dailyMapper.deleteByCurrentDayData(dtoDailyList, saveHour);
-            //保存当日最新数据
-            if (CollUtil.isNotEmpty(dtoDailyList)) {
-                if (dtoDailyList.size() > BaseUtils.BATCH_SIZE) {
-                    List<List<ThirdActivePowerDailyUpdateView>> subList = BaseUtils.getSubList(dtoDailyList);
-                    subList.forEach(dailyMapper::batchInsertList);
-                } else {
-                    dailyMapper.batchInsertList(dtoDailyList);
-                }
-            }
-            //清历史数据(给算法用)
-            dailyMapper.deleteHistory(new ThirdActivePowerDailyUpdateView());
-            return XServiceResult.OK;
-        });
+        return this.batchInsertThirdActive(context, queryWrapper, saveHour, dtoList, dtoDailyList);
     }
 
     /**
@@ -236,34 +207,7 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
                             .build()
             );
         }
-        return XTransactionHelper.begin(context, () -> {
-            //删除重复数据
-            ThirdActivePowerMapper powerMapper = context.getBean(ThirdActivePowerMapper.class);
-            powerMapper.delete(queryWrapper);
-            ThirdActivePowerViewMapper mapper = context.getBean(ThirdActivePowerViewMapper.class);
-            //保存历史数据
-            if (CollUtil.isNotEmpty(dtoList)) {
-                if (dtoList.size() > BaseUtils.BATCH_SIZE) {
-                    List<List<ThirdActivePowerView>> subList = BaseUtils.getSubList(dtoList);
-                    subList.forEach(mapper::batchInsertList);
-                } else {
-                    mapper.batchInsertList(dtoList);
-                }
-            }
-            ThirdActivePowerDailyUpdateViewMapper dailyMapper = context.getBean(ThirdActivePowerDailyUpdateViewMapper.class);
-            //删除当日最新数据
-            dailyMapper.deleteByCurrentDayData(dtoDailyList, saveHour);
-            //保存当日最新数据
-            if (CollUtil.isNotEmpty(dtoDailyList)) {
-                if (dtoDailyList.size() > BaseUtils.BATCH_SIZE) {
-                    List<List<ThirdActivePowerDailyUpdateView>> subList = BaseUtils.getSubList(dtoDailyList);
-                    subList.forEach(dailyMapper::batchInsertList);
-                } else {
-                    dailyMapper.batchInsertList(dtoDailyList);
-                }
-            }
-            return XServiceResult.OK;
-        });
+        return this.batchInsertThirdActive(context, queryWrapper, saveHour, dtoList, dtoDailyList);
     }
 
     /**
@@ -800,4 +744,47 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
         return ServiceUtil.getBasePhotovoltaicPlantList(context, new GetBasePhotovoltaicPlantCloudInput()).stream()
                 .collect(Collectors.toMap(GetBasePhotovoltaicPlantCloudOutput::getStationName, GetBasePhotovoltaicPlantCloudOutput::getId));
     }
+
+    /**
+     * 批量插入第三方实际功率
+     *
+     * @param context      上下文
+     * @param queryWrapper 查询包装器
+     * @param saveHour     节省时间
+     * @param dtoList      dto列表
+     * @param dtoDailyList dto每日清单
+     * @return {@link XServiceResult }
+     */
+    private XServiceResult batchInsertThirdActive(XContext context, LambdaQueryWrapper<ThirdActivePowerEnt> queryWrapper, DateTime saveHour,
+                                                  List<ThirdActivePowerView> dtoList, List<ThirdActivePowerDailyUpdateView> dtoDailyList) {
+        return XTransactionHelper.begin(context, () -> {
+            //删除重复数据
+            ThirdActivePowerMapper powerMapper = context.getBean(ThirdActivePowerMapper.class);
+            powerMapper.delete(queryWrapper);
+            ThirdActivePowerViewMapper mapper = context.getBean(ThirdActivePowerViewMapper.class);
+            //保存历史数据
+            if (CollUtil.isNotEmpty(dtoList)) {
+                if (dtoList.size() > BaseUtils.BATCH_SIZE) {
+                    List<List<ThirdActivePowerView>> subList = BaseUtils.getSubList(dtoList);
+                    subList.forEach(mapper::batchInsertList);
+                } else {
+                    mapper.batchInsertList(dtoList);
+                }
+            }
+            ThirdActivePowerDailyUpdateViewMapper dailyMapper = context.getBean(ThirdActivePowerDailyUpdateViewMapper.class);
+            //删除当日最新数据
+            dailyMapper.deleteByCurrentDayData(dtoDailyList, saveHour);
+            //保存当日最新数据
+            if (CollUtil.isNotEmpty(dtoDailyList)) {
+                if (dtoDailyList.size() > BaseUtils.BATCH_SIZE) {
+                    List<List<ThirdActivePowerDailyUpdateView>> subList = BaseUtils.getSubList(dtoDailyList);
+                    subList.forEach(dailyMapper::batchInsertList);
+                } else {
+                    dailyMapper.batchInsertList(dtoDailyList);
+                }
+            }
+            return XServiceResult.OK;
+        });
+    }
+
 }
\ No newline at end of file