1.泰和逆变器实时运行数据日、月、年、总发电量需要进行系数转换

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

@@ -258,15 +258,20 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         if (!stationBasic.getStationType().equals("FDZ")) {
             result.forEach(esEquipments -> {
                 if (esEquipments.getEquipmentIndexName().equals("日发电量")) {
-                    esEquipments.setValue(String.format(CommonConstans.Fourdecimalplaces, Double.valueOf(esEquipments.getValue()) * CommonConstans.pvGenPoweActor * CommonConstans.pvGenPoweActorDay));
+                    esEquipments.setValueF(Float.valueOf(String.format(CommonConstans.Fourdecimalplaces, esEquipments.getValueF() * CommonConstans.pvGenPoweActor * CommonConstans.pvGenPoweActorDay)));
                 }
                 if (powerOther.contains(esEquipments.getEquipmentIndexName())) {
-                    esEquipments.setValue(String.format(CommonConstans.Fourdecimalplaces, Double.valueOf(esEquipments.getValue()) * CommonConstans.pvGenPoweActorCurrentData));
+                    esEquipments.setValueF(Float.valueOf(String.format(CommonConstans.Fourdecimalplaces, esEquipments.getValueF() * CommonConstans.pvGenPoweActorCurrentData)));
                 }
             });
         }
         result.stream().forEach(e -> {
+            if(powerOther.contains(e.getEquipmentIndexName())||e.getEquipmentIndexName().equals("日发电量")){
+                e.setValue(String.format(CommonConstans.Fourdecimalplaces, e.getValueF()));
+            }else{
                 e.setValue(String.format(CommonConstans.Twodecimalplaces, e.getValueF()));
+            }
+
         });
         Collator instance = Collator.getInstance(Locale.CHINA);
         Integer traceIdCount = result.stream().filter(esEquipments -> !StringUtils.isEmpty(esEquipments.getTraceId())).collect(Collectors.toList()).size();