Merge branch 'master' of https://gitlab.sunboxauto.com/tianchao/gf_back

C11-space/pps-core-space/src/main/java/pps/core/space/service/SpaceOptimizeBaseService.java

@@ -718,8 +718,7 @@ public class SpaceOptimizeBaseService {
                         int startIndex = -1;
                         for (int a = 0, avgPowerSize = avgPowerList.size(); a < avgPowerSize; a++) {
                             DynamicQueryPlantPredictedPowerOutput predictedPower = avgPowerList.get(a);
-                            if (DateUtil.parse(predictedPower.getHourTime() + predictedPower.getMinTime(), BusinessConstant.TIME_FORMAT)
-                                    .compareTo(startTimeOffset) >= 0) {
+                            if (DateUtil.date(predictedPower.getCreateTime()).compareTo(startTimeOffset) >= 0) {
                                 //判断第一口井启动时间+启动间隔时日平均光伏出力-前两口井的运行功率是否为正数
                                 if (predictedPower.getPower().compareTo(totalOperatingPower) >= 0) {
                                     //确定第二口井第一次开井时间为第一口井启动时间+启动间隔

C11-space/pps-core-space/src/main/java/pps/core/space/service/SpaceOptimizeMidPeriodService.java

@@ -171,7 +171,7 @@ public class SpaceOptimizeMidPeriodService extends SpaceOptimizeBaseService {
                         .plantIds(super.getOptimizeLineRelation(context, CollUtil.newArrayList(detailEnt))
                                 .getPlantIdsByLineIdMap()
                                 .get(detailEnt.getLineId()))
-                        .startTime(DateUtil.date(period.getCreateTime())
+                        .startTime(DateUtil.beginOfWeek(period.getCreateTime())
                                 .toString(BusinessConstant.DATE_FORMAT_DAY))
                         .endTime(DateUtil.date(period.getOptimizeDeadline())
                                 .toString(BusinessConstant.DATE_FORMAT_DAY))

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

@@ -127,7 +127,7 @@ public class PlantPredictedPowerCloudServiceImpl implements IPlantPredictedPower
                     PlantPredictedPowerLongTermDataMapper longTermDataMapper = context.getBean(PlantPredictedPowerLongTermDataMapper.class);
                     list = longTermDataMapper.selectList(
                             new QueryWrapper<PlantPredictedPowerLongTermDataEnt>()
-                                    .select("hour_time",
+                                    .select("CONCAT( hour_time, ':', REPLACE ( min_time, ':00', '' ) ) AS hour_time",
                                             "IFNULL( AVG( power ), 0 ) AS power")
                                     .lambda()
                                     .eq(StringUtils.isNotBlank(plantId), PlantPredictedPowerLongTermDataEnt::getPlantId, plantId)
@@ -135,15 +135,15 @@ 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::getHourTime)
-                                    .orderByAsc(PlantPredictedPowerLongTermDataEnt::getHourTime)
+                                    .groupBy(PlantPredictedPowerLongTermDataEnt::getHourTime, PlantPredictedPowerLongTermDataEnt::getMinTime)
+                                    .orderByAsc(PlantPredictedPowerLongTermDataEnt::getHourTime, PlantPredictedPowerLongTermDataEnt::getMinTime)
                     );
                     break;
                 case 1:
                     PlantPredictedPowerDataMapper mapper = context.getBean(PlantPredictedPowerDataMapper.class);
                     list = mapper.selectList(
                             new QueryWrapper<PlantPredictedPowerDataEnt>()
-                                    .select("hour_time",
+                                    .select("CONCAT( hour_time, ':', REPLACE ( min_time, ':00', '' ) ) AS hour_time",
                                             "IFNULL( AVG( power ), 0 ) AS power")
                                     .lambda()
                                     .eq(StringUtils.isNotBlank(plantId), PlantPredictedPowerDataEnt::getPlantId, plantId)
@@ -151,8 +151,8 @@ 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::getHourTime)
-                                    .orderByAsc(PlantPredictedPowerDataEnt::getHourTime)
+                                    .groupBy(PlantPredictedPowerDataEnt::getHourTime, PlantPredictedPowerDataEnt::getMinTime)
+                                    .orderByAsc(PlantPredictedPowerDataEnt::getHourTime, PlantPredictedPowerDataEnt::getMinTime)
                     );
                     break;
                 default: