修改月发电量值

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

@@ -88,16 +88,28 @@ public class PowerGenerationImpl {
             //"日发电量"
             if("日发电量".equals(value)){
                 //"日发电量"
-                value=  CommonConstans.taiHeGenIndicatorDay;
+                flags=  CommonConstans.pvGenPoweActor * CommonConstans.pvGenPoweActorDay;
             }else if("月发电量".equals(value)){
                 //"月发电量"
-                value= CommonConstans.taiHeGenIndicatorMonth;
+                flags= CommonConstans.pvGenPoweActorYear;
             }else{
                 //"年发电量"
-                value=  CommonConstans.taiHeGenIndicatorYear;
+                flags=  CommonConstans.pvGenPoweActorYear;
             }
-            indexDto=  indicatorDataMapper.selectlastgf(value,  stationCacheInfoDto.getBoosterGatewayId(),  startTime, endTime);
-            //indexDto= this.getlastgf(gatewayId,value,datyvalue);
+
+
+//            if("日发电量".equals(value)){
+//                //"日发电量"
+//              //  value=  CommonConstans.taiHeGenIndicatorDay;
+//            }else if("月发电量".equals(value)){
+//                //"月发电量"
+//                value= CommonConstans.taiHeGenIndicatorMonth;
+//            }else{
+//                //"年发电量"
+//                value=  CommonConstans.taiHeGenIndicatorYear;
+//            }
+          indexDto=  indicatorDataMapper.selectlastgf(value,  stationCacheInfoDto.getFanGatewayId(),  startTime, endTime);
+//            //indexDto= this.getlastgf(gatewayId,value,datyvalue);
         }
 
         SimpleDateFormat myFmt2=new SimpleDateFormat(dateFormat);
@@ -179,6 +191,7 @@ public class PowerGenerationImpl {
         List<ESMoonPowerGeneration> list=new ArrayList<>();
 
         if(indexDto!=null&&!indexDto.isEmpty()){
+
             for (IndicatorData dto : indexDto) {
                 double value=dto.getValueF()!=null?(double)dto.getValueF():0.0;
                 if(flags!=null){
@@ -201,6 +214,8 @@ public class PowerGenerationImpl {
                         year
                 );
                 list.add(moonPowerGeneration);
+
+
             }
         }
         return list;