feat(能源管理系统): 测试问题修复

1.修改基础信息配置--井口配置模块,新增/修改接口,增加井口编号重复校验及必填项校验逻辑;
2.修改基础信息配置--井口配置模块,修改接口,解决部分字段丢失导致数据未更新问题;
3.修改基础信息配置--柴发设备配置模块,新增/修改接口,增加出场编号重复校验及必填项校验逻辑;
4.修改基础信息配置--储能设备配置模块,新增/修改接口,增加出场编号重复校验及必填项校验逻辑;
5.修改基础信息配置--光伏电站配置模块,新增/修改接口,增加出场编号重复校验及必填项校验逻辑;
6.修改基础信息配置--间开制度管理模块,设为基础制度/重新优化接口,增加业务逻辑初始化校准周期;
7.修改间开制度管理--定期校准模块重新优化接口,解决离网型线路优化时间超过一天问题;
8.修改系统管理Cloud模块,查询子集组织列表接口,增加查询逻辑,解决查询出重复数据问题;
9.修改间开制度管理--定期校准模块重新优化接口,解决离网型线路优化跨月导致数据异常问题;

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -50,9 +50,7 @@ public class PlantPredictedPowerCloudServiceImpl implements IPlantPredictedPower
                     PlantPredictedPowerLongTermDataMapper longTermDataMapper = context.getBean(PlantPredictedPowerLongTermDataMapper.class);
                     list = longTermDataMapper.selectList(
                             new QueryWrapper<PlantPredictedPowerLongTermDataEnt>()
-                                    .select("year_time",
-                                            "month_time",
-                                            "hour_time",
+                                    .select("hour_time",
                                             "min_time",
                                             "IFNULL( AVG( power ), 0 ) AS power",
                                             "STR_TO_DATE( CONCAT( hour_time, ':', min_time ), '%H:%i:%s' ) AS create_time")
@@ -62,9 +60,7 @@ public class PlantPredictedPowerCloudServiceImpl implements IPlantPredictedPower
                                     .eq(StringUtils.isNotBlank(yearTime), PlantPredictedPowerLongTermDataEnt::getYearTime, yearTime)
                                     .eq(StringUtils.isNotBlank(monthTime), PlantPredictedPowerLongTermDataEnt::getMonthTime, monthTime)
                                     .between(!StringUtils.isAnyBlank(startTime, endTime), PlantPredictedPowerLongTermDataEnt::getDataDate, startTime, endTime)
-                                    .groupBy(PlantPredictedPowerLongTermDataEnt::getYearTime,
-                                            PlantPredictedPowerLongTermDataEnt::getMonthTime,
-                                            PlantPredictedPowerLongTermDataEnt::getHourTime,
+                                    .groupBy(PlantPredictedPowerLongTermDataEnt::getHourTime,
                                             PlantPredictedPowerLongTermDataEnt::getMinTime)
                                     .orderByAsc(PlantPredictedPowerLongTermDataEnt::getHourTime, PlantPredictedPowerLongTermDataEnt::getMinTime)
                     );
@@ -73,9 +69,7 @@ public class PlantPredictedPowerCloudServiceImpl implements IPlantPredictedPower
                     PlantPredictedPowerDataMapper mapper = context.getBean(PlantPredictedPowerDataMapper.class);
                     list = mapper.selectList(
                             new QueryWrapper<PlantPredictedPowerDataEnt>()
-                                    .select("year_time",
-                                            "month_time",
-                                            "hour_time",
+                                    .select("hour_time",
                                             "min_time",
                                             "IFNULL( AVG( power ), 0 ) AS power",
                                             "STR_TO_DATE( CONCAT( hour_time, ':', min_time ), '%H:%i:%s' ) AS create_time")
@@ -85,9 +79,7 @@ public class PlantPredictedPowerCloudServiceImpl implements IPlantPredictedPower
                                     .eq(StringUtils.isNotBlank(yearTime), PlantPredictedPowerDataEnt::getYearTime, yearTime)
                                     .eq(StringUtils.isNotBlank(monthTime), PlantPredictedPowerDataEnt::getMonthTime, monthTime)
                                     .between(!StringUtils.isAnyBlank(startTime, endTime), PlantPredictedPowerDataEnt::getDataDate, startTime, endTime)
-                                    .groupBy(PlantPredictedPowerDataEnt::getYearTime,
-                                            PlantPredictedPowerDataEnt::getMonthTime,
-                                            PlantPredictedPowerDataEnt::getHourTime,
+                                    .groupBy(PlantPredictedPowerDataEnt::getHourTime,
                                             PlantPredictedPowerDataEnt::getMinTime)
                                     .orderByAsc(PlantPredictedPowerDataEnt::getHourTime, PlantPredictedPowerDataEnt::getMinTime)
                     );

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

@@ -44,9 +44,7 @@ public class StoragePredictedPowerCloudServiceImpl implements IStoragePredictedP
         StoragePredictedPowerDataMapper mapper = context.getBean(StoragePredictedPowerDataMapper.class);
         List<StoragePredictedPowerDataEnt> list = mapper.selectList(
                 new QueryWrapper<StoragePredictedPowerDataEnt>()
-                        .select("year_time",
-                                "month_time",
-                                "hour_time",
+                        .select("hour_time",
                                 "min_time",
                                 "AVG( power ) AS power")
                         .lambda()
@@ -55,9 +53,7 @@ public class StoragePredictedPowerCloudServiceImpl implements IStoragePredictedP
                         .eq(StringUtils.isNotBlank(yearTime), StoragePredictedPowerDataEnt::getYearTime, yearTime)
                         .eq(StringUtils.isNotBlank(monthTime), StoragePredictedPowerDataEnt::getMonthTime, monthTime)
                         .between(!StringUtils.isAnyBlank(startTime, endTime), StoragePredictedPowerDataEnt::getDataDate, startTime, endTime)
-                        .groupBy(StoragePredictedPowerDataEnt::getYearTime,
-                                StoragePredictedPowerDataEnt::getMonthTime,
-                                StoragePredictedPowerDataEnt::getHourTime,
+                        .groupBy(StoragePredictedPowerDataEnt::getHourTime,
                                 StoragePredictedPowerDataEnt::getMinTime)
                         .orderByAsc(StoragePredictedPowerDataEnt::getHourTime, StoragePredictedPowerDataEnt::getMinTime)
         );