节能量统计代码修正

src/main/java/com/persagy/apm/energy/report/centermiddleware/service/impl/ICenterMiddlewareWebServiceImp.java

@@ -142,7 +142,7 @@ public class ICenterMiddlewareWebServiceImp implements ICenterMiddlewareWebServi
             }
             if (maxOrMinData == null) {
                 maxOrMinData = vo.getValue();
-            } else if (maxOrMinData != vo.getValue()) {
+            } else if (maxOrMinData.compareTo(vo.getValue()) != 0) {
                 break;
             }
             resultList.add(vo.getDate());

src/main/java/com/persagy/apm/energy/report/common/service/impl/CommonServiceImpl.java

@@ -357,6 +357,13 @@ public class CommonServiceImpl implements CommonService {
                 hotelProjectEnergyWorkOrderItem.setCompletedTime(completeTimeStr);
                 hotelProjectEnergyWorkOrderItem.setEnergySaved(workId_energyMap.get(workOrder.getOrderId()));
                 hotelProjectEnergyWorkOrderItemList.add(hotelProjectEnergyWorkOrderItem);
+                Double energySave = workId_energyMap.get(workOrder.getOrderId());
+                if (energySave != null) {
+                    if (null == totalEnergySave) {
+                        totalEnergySave = 0.0;
+                    }
+                    totalEnergySave = totalEnergySave + energySave;
+                }
             }
             hotelProjectEnergyWorkerOrderInfo.setDetailInfo(hotelProjectEnergyWorkOrderItemList);
             hotelProjectEnergyWorkerOrderInfo.setTotalEnergySave(totalEnergySave);
@@ -395,13 +402,13 @@ public class CommonServiceImpl implements CommonService {
         }
         HotelProjectChillerPlantEfficiency hotelProjectChillerPlantEfficiency = new HotelProjectChillerPlantEfficiency();
         Double avgTempCurrentMonth = emsWeatherWebService.getPjMonthAvgTemp(projectId, reportDate);
-        Double avgTempLastYearMonth = emsWeatherWebService.getPjMonthAvgTemp(projectId, reportDate);
+        Double avgTempLastYearMonth = emsWeatherWebService.getPjMonthAvgTemp(projectId, DateUtils.getYearOff(reportDate, -1));
         emsWeatherWebService.getPjMonthAvgTemp(projectId, DateUtils.getYearOff(reportDate, -1));
         hotelProjectChillerPlantEfficiency.setAverageTemperatureCurrentMonth(avgTempCurrentMonth);
         hotelProjectChillerPlantEfficiency.setAverageTemperatureLastYearSameTime(avgTempLastYearMonth);
         Double avgTempGrowth = null;
         if (avgTempCurrentMonth != null && avgTempLastYearMonth != null) {
-            avgTempGrowth = avgTempCurrentMonth = avgTempLastYearMonth;
+            avgTempGrowth = avgTempCurrentMonth - avgTempLastYearMonth;
         }
         hotelProjectChillerPlantEfficiency.setAverageTemperatureGrowth(avgTempGrowth);
         List<ProjectEERDataVo> projectEERDataVoList = iCenterMiddlewareWebService.getProjectEERDataList(pjIdList, groupCode, reportDate);
@@ -443,7 +450,7 @@ public class CommonServiceImpl implements CommonService {
                 hotelProjectChillerPlantEfficiency.setCoolingCapacityRange(coolingCapacityRange);
             }
         }
-        List<ProjectEERDataVo> currentPjLastMonthEERDataVoList = iCenterMiddlewareWebService.getProjectEERDataList(currentProjectIdList, groupCode, DateUtils.getYearOff(reportDate, -1));
+        List<ProjectEERDataVo> currentPjLastMonthEERDataVoList = iCenterMiddlewareWebService.getProjectEERDataList(currentProjectIdList, groupCode, DateUtils.getMonthOff(reportDate, -1));
         if (!CollectionUtils.isEmpty(currentPjLastMonthEERDataVoList)) {
             ProjectEERDataVo currentPjLastMonthEERDataVo = currentPjLastMonthEERDataVoList.get(0);
             if (currentPjLastMonthEERDataVo != null) {