Merge branches 'developer' and 'developer' of…

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

@@ -6,6 +6,7 @@ public class CommonConstans {
     //光伏发电量系数
     public static final Double pvGenPoweActor = 0.00001;
     public static final Double pvGenPoweActorDay = 0.1;
+    public static final Double pvGenPoweActornew = 0.0001;
     //    风电站：
 //            （日/月/年）发电量=场站所有风机（日/月/年）发电量总和
 //            装机容量=场站所有风机装机容量总和

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

@@ -941,10 +941,10 @@ public class MonitorFanIdxController extends BaseController {
                 dayMap.put("value",map.get("日发电量") == null?0:String.format("%.4f",Double.parseDouble(map.get("日发电量").toString())* CommonConstans.pvGenPoweActor*CommonConstans.pvGenPoweActorDay));
                 monthMap.put("name",name);
                 monthMap.put("gateWayId",stationBasic.getFanGatewayId());
-                monthMap.put("value",map.get("月发电量") == null?0:String.format("%.4f",Double.parseDouble(map.get("月发电量").toString())* CommonConstans.pvGenPoweActor));
+                monthMap.put("value",map.get("月发电量") == null?0:String.format("%.4f",Double.parseDouble(map.get("月发电量").toString())* CommonConstans.pvGenPoweActornew));
                 yearMap.put("name",name);
                 yearMap.put("gateWayId",stationBasic.getFanGatewayId());
-                yearMap.put("value",map.get("年发电量") == null?0:String.format("%.4f",Double.parseDouble(map.get("年发电量").toString())* CommonConstans.pvGenPoweActor));
+                yearMap.put("value",map.get("年发电量") == null?0:String.format("%.4f",Double.parseDouble(map.get("年发电量").toString())* CommonConstans.pvGenPoweActornew));
                 datDataGF.add(dayMap);
                 monthDataGF.add(monthMap);
                 yearDataGF.add(yearMap);

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

@@ -883,7 +883,14 @@ public class MonitoringServiceImpl {
                 shouldQueryCondtion.put(CommonConstans.QueryStringFrontMoudle, "逆变器");
                 List<ESEquipments> result = commonServiceImpl.getListDataByCondtions(queryCondtion, null, ESEquipments.class, shouldQueryCondtion);
                // total = commonServiceImpl.getSumByEquipmentIndxName(result, finalIndicator) * CommonConstans.pvGenPoweActor * CommonConstans.pvGenPoweActorDay;
+                if(finalIndicator.equals("日发电量")){
+                    total = commonServiceImpl.getSumByEquipmentIndxName(result, finalIndicator) * CommonConstans.pvGenPoweActor * CommonConstans.pvGenPoweActorDay;
+                }else{
                     total = commonServiceImpl.getSumByEquipmentIndxName(result, finalIndicator) * CommonConstans.pvGenPoweActor ;
+                }
+
+
+
             } else {
                 Map<String, List<String>> queryCondtion = new HashMap<>();
                 queryCondtion.put(CommonConstans.QueryStringEquipmentIndexName, Arrays.asList(finalIndicator));