提交大屏

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/MonitorFanIdxController.java

@@ -651,7 +651,7 @@ public class MonitorFanIdxController extends BaseController {
         List<Map<String, Object>> mapList;
 
         for (String column : columnList) {
-            Double result = commonServiceImpl.getTotalByIndicatiorByGF(gatewayId, column);
+            Double result =  commonServiceImpl.getTotalByIndicatiorByGF(gatewayId, column);
             if (column.equals("日发电量")) {
                 columnMap.put(column, String.format(CommonConstans.Fourdecimalplaces, result * CommonConstans.pvGenPoweActorDay));
             } else {

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

@@ -868,7 +868,7 @@ public class MonitoringServiceImpl {
             queryCondtion.put(CommonConstans.QueryStringGateWayId,Arrays.asList(stationBasic.getFanGatewayId()));
             Map<String,String> shouldQueryCondtion =  new HashMap<>();
             shouldQueryCondtion.put(CommonConstans.QueryStringFrontMoudle, "逆变器");
-            List<ESEquipments> result = commonServiceImpl.getListDataByCondtionsLike(queryCondtion, null, ESEquipments.class,shouldQueryCondtion);
+            List<ESEquipments> result = commonServiceImpl.getListDataByCondtions(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, "年发电量"));