修改发电量

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/MonitoringServiceImpl.java

@@ -656,13 +656,13 @@ public class MonitoringServiceImpl {
             }
         });
         HashMap<String, String> dayHashMap = new HashMap<>();
-        dayHashMap.put("title", String.format(CommonConstans.Twodecimalplaces, dailyPower.get()) + "万KWh");
+        dayHashMap.put("title", String.format(CommonConstans.Fourdecimalplaces, dailyPower.get()) + "万KWh");
         HashMap<String, String> monthHashMap = new HashMap<>();
-        monthHashMap.put("title", String.format(CommonConstans.Twodecimalplaces, monthlyPower.get()) + "万KWh");
+        monthHashMap.put("title", String.format(CommonConstans.Fourdecimalplaces, monthlyPower.get()) + "万KWh");
         HashMap<String, String> annualHashMap = new HashMap<>();
-        annualHashMap.put("title", String.format(CommonConstans.Twodecimalplaces, annualPower.get()) + "万KWh");
+        annualHashMap.put("title", String.format(CommonConstans.Fourdecimalplaces, annualPower.get()) + "万KWh");
         HashMap<String, String> totalHashMap = new HashMap<>();
-        totalHashMap.put("title", String.format(CommonConstans.Twodecimalplaces, annualPower.get()) + "万KWh");
+        totalHashMap.put("title", String.format(CommonConstans.Fourdecimalplaces, annualPower.get()) + "万KWh");
         hashMapList.add(dayHashMap);
         hashMapList.add(monthHashMap);
         hashMapList.add(annualHashMap);
@@ -817,7 +817,8 @@ public class MonitoringServiceImpl {
                 Map<String, String> shouldQueryCondtion = new HashMap<>();
                 shouldQueryCondtion.put(CommonConstans.QueryStringFrontMoudle, "逆变器");
                 List<ESEquipments> result = commonServiceImpl.getListDataByCondtions(queryCondtion, null, ESEquipments.class, shouldQueryCondtion);
-                total = commonServiceImpl.getSumByEquipmentIndxName(result, finalIndicator) * CommonConstans.pvGenPoweActor * CommonConstans.pvGenPoweActorDay;
+               // total = commonServiceImpl.getSumByEquipmentIndxName(result, finalIndicator) * CommonConstans.pvGenPoweActor * CommonConstans.pvGenPoweActorDay;
+                total = commonServiceImpl.getSumByEquipmentIndxName(result, finalIndicator) * CommonConstans.pvGenPoweActor ;
             } else {
                 Map<String, List<String>> queryCondtion = new HashMap<>();
                 queryCondtion.put(CommonConstans.QueryStringEquipmentIndexName, Arrays.asList(finalIndicator));