发电量乘系数

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

@@ -4,7 +4,8 @@ import java.util.HashMap;
 
 public class CommonConstans {
     //光伏发电量系数
-    public static final Double pvGenPoweActor = 0.000001;
+    public static final Double pvGenPoweActor = 0.00001;
+    public static final Double pvGenPoweActorDay = 0.1;
     //    风电站：
 //            （日/月/年）发电量=场站所有风机（日/月/年）发电量总和
 //            装机容量=场站所有风机装机容量总和

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

@@ -9,6 +9,7 @@ import com.yeejoin.amos.boot.module.jxiop.api.mapper.StationPlanMapper;
 import com.yeejoin.amos.boot.module.jxiop.biz.ESDto.ESDailyPowerGeneration;
 import com.yeejoin.amos.boot.module.jxiop.biz.ESDto.ESEquipments;
 import com.yeejoin.amos.boot.module.jxiop.biz.ESDto.ESMoonPowerGeneration;
+import com.yeejoin.amos.boot.module.jxiop.biz.constants.CommonConstans;
 import com.yeejoin.amos.boot.module.jxiop.biz.dto.SeriesData;
 import com.yeejoin.amos.boot.module.jxiop.biz.dto.StationCacheInfoDto;
 import com.yeejoin.amos.boot.module.jxiop.biz.utils.DateUtil;
@@ -303,7 +304,7 @@ public class LargeScreenImpl {
         List<String> listdate=  dayReportnq(new Date());
         seriesData.setAxisData(listdate);
         try {
-            emqKeeper.getMqttClient().publish("country", JSON.toJSONString(seriesData).getBytes(),0,false);
+            emqKeeper.getMqttClient().publish("countryFd", JSON.toJSONString(seriesData).getBytes(),0,false);
         } catch (MqttException e) {
             e.printStackTrace();
         }
@@ -397,7 +398,7 @@ public class LargeScreenImpl {
          List<String> list= dayReport(date);
          for (String s : list) {
              if(mapdta!=null&&mapdta.containsKey(s)){
-                 listdate.add(mapdta.get(s));
+                 listdate.add(mapdta.get(s) * CommonConstans.pvGenPoweActor * CommonConstans.pvGenPoweActorDay);
              }else{
                  listdate.add(0d);
              }