发电量乘系数

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

@@ -398,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) * CommonConstans.pvGenPoweActor * CommonConstans.pvGenPoweActorDay);
+                 listdate.add(mapdta.get(s));
              }else{
                  listdate.add(0d);
              }

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

@@ -4,6 +4,7 @@ import com.yeejoin.amos.boot.module.jxiop.api.dto.IndexDto;
 import com.yeejoin.amos.boot.module.jxiop.biz.ESDto.ESDailyPowerGeneration;
 import com.yeejoin.amos.boot.module.jxiop.biz.ESDto.ESMoonPowerGeneration;
 import com.yeejoin.amos.boot.module.jxiop.biz.ESDto.ESYearPowerGeneration;
+import com.yeejoin.amos.boot.module.jxiop.biz.constants.CommonConstans;
 import com.yeejoin.amos.boot.module.jxiop.biz.dto.StationCacheInfoDto;
 import com.yeejoin.amos.boot.module.jxiop.biz.repository.ESDailyPowerGenerationRepository;
 import com.yeejoin.amos.boot.module.jxiop.biz.repository.ESMoonPowerGenerationRepository;
@@ -55,6 +56,10 @@ public class PowerGenerationImpl {
 
         querySql = String.format(querySql, gatewayId, value,daty,daty);
         List<IndexDto> queryList  = influxDButils.getListData(querySql,IndexDto.class);
+        queryList.forEach(item -> {
+            item.setValue(String.valueOf(Double.parseDouble(item.getValue()) * CommonConstans.pvGenPoweActor * CommonConstans.pvGenPoweActorDay));
+            item.setValueLabel(String.valueOf(Double.parseDouble(item.getValueLabel()) * CommonConstans.pvGenPoweActor * CommonConstans.pvGenPoweActorDay));
+        });
         return queryList;
     }
     //更新es 数据