feat(零碳): 长庆

1.邮件发送服务代码修改,修改配置文件及发送逻辑,解决邮件名称唯一性;
2.邮件接收功能修改,解决邮件接收协议修改后导致的一系列问题;
3.长期间开优化功能修改,修改定时任务处理逻辑及执行周期;
4.中期间开优化功能修改,修改定时任务处理逻辑及执行周期;
5.超长期间开优化功能开发,开发相关接口及定时任务,创建对应数据表,生成对应接口文档并完成接口冒烟测试;
6.超短期间开优化功能开发,开发相关接口及定时任务,创建对应数据表,生成对应接口文档并完成接口冒烟测试;
7.组织线路树功能修改,重构查询逻辑;
8.间开优化历史功能修改,重构查询逻辑;
9.开发当日已优化间开结果列表查询接口,生成对应接口文档并完成接口冒烟测试;

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -67,7 +67,8 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
         DateTime saveHour = DateUtil.beginOfHour(now);
         BigDecimal photovoltaicPower;
         BigDecimal meterPower;
-        LambdaQueryWrapper<ThirdActivePowerEnt> queryWrapper = new LambdaQueryWrapper<>();
+        LambdaQueryWrapper<ThirdActivePowerEnt> queryWrapper = new LambdaQueryWrapper<ThirdActivePowerEnt>()
+                .select(ThirdActivePowerEnt::getId);
         for (GetThirdActivePowerViewOutput o : outputs) {
             photovoltaicPower = o.getPhotovoltaicPower().abs();
             meterPower = o.getMeterPower().abs();
@@ -82,7 +83,7 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
                             .inputTime(now)
                             .build()
             );
-            queryWrapper.and(w -> w.eq(ThirdActivePowerEnt::getStationName, o.getStationName())
+            queryWrapper.or(w -> w.eq(ThirdActivePowerEnt::getStationName, o.getStationName())
                     .eq(ThirdActivePowerEnt::getCreateDate, o.getCreateDate())
                     .eq(ThirdActivePowerEnt::getPhotovoltaicPower, o.getPhotovoltaicPower())
                     .eq(ThirdActivePowerEnt::getMeterPower, o.getMeterPower())
@@ -101,17 +102,23 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
                             .build()
             );
         }
+        return XTransactionHelper.begin(context, () -> {
+            //删除重复数据
             ThirdActivePowerMapper powerMapper = context.getBean(ThirdActivePowerMapper.class);
             List<ThirdActivePowerEnt> list = powerMapper.selectList(queryWrapper);
-        return XTransactionHelper.begin(context, () -> {
-//            ThirdActivePowerViewMapper mapper = context.getBean(ThirdActivePowerViewMapper.class);
-//            //保存历史数据
-//            mapper.batchInsertList(dtoList);
-//            ThirdActivePowerDailyUpdateViewMapper dailyMapper = context.getBean(ThirdActivePowerDailyUpdateViewMapper.class);
-//            //删除当日最新数据
-//            dailyMapper.deleteByCurrentDayData(dtoDailyList, saveHour);
-//            //保存当日最新数据
-//            dailyMapper.batchInsertList(dtoDailyList);
+            if (CollUtil.isNotEmpty(list)) {
+                powerMapper.deleteBatchIds(list.stream()
+                        .map(ThirdActivePowerEnt::getId)
+                        .collect(Collectors.toList()));
+            }
+            ThirdActivePowerViewMapper mapper = context.getBean(ThirdActivePowerViewMapper.class);
+            //保存历史数据
+            mapper.batchInsertList(dtoList);
+            ThirdActivePowerDailyUpdateViewMapper dailyMapper = context.getBean(ThirdActivePowerDailyUpdateViewMapper.class);
+            //删除当日最新数据
+            dailyMapper.deleteByCurrentDayData(dtoDailyList, saveHour);
+            //保存当日最新数据
+            dailyMapper.batchInsertList(dtoDailyList);
             return XServiceResult.OK;
         });
     }