修改大屏节约问题

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/constants/CommonConstans.java

@@ -21,7 +21,7 @@ public class CommonConstans {
 //    二氧化碳减排量（万t）=发电量（万kW·h）*0.997 * 10 / 10000
     public static final Double carbonDioxide = 0.997 * 10 / 10000;
     //    节约标准煤（万t）=发电量（万kW·h）*0.29
-    public static final Double standardCoal = 0.29;
+    public static final Double standardCoal = 0.29/10000;
     //    炭粉尘减排量（t）=发电量（万kW·h）*0.30
     public static final Double toner = 0.30;
     //    二氧化硫减排量（t）=发电量（万kW·h）*1.51

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

@@ -867,8 +867,8 @@ public class MonitoringServiceImpl {
             queryCondtion.put(CommonConstans.QueryStringEquipmentIndexName,Arrays.asList("日发电量","月发电量","年发电量"));
             queryCondtion.put(CommonConstans.QueryStringGateWayId,Arrays.asList(stationBasic.getFanGatewayId()));
             Map<String,String> shouldQueryCondtion =  new HashMap<>();
-            shouldQueryCondtion.put("frontModule","逆变器");
-            List<ESEquipments> result = commonServiceImpl.getListDataByCondtions(queryCondtion,shouldQueryCondtion,ESEquipments.class);
+            shouldQueryCondtion.put(CommonConstans.QueryStringFrontMoudle, "逆变器");
+            List<ESEquipments> result = commonServiceImpl.getListDataByCondtionsLike(queryCondtion, null, ESEquipments.class,shouldQueryCondtion);
             powerOfDayGF.updateAndGet(v -> v + commonServiceImpl.getSumByEquipmentIndxName(result, "日发电量"));
             powerOfMonthGF.updateAndGet(v -> v + commonServiceImpl.getSumByEquipmentIndxName(result, "月发电量"));
             powerOfAnnualGF.updateAndGet(v -> v + commonServiceImpl.getSumByEquipmentIndxName(result, "年发电量"));