历史计算服务修改

realtime/generationXK-service/src/main/java/com/gyee/generation/GenerationMain.java

@@ -1,9 +1,15 @@
 package com.gyee.generation;
 
+import com.gyee.common.util.DateUtils;
+import com.gyee.generation.service.*;
+import com.gyee.generation.util.SpringUtils;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
+import java.util.Calendar;
+import java.util.Date;
+
 /**
  * @ClassName : GenerationMain
  * @Author : xieshengjie
@@ -15,50 +21,88 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 public class GenerationMain {
     public static void main(String[] args) throws Exception {
         SpringApplication.run(GenerationMain.class, args);
-//
-//
-//        Calendar c = Calendar.getInstance();
-//        Date begin = null;
-//        Date end = null;
-//        c.set(Calendar.DAY_OF_MONTH, 1);
-//
-//        c.setTime(DateUtils.truncate(c.getTime()));
-//
-//        begin = new Date();
-//        System.out.println("设备指标记录调度程序执行开始!。。。。。。");
-//        for (int i = 0; i < 12; i++) {
-//
-//
-//            System.out.println(DateUtils.format(c.getTime(), "yyyy-MM-dd HH:mm:ss").toString());
-//
-//            EquipmentInfo1Service equipmentInfo1Service = SpringUtils.getBean("equipmentInfo1Service");
-//            EquipmentInfo2Service equipmentInfo2Service = SpringUtils.getBean("equipmentInfo2Service");
-//            EquipmentInfo3Service equipmentInfo3Service = SpringUtils.getBean("equipmentInfo3Service");
-//            EquipmentInfo4Service equipmentInfo4Service = SpringUtils.getBean("equipmentInfo4Service");
-//            EquipmentInfo5Service equipmentInfo5Service = SpringUtils.getBean("equipmentInfo5Service");
-//            EquipmentInfoDayTopService equipmentInfoDayTopService = SpringUtils.getBean("equipmentInfoDayTopService");
-//            WtAlysisDayService wtAlysisDayService = SpringUtils.getBean("wtAlysisDayService");
-//
-//            equipmentInfo1Service.calEquipmentInfoDay(c.getTime());
-//
-//
-//            equipmentInfoDayTopService.calEquipmentInfoDayTop(c.getTime());
-//            equipmentInfoDayTopService.calEquipmentInfoMonthTop(c.getTime());
-//            equipmentInfoDayTopService.calEquipmentInfoYearTop(c.getTime());
-//
-//            wtAlysisDayService.calEquipmentInfoDay(c.getTime());
-//
-//            c.add(Calendar.DAY_OF_MONTH, 1);
-//
-//            System.out.println("完成一次!。。。。。。");
-//        }
-//        System.out.println("设备指标记录调度程序执行结束!。。。。。。");
-//
-//
+
+
+        Calendar c = Calendar.getInstance();
+        Date begin = null;
+        Date end = null;
+        c.set(Calendar.DAY_OF_MONTH, 10);
+
+        c.setTime(DateUtils.truncate(c.getTime()));
+
+        begin = new Date();
+        System.out.println("设备指标记录调度程序执行开始!。。。。。。");
+        for (int i = 0; i < 8; i++) {
+
+
+            System.out.println(DateUtils.format(c.getTime(), "yyyy-MM-dd HH:mm:ss").toString());
+
+            EquipmentInfo1Service equipmentInfo1Service = SpringUtils.getBean("equipmentInfo1Service");
+            EquipmentInfo2Service equipmentInfo2Service = SpringUtils.getBean("equipmentInfo2Service");
+            EquipmentInfo3Service equipmentInfo3Service = SpringUtils.getBean("equipmentInfo3Service");
+            EquipmentInfo4Service equipmentInfo4Service = SpringUtils.getBean("equipmentInfo4Service");
+            EquipmentInfo5Service equipmentInfo5Service = SpringUtils.getBean("equipmentInfo5Service");
+            EquipmentInfoDayTopService equipmentInfoDayTopService = SpringUtils.getBean("equipmentInfoDayTopService");
+            WtAlysisDayService wtAlysisDayService = SpringUtils.getBean("wtAlysisDayService");
+
+            equipmentInfo1Service.calEquipmentInfoDay(c.getTime());
+            equipmentInfo2Service.calEquipmentInfoDay(c.getTime());
+            equipmentInfo3Service.calEquipmentInfoDay(c.getTime());
+            equipmentInfo5Service.calEquipmentInfoDay(c.getTime());
+            equipmentInfo4Service.calEquipmentInfoDay(c.getTime());
+
+
+            equipmentInfoDayTopService.calEquipmentInfoDayTop(c.getTime());
+            equipmentInfoDayTopService.calEquipmentInfoMonthTop(c.getTime());
+            equipmentInfoDayTopService.calEquipmentInfoYearTop(c.getTime());
+
+            wtAlysisDayService.calEquipmentInfoDay(c.getTime());
+
+
+
+            WindPowerInfo1Service windPowerInfo1Service = SpringUtils.getBean("windPowerInfo1Service");
+            WindPowerInfo2Service windPowerInfo2Service = SpringUtils.getBean("windPowerInfo2Service");
+            WindPowerInfo3Service windPowerInfo3Service = SpringUtils.getBean("windPowerInfo3Service");
+            WindPowerInfo4Service windPowerInfo4Service = SpringUtils.getBean("windPowerInfo4Service");
+//            WindPowerInfo5Service windPowerInfo5Service = SpringUtils.getBean("windPowerInfo5Service");
+            WindPowerInfo6Service windPowerInfo6Service = SpringUtils.getBean("windPowerInfo6Service");
+
+            windPowerInfo1Service.calLineInfoDay(c.getTime());
+            windPowerInfo1Service.calProjectInfoDay(c.getTime());
+            windPowerInfo1Service.calWindpowerInfoDay(c.getTime());
+            windPowerInfo1Service.calCompanyInfoDay(c.getTime());
+            windPowerInfo1Service.calRegionInfoDay(c.getTime());
+
+            windPowerInfo2Service.calLineInfoDay(c.getTime());
+            windPowerInfo2Service.calProjectInfoDay(c.getTime());
+            windPowerInfo2Service.calWindpowerInfoDay(c.getTime());
+            windPowerInfo2Service.calCompanyInfoDay(c.getTime());
+            windPowerInfo2Service.calRegionInfoDay(c.getTime());
+
+            windPowerInfo3Service.calLineInfoDay(c.getTime());
+            windPowerInfo3Service.calProjectInfoDay(c.getTime());
+            windPowerInfo3Service.calWindpowerInfoDay(c.getTime());
+            windPowerInfo3Service.calCompanyInfoDay(c.getTime());
+            windPowerInfo3Service.calRegionInfoDay(c.getTime());
+
+            windPowerInfo4Service.calLineInfoDay(c.getTime());
+            windPowerInfo4Service.calProjectInfoDay(c.getTime());
+            windPowerInfo4Service.calWindpowerInfoDay(c.getTime());
+            windPowerInfo4Service.calCompanyInfoDay(c.getTime());
+
+            c.add(Calendar.DAY_OF_MONTH, 1);
+            System.out.println(end);
+            System.out.println("完成一次!。。。。。。");
+        }
+        System.out.println("设备指标记录调度程序执行结束!。。。。。。");
+        end=new Date();
+        System.out.println("执行用时"+ DateUtils.secondsDiff(begin,end) +"秒");
+        System.out.println(end);
+
 //        c.set(Calendar.DAY_OF_MONTH, 1);
 //        c.setTime(DateUtils.truncate(c.getTime()));
 //        System.out.println("场站指标记录调度程序执行开始!。。。。。。");
-//        for (int i = 0; i < 12; i++) {
+//        for (int i = 0; i < 17; i++) {
 //
 //
 //            System.out.println(DateUtils.format(c.getTime(), "yyyy-MM-dd HH:mm:ss").toString());
@@ -76,17 +120,17 @@ public class GenerationMain {
 //            windPowerInfo1Service.calCompanyInfoDay(c.getTime());
 //            windPowerInfo1Service.calRegionInfoDay(c.getTime());
 //
-//            windPowerInfo2Service.calLineInfoDay(c.getTime());
-//            windPowerInfo2Service.calProjectInfoDay(c.getTime());
-//            windPowerInfo2Service.calWindpowerInfoDay(c.getTime());
-//            windPowerInfo2Service.calCompanyInfoDay(c.getTime());
-//            windPowerInfo2Service.calRegionInfoDay(c.getTime());
-//
-//            windPowerInfo3Service.calLineInfoDay(c.getTime());
-//            windPowerInfo3Service.calProjectInfoDay(c.getTime());
-//            windPowerInfo3Service.calWindpowerInfoDay(c.getTime());
-//            windPowerInfo3Service.calCompanyInfoDay(c.getTime());
-//            windPowerInfo3Service.calRegionInfoDay(c.getTime());
+////            windPowerInfo2Service.calLineInfoDay(c.getTime());
+////            windPowerInfo2Service.calProjectInfoDay(c.getTime());
+////            windPowerInfo2Service.calWindpowerInfoDay(c.getTime());
+////            windPowerInfo2Service.calCompanyInfoDay(c.getTime());
+////            windPowerInfo2Service.calRegionInfoDay(c.getTime());
+//
+////            windPowerInfo3Service.calLineInfoDay(c.getTime());
+////            windPowerInfo3Service.calProjectInfoDay(c.getTime());
+////            windPowerInfo3Service.calWindpowerInfoDay(c.getTime());
+////            windPowerInfo3Service.calCompanyInfoDay(c.getTime());
+////            windPowerInfo3Service.calRegionInfoDay(c.getTime());
 //
 //            windPowerInfo4Service.calLineInfoDay(c.getTime());
 //            windPowerInfo4Service.calProjectInfoDay(c.getTime());

realtime/generationXK-service/src/main/java/com/gyee/generation/config/XxlJobConfig.java

@@ -20,8 +20,9 @@
 //@Configuration
 ////@PropertySource("classpath:xxl-job-executor.properties")
 ////@PropertySource("classpath:xxl-job-executor2.properties")
-////@PropertySource("classpath:xxl-job-executor3.properties")
+//@PropertySource("classpath:xxl-job-executor3.properties")
 ////@PropertySource("classpath:xxl-job-executor4.properties")
+////@PropertySource("classpath:xxl-job-executor5.properties")
 ////@PropertySource("classpath:xxl-job-executorWPLY.properties")
 ////@PropertySource("classpath:xxl-job-executorRG.properties")
 ////@PropertySource("classpath:xxl-job-executorJN.properties")
@@ -35,7 +36,7 @@
 ////@PropertySource("classpath:xxl-job-executorGF003.properties")
 ////@PropertySource("classpath:xxl-job-executorGF004.properties")
 ////@PropertySource("classpath:xxl-job-executorGF005.properties")
-//@PropertySource("classpath:xxl-job-executorGF006.properties")
+////@PropertySource("classpath:xxl-job-executorGF006.properties")
 //
 ////@PropertySource("classpath:xxl-job-region.properties")
 //public class XxlJobConfig implements EnvironmentAware {

realtime/generationXK-service/src/main/java/com/gyee/generation/service/EquipmentInfo4Service.java

@@ -491,8 +491,15 @@ public class EquipmentInfo4Service {
                             }
 
                         }
+                        if(totalnumbere!=0)
+                        {
+                            double dfpcl = new BigDecimal(number).divide(new BigDecimal(totalnumbere), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue();
+                            pewp.setRdfpcl(dfpcl);
+                        }else
+                        {
+                            pewp.setRdfpcl(0.0);
+                        }
 
-                        pewp.setRdfpcl(number);
                     }
 
 

realtime/generationXK-service/src/main/java/com/gyee/generation/service/EquipmentInfoDayTopService.java

@@ -61,6 +61,8 @@ public class EquipmentInfoDayTopService {
 //            proEconEquipmentInfoDayTopService.removeByIds(tempids);
 //        }
 
+
+
         for (ProBasicPowerstation wp : CacheContext.wpls) {
 
             if(wp.getId().contains("GDC"))
@@ -99,9 +101,8 @@ public class EquipmentInfoDayTopService {
                 top.setDayRank(i+1);
             }
 
-
             QueryWrapper<ProEconEquipmentInfoDayTop> queryWrapper = new QueryWrapper<>();
-            queryWrapper.ge("record_date",DateUtils.truncate(recordDate)).eq("types",1);
+            queryWrapper.ge("record_date",DateUtils.truncate(recordDate)).eq("types",1).eq("windpowerstation_id",wp.getId());
             //判断是否有重复记录，先删除重复记录
             List<Long> idls = proEconEquipmentInfoDayTopService.list(queryWrapper).stream()
                     .map(ProEconEquipmentInfoDayTop::getId)
@@ -124,6 +125,7 @@ public class EquipmentInfoDayTopService {
                 proEconEquipmentInfoDayTopService.removeByIds(tempids);
             }
 
+
             List<ProEconEquipmentInfoDayTop> templs=new ArrayList<>();
             for(ProEconEquipmentInfoDayTop vo:topls)
             {
@@ -150,37 +152,7 @@ public class EquipmentInfoDayTopService {
         c.setTime(recordDate);
 
 
-        //判断是否有重复记录，先删除重复记录
-        QueryWrapper<ProEconEquipmentInfoDayTop> queryWrapper = new QueryWrapper<>();
-        queryWrapper.ge("record_date",DateUtils.truncate(recordDate)).eq("types",2);
-        List<Long> idls = proEconEquipmentInfoDayTopService.list(queryWrapper).stream()
-//                .filter(i -> i.getRecordDate().compareTo(DateUtils.truncate(recordDate)) == 0
-//                        && i.getTypes() ==2
-//                        && CacheContext.wtmap.containsKey(i.getWindturbineId()))
-                .map(ProEconEquipmentInfoDayTop::getId)
-                .collect(Collectors.toList());
 
-//        if (idls.size() > 0) {
-//
-//            proEconEquipmentInfoDayTopService.removeByIds(idls);
-//        }
-
-        List<Long> tempids=new ArrayList<>();
-
-        for(int i=0;i<idls.size();i++)
-        {
-            tempids.add(idls.get(i));
-            if(tempids.size()==100)
-            {
-                proEconEquipmentInfoDayTopService.removeByIds(tempids);
-                tempids=new ArrayList<>();
-            }
-        }
-
-        if(!tempids.isEmpty())
-        {
-            proEconEquipmentInfoDayTopService.removeByIds(tempids);
-        }
 
         for (ProBasicPowerstation wp : CacheContext.wpls) {
 
@@ -215,6 +187,38 @@ public class EquipmentInfoDayTopService {
             }
 
 
+            //判断是否有重复记录，先删除重复记录
+            QueryWrapper<ProEconEquipmentInfoDayTop> queryWrapper = new QueryWrapper<>();
+            queryWrapper.ge("record_date",DateUtils.truncate(recordDate)).eq("types",2).eq("windpowerstation_id",wp.getId());
+            List<Long> idls = proEconEquipmentInfoDayTopService.list(queryWrapper).stream()
+//                .filter(i -> i.getRecordDate().compareTo(DateUtils.truncate(recordDate)) == 0
+//                        && i.getTypes() ==2
+//                        && CacheContext.wtmap.containsKey(i.getWindturbineId()))
+                    .map(ProEconEquipmentInfoDayTop::getId)
+                    .collect(Collectors.toList());
+
+//        if (idls.size() > 0) {
+//
+//            proEconEquipmentInfoDayTopService.removeByIds(idls);
+//        }
+
+            List<Long> tempids=new ArrayList<>();
+
+            for(int i=0;i<idls.size();i++)
+            {
+                tempids.add(idls.get(i));
+                if(tempids.size()==100)
+                {
+                    proEconEquipmentInfoDayTopService.removeByIds(tempids);
+                    tempids=new ArrayList<>();
+                }
+            }
+
+            if(!tempids.isEmpty())
+            {
+                proEconEquipmentInfoDayTopService.removeByIds(tempids);
+            }
+
             List<ProEconEquipmentInfoDayTop> templs=new ArrayList<>();
             for(ProEconEquipmentInfoDayTop vo:topls)
             {
@@ -241,36 +245,7 @@ public class EquipmentInfoDayTopService {
         c.setTime(recordDate);
 
 
-        //判断是否有重复记录，先删除重复记录
-        QueryWrapper<ProEconEquipmentInfoDayTop> queryWrapper = new QueryWrapper<>();
-        queryWrapper.ge("record_date",DateUtils.truncate(recordDate)).eq("types",3);
-        List<Long> idls = proEconEquipmentInfoDayTopService.list(queryWrapper).stream()
-//                .filter(i -> i.getRecordDate().compareTo(DateUtils.truncate(recordDate)) == 0
-//                        && i.getTypes() ==3
-//                        && CacheContext.wtmap.containsKey(i.getWindturbineId()))
-                .map(ProEconEquipmentInfoDayTop::getId)
-                .collect(Collectors.toList());
-//
-//        if (idls.size() > 0) {
-//
-//            proEconEquipmentInfoDayTopService.removeByIds(idls);
-//        }
-        List<Long> tempids=new ArrayList<>();
 
-        for(int i=0;i<idls.size();i++)
-        {
-            tempids.add(idls.get(i));
-            if(tempids.size()==100)
-            {
-                proEconEquipmentInfoDayTopService.removeByIds(tempids);
-                tempids=new ArrayList<>();
-            }
-        }
-
-        if(!tempids.isEmpty())
-        {
-            proEconEquipmentInfoDayTopService.removeByIds(tempids);
-        }
         for (ProBasicPowerstation wp : CacheContext.wpls) {
 
             List<ProEconEquipmentInfoDayTop> topls = new ArrayList<>();
@@ -302,6 +277,38 @@ public class EquipmentInfoDayTopService {
                 top.setDayRank(i+1);
             }
 
+
+            //判断是否有重复记录，先删除重复记录
+            QueryWrapper<ProEconEquipmentInfoDayTop> queryWrapper = new QueryWrapper<>();
+            queryWrapper.ge("record_date",DateUtils.truncate(recordDate)).eq("types",3).eq("windpowerstation_id",wp.getId());
+            List<Long> idls = proEconEquipmentInfoDayTopService.list(queryWrapper).stream()
+//                .filter(i -> i.getRecordDate().compareTo(DateUtils.truncate(recordDate)) == 0
+//                        && i.getTypes() ==3
+//                        && CacheContext.wtmap.containsKey(i.getWindturbineId()))
+                    .map(ProEconEquipmentInfoDayTop::getId)
+                    .collect(Collectors.toList());
+//
+//        if (idls.size() > 0) {
+//
+//            proEconEquipmentInfoDayTopService.removeByIds(idls);
+//        }
+            List<Long> tempids=new ArrayList<>();
+
+            for(int i=0;i<idls.size();i++)
+            {
+                tempids.add(idls.get(i));
+                if(tempids.size()==100)
+                {
+                    proEconEquipmentInfoDayTopService.removeByIds(tempids);
+                    tempids=new ArrayList<>();
+                }
+            }
+
+            if(!tempids.isEmpty())
+            {
+                proEconEquipmentInfoDayTopService.removeByIds(tempids);
+            }
+
             List<ProEconEquipmentInfoDayTop> templs=new ArrayList<>();
             for(ProEconEquipmentInfoDayTop vo:topls)
             {
@@ -396,16 +403,18 @@ public class EquipmentInfoDayTopService {
             peeidt.setDaylyxs(BigDecimal.valueOf(peeidt.getDayfdl()).divide(new BigDecimal(defaultpower), 2, RoundingMode.HALF_EVEN).doubleValue());
 
 
+
+
             //设备可利用率
             int dayhours = 24;
-            double temp = StringUtils.round(dayhours - peeidt.getDaygzsj(), 2);
+            double temp = StringUtils.round((dayhours - peeidt.getDaygzsj()/dayhours*100), 2);
             peeidt.setDaysbklyl(temp);
 
 
 
             //等效可用系数
             dayhours = 24;
-            temp = StringUtils.round(dayhours - peeidt.getDaygzsj() - peeidt.getDaywhsj(), 2);
+            temp = StringUtils.round((dayhours - peeidt.getDaygzsj() - peeidt.getDaywhsj())/dayhours*100, 2);
             peeidt.setDaydxkyxs(temp);
 
 
@@ -520,14 +529,14 @@ public class EquipmentInfoDayTopService {
 
             //设备可利用率
             int dayhours = 24*days;
-            double temp = StringUtils.round(dayhours - peeidt.getDaygzsj(), 2);
+            double temp = StringUtils.round((dayhours - peeidt.getDaygzsj())/dayhours*100, 2);
             peeidt.setDaysbklyl(temp);
 
 
 
             //等效可用系数
             dayhours = 24*days;
-            temp = StringUtils.round(dayhours - peeidt.getDaygzsj() - peeidt.getDaywhsj(), 2);
+            temp = StringUtils.round((dayhours - peeidt.getDaygzsj() - peeidt.getDaywhsj())/dayhours*100, 2);
             peeidt.setDaydxkyxs(temp);
 
 
@@ -642,14 +651,14 @@ public class EquipmentInfoDayTopService {
 
             //设备可利用率
             int dayhours = 24*days;
-            double temp = StringUtils.round(dayhours - peeidt.getDaygzsj(), 2);
+            double temp = StringUtils.round((dayhours - peeidt.getDaygzsj())/dayhours*100, 2);
             peeidt.setDaysbklyl(temp);
 
 
 
             //等效可用系数
             dayhours = 24*days;
-            temp = StringUtils.round(dayhours - peeidt.getDaygzsj() - peeidt.getDaywhsj(), 2);
+            temp = StringUtils.round((dayhours - peeidt.getDaygzsj() - peeidt.getDaywhsj())/dayhours*100, 2);
             peeidt.setDaydxkyxs(temp);
 
 
@@ -676,6 +685,7 @@ public class EquipmentInfoDayTopService {
             peeidt.setDayjfpl(temp);
 
 
+
             //功率一致性系数
             peeidt.setDayglyzxxs(pepid4.getNglyzxxs());
 

realtime/generationXK-service/src/main/java/com/gyee/generation/service/realtimelibrary/CycleCalculationService.java

@@ -499,6 +499,13 @@ public class CycleCalculationService {
                         } else {
                             if (wt.getId().contains("_WT_")) {
                                 double lsfs = edosUtil.getSectionData(rpjfsPoint, currentDate.getTime()).getPointValueInDouble();
+                                if(lsfs>25)
+                                {
+                                    lsfs =25;
+                                }else if( lsfs<0)
+                                {
+                                    lsfs=0;
+                                }
                                 rpjfs = DoubleUtils.ave(lsfs, dataMap.get("pjfs"));
                             } else {
                                 double lsfs = edosUtil.getSectionData(rpjgzdPoint, currentDate.getTime()).getPointValueInDouble();
@@ -573,6 +580,13 @@ public class CycleCalculationService {
                         } else {
                             if (wt.getId().contains("_WT_")) {
                                 double lsfs = edosUtil.getSectionData(ypjfsPoint, currentDate.getTime()).getPointValueInDouble();
+                                if(lsfs>25)
+                                {
+                                    lsfs =25;
+                                }else if( lsfs<0)
+                                {
+                                    lsfs=0;
+                                }
                                 ypjfs = DoubleUtils.ave(lsfs, dataMap.get("pjfs"));
                             } else {
                                 double lsfs = edosUtil.getSectionData(ypjgzdPoint, currentDate.getTime()).getPointValueInDouble();
@@ -646,6 +660,13 @@ public class CycleCalculationService {
                         } else {
                             if (wt.getId().contains("_WT_")) {
                                 double lsfs = edosUtil.getSectionData(npjfsPoint, currentDate.getTime()).getPointValueInDouble();
+                                if(lsfs>25)
+                                {
+                                    lsfs =25;
+                                }else if( lsfs<0)
+                                {
+                                    lsfs=0;
+                                }
                                 npjfs = DoubleUtils.ave(lsfs, dataMap.get("pjfs"));
                             } else {
                                 double lsfs = edosUtil.getSectionData(npjgzdPoint, currentDate.getTime()).getPointValueInDouble();

realtime/generationXK-service/src/main/java/com/gyee/generation/service/realtimelibrary/StatusService.java

@@ -1101,18 +1101,35 @@ public class StatusService {
 
             }
 
-            if (mxstatus==2 || (mxstatus==3)){
-                if(ssgl<0 || ssgl==0 )
-                {
-                    mxstatus=0;
+            if(wt.getId().contains("_F_"))
+            {
+                if (mxstatus==2 || (mxstatus==3)){
+                    if(ssgl<=10 )
+                    {
+                        mxstatus=0;
+                    }
+                }else if (mxstatus==0 || (mxstatus==1)){
+                    if(ssgl>10 )
+                    {
+                        mxstatus=2;
+                    }
                 }
-            }else if (mxstatus==0 || (mxstatus==1)){
-                if(ssgl>10 )
-                {
-                    mxstatus=2;
+            }else
+            {
+                if (mxstatus==2 || (mxstatus==3)){
+                    if(ssgl<=1 )
+                    {
+                        mxstatus=0;
+                    }
+                }else if (mxstatus==0 ){
+                    if(ssgl>1 )
+                    {
+                        mxstatus=2;
+                    }
                 }
             }
 
+
         }else {
             //每个状态一个状态点
             Map<String,String> stateMap = new HashMap<>();
@@ -1165,15 +1182,31 @@ public class StatusService {
             }
 
 
-            if (mxstatus==2 || (mxstatus==3)){
-              if(ssgl<0 || ssgl==0 )
-              {
-                  mxstatus=0;
-              }
-            }else if (mxstatus==0 || (mxstatus==1)){
-                if(ssgl>10 )
-                {
-                    mxstatus=2;
+            if(wt.getId().contains("_F_"))
+            {
+                if (mxstatus==2 || (mxstatus==3)){
+                    if(ssgl<=10 )
+                    {
+                        mxstatus=0;
+                    }
+                }else if (mxstatus==0 || (mxstatus==1)){
+                    if(ssgl>10 )
+                    {
+                        mxstatus=2;
+                    }
+                }
+            }else
+            {
+                if (mxstatus==2 || (mxstatus==3)){
+                    if(ssgl<=1 )
+                    {
+                        mxstatus=0;
+                    }
+                }else if (mxstatus==0 ){
+                    if(ssgl>1 )
+                    {
+                        mxstatus=2;
+                    }
                 }
             }
 

realtime/generationXK-service/src/main/java/com/gyee/generation/task/thread/EquipmentInfo1ThreadPool.java

@@ -65,7 +65,10 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 		// //便于观察，等待一段时间
 
 		try {
-
+			if(wt.getId().equals("SXJ_KGDL_BHB_F_WT_0005_EQ"))
+			{
+				System.out.println("");
+			}
 			if(CacheContext.wtpAimap.containsKey(wt.getId()))
 			{
 				Map<String, ProBasicEquipmentPoint> pointmap=CacheContext.wtpAimap.get(wt.getId());
@@ -188,7 +191,7 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 				ProBasicEquipment wt=CacheContext.wtmap.get(pewp.getWindturbineId());
 				if(CacheContext.modelMap.containsKey(wt.getModelId()))
 				{
-					 powerProduction=CacheContext.modelMap.get(wt.getModelId()).getPowerProduction();
+					powerProduction=CacheContext.modelMap.get(wt.getModelId()).getPowerProduction();
 				}
 			}
 			double finalPowerProduction = powerProduction;
@@ -209,24 +212,39 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 			}
 		}
 
+		double rfdl=0.0;
+		double rgzssdl=0.0;
+		double rcnslgzssdl=0.0;
+		double rjxssdl=0.0;
+		double rcnsljxssdl=0.0;
+		double rdjssdl=0.0;
+		double rqxjclssdl=0.0;
+		double rsdtjssdl=0.0;
+		double rxnssdl=0.0;
+		double rxdtjssdl=0.0;
+		double rxdjclssdl=0.0;
+		double rcwsldwssdl=0.0;
+		double rcwsltqssdl=0.0;
+
+
 
 
 		if(pointmap.containsKey(ContantXk.RFDL))
 		{
 			ProBasicEquipmentPoint point= pointmap.get(ContantXk.RFDL);
 
-			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), end.getTime()/1000);
 			if(StringUtils.notEmp(pointValue))
 			{
 				//日发电量
 				pewp.setRfdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
-
+				rfdl=pewp.getRfdl();
 			}
 		}
 		if(pointmap.containsKey(ContantXk.RKYDL))
 		{
 			ProBasicEquipmentPoint point= pointmap.get(ContantXk.RKYDL);
-			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), end.getTime()/1000);
 			if(StringUtils.notEmp(pointValue))
 			{
 				//日可用电量
@@ -239,7 +257,7 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 		if(pointmap.containsKey(ContantXk.RLLFDL))
 		{
 			ProBasicEquipmentPoint point= pointmap.get(ContantXk.RLLFDL);
-			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), end.getTime()/1000);
 			if(StringUtils.notEmp(pointValue))
 			{
 				//日理论发电量
@@ -252,46 +270,47 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 		if(pointmap.containsKey(ContantXk.RGZSSDL))
 		{
 			ProBasicEquipmentPoint point= pointmap.get(ContantXk.RGZSSDL);
-			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), end.getTime()/1000);
 			if(StringUtils.notEmp(pointValue))
 			{
 				//日故障损失电量
 				pewp.setRgzssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
-
+				rgzssdl=pewp.getRgzssdl();
 			}
 		}
 		if(pointmap.containsKey(ContantXk.RCNSLGZSSDL))
 		{
 			ProBasicEquipmentPoint point= pointmap.get(ContantXk.RCNSLGZSSDL);
-			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), end.getTime()/1000);
 			if(StringUtils.notEmp(pointValue))
 			{
 				//日场内受累故障损失电量
 				pewp.setRcnslgzssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
-
+				rcnslgzssdl=pewp.getRcnslgzssdl();
 			}
 		}
 
 		if(pointmap.containsKey(ContantXk.RJXSSDL))
 		{
 			ProBasicEquipmentPoint point= pointmap.get(ContantXk.RJXSSDL);
-			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), end.getTime()/1000);
 			if(StringUtils.notEmp(pointValue))
 			{
 				//日检修损失电量
 				pewp.setRjxssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
-
+				rjxssdl=pewp.getRjxssdl();
 			}
 		}
 
 		if(pointmap.containsKey(ContantXk.RCNSLJXSSDL))
 		{
 			ProBasicEquipmentPoint point= pointmap.get(ContantXk.RCNSLJXSSDL);
-			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), end.getTime()/1000);
 			if(StringUtils.notEmp(pointValue))
 			{
 				//日场内受累检修损失电量
 				pewp.setRcnsljxssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
+				rcnsljxssdl=pewp.getRcnsljxssdl();
 
 			}
 		}
@@ -299,58 +318,61 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 		if(pointmap.containsKey(ContantXk.RDJSSDL))
 		{
 			ProBasicEquipmentPoint point= pointmap.get(ContantXk.RDJSSDL);
-			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), end.getTime()/1000);
 			if(StringUtils.notEmp(pointValue))
 			{
 				//日待机损失电量
 				pewp.setRdjssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
-
+				rdjssdl=pewp.getRdjssdl();
 			}
 		}
 		if(pointmap.containsKey(ContantXk.RQXJCLSSDL))
 		{
 			ProBasicEquipmentPoint point= pointmap.get(ContantXk.RQXJCLSSDL);
-			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), end.getTime()/1000);
 			if(StringUtils.notEmp(pointValue))
 			{
 				//日缺陷降出力损失电量
-				 pewp.setRqxjclssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
-
+				pewp.setRqxjclssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
+				rqxjclssdl=pewp.getRqxjclssdl();
 			}
 		}
 		if(pointmap.containsKey(ContantXk.RSDTJSSDL))
 		{
 			ProBasicEquipmentPoint point= pointmap.get(ContantXk.RSDTJSSDL);
-			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), end.getTime()/1000);
 			if(StringUtils.notEmp(pointValue))
 			{
 				//日手动停机损失电量
 				pewp.setRsdtjssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
-
+				rsdtjssdl=pewp.getRsdtjssdl();
 
 			}
 		}
 		if(pointmap.containsKey(ContantXk.RXNSSDL))
 		{
 			ProBasicEquipmentPoint point= pointmap.get(ContantXk.RXNSSDL);
-			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), end.getTime()/1000);
 			if(StringUtils.notEmp(pointValue))
 			{
 				//日性能损失电量
 				pewp.setRxnssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
-
+				rxnssdl=pewp.getRxnssdl();
 			}
 		}
 
 		if(pointmap.containsKey(ContantXk.RXDTJSSDL))
 		{
 			ProBasicEquipmentPoint point= pointmap.get(ContantXk.RXDTJSSDL);
-			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), end.getTime()/1000);
 			if(StringUtils.notEmp(pointValue))
 			{
 				//日限电停机损失电量
 				pewp.setRxdtjssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
+				rxdtjssdl=pewp.getRxdtjssdl();
 
+				rxdtjssdl=0.0;
+				pewp.setRxdtjssdl(0.0);
 			}
 		}
 
@@ -358,42 +380,48 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 		if(pointmap.containsKey(ContantXk.RXDJCLSSDL))
 		{
 			ProBasicEquipmentPoint point= pointmap.get(ContantXk.RXDJCLSSDL);
-			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), end.getTime()/1000);
 			if(StringUtils.notEmp(pointValue))
 			{
 				//日限电降出力损失电量
 				pewp.setRxdjclssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
-
+				rxdjclssdl=pewp.getRxdjclssdl();
+				rxdjclssdl=0.0;
+				pewp.setRxdjclssdl(0.0);
 			}
 		}
 
 		if(pointmap.containsKey(ContantXk.RCWSLDWSSDL))
 		{
 			ProBasicEquipmentPoint point= pointmap.get(ContantXk.RCWSLDWSSDL);
-			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), end.getTime()/1000);
 			if(StringUtils.notEmp(pointValue))
 			{
 				//日场外受累电网损失电量
 				pewp.setRcwsldwssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
-
+				rcwsldwssdl=pewp.getRcwsldwssdl();
+				rcwsldwssdl=0.0;
+				pewp.setRcwsldwssdl(0.0);
 			}
 		}
 		if(pointmap.containsKey(ContantXk.RCWSLTQSSDL))
 		{
 			ProBasicEquipmentPoint point= pointmap.get(ContantXk.RCWSLTQSSDL);
-			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), end.getTime()/1000);
 			if(StringUtils.notEmp(pointValue))
 			{
 				//日场外受累天气损失电量
 				pewp.setRcwsltqssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
-
+				rcwsltqssdl=pewp.getRcwsltqssdl();
+				rcwsltqssdl=0.0;
+				pewp.setRcwsltqssdl(0.0);
 			}
 		}
 
 		if(pointmap.containsKey(ContantXk.RZFDL))
 		{
 			ProBasicEquipmentPoint point= pointmap.get(ContantXk.RZFDL);
-			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), end.getTime()/1000);
 			if(StringUtils.notEmp(pointValue))
 			{
 				//日增发电量
@@ -405,7 +433,7 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 		if(pointmap.containsKey(ContantXk.RQFDL))
 		{
 			ProBasicEquipmentPoint point= pointmap.get(ContantXk.RQFDL);
-			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), end.getTime()/1000);
 			if(StringUtils.notEmp(pointValue))
 			{
 				//日欠发电量
@@ -416,7 +444,7 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 		if(pointmap.containsKey(ContantXk.RZHD))
 		{
 			ProBasicEquipmentPoint point= pointmap.get(ContantXk.RZHD);
-			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), end.getTime()/1000);
 			if(StringUtils.notEmp(pointValue))
 			{
 				//日自耗电
@@ -425,6 +453,8 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 			}
 		}
 
+		double rllfdl=rfdl+rgzssdl+rcnslgzssdl+rjxssdl+rcnsljxssdl+rcnsljxssdl+rxdtjssdl+rxdjclssdl+rcwsldwssdl+rcwsltqssdl+rdjssdl+rqxjclssdl+rsdtjssdl+rxnssdl;
+		pewp.setRllfdl(StringUtils.round(rllfdl,2));
 
 //*******************************************日信息统计*********************************************************/
 
@@ -474,24 +504,37 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 
 		}
 
+		double yfdl=0.0;
+		double ygzssdl=0.0;
+		double ycnslgzssdl=0.0;
+		double yjxssdl=0.0;
+		double ycnsljxssdl=0.0;
+		double ydjssdl=0.0;
+		double yqxjclssdl=0.0;
+		double ysdtjssdl=0.0;
+		double yxnssdl=0.0;
+		double yxdtjssdl=0.0;
+		double yxdjclssdl=0.0;
+		double ycwsldwssdl=0.0;
+		double ycwsltqssdl=0.0;
 
 		if(pointmap.containsKey(ContantXk.YFDL))
 		{
 			ProBasicEquipmentPoint point= pointmap.get(ContantXk.YFDL);
 
-			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), end.getTime()/1000);
 			if(StringUtils.notEmp(pointValue))
 			{
 				//月发电量
 				pewp.setYfdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
-
+				yfdl=pewp.getYfdl();
 
 			}
 		}
 		if(pointmap.containsKey(ContantXk.YKYDL))
 		{
 			ProBasicEquipmentPoint point= pointmap.get(ContantXk.YKYDL);
-			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), end.getTime()/1000);
 			if(StringUtils.notEmp(pointValue))
 			{
 				//月可用电量
@@ -504,7 +547,7 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 		if(pointmap.containsKey(ContantXk.YLLFDL))
 		{
 			ProBasicEquipmentPoint point= pointmap.get(ContantXk.YLLFDL);
-			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), end.getTime()/1000);
 			if(StringUtils.notEmp(pointValue))
 			{
 				//月理论发电量
@@ -517,23 +560,24 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 		if(pointmap.containsKey(ContantXk.YGZSSDL))
 		{
 			ProBasicEquipmentPoint point= pointmap.get(ContantXk.YGZSSDL);
-			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), end.getTime()/1000);
 			if(StringUtils.notEmp(pointValue))
 			{
 				//月故障损失电量
 				pewp.setYgzssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
-
+				ygzssdl=pewp.getYgzssdl();
 
 			}
 		}
 		if(pointmap.containsKey(ContantXk.YCNSLGZSSDL))
 		{
 			ProBasicEquipmentPoint point= pointmap.get(ContantXk.YCNSLGZSSDL);
-			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), end.getTime()/1000);
 			if(StringUtils.notEmp(pointValue))
 			{
 				//月场内受累故障损失电量
 				pewp.setYcnslgzssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
+				ycnslgzssdl=pewp.getYcnslgzssdl();
 
 			}
 		}
@@ -541,12 +585,12 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 		if(pointmap.containsKey(ContantXk.YJXSSDL))
 		{
 			ProBasicEquipmentPoint point= pointmap.get(ContantXk.YJXSSDL);
-			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), end.getTime()/1000);
 			if(StringUtils.notEmp(pointValue))
 			{
 				//月检修损失电量
 				pewp.setYjxssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
-
+				yjxssdl=pewp.getYjxssdl();
 
 			}
 		}
@@ -554,12 +598,12 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 		if(pointmap.containsKey(ContantXk.YCNSLJXSSDL))
 		{
 			ProBasicEquipmentPoint point= pointmap.get(ContantXk.YCNSLJXSSDL);
-			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), end.getTime()/1000);
 			if(StringUtils.notEmp(pointValue))
 			{
 				//月场内受累检修损失电量
 				pewp.setYcnsljxssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
-
+				ycnsljxssdl=pewp.getYcnsljxssdl();
 
 			}
 		}
@@ -567,11 +611,12 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 		if(pointmap.containsKey(ContantXk.YDJSSDL))
 		{
 			ProBasicEquipmentPoint point= pointmap.get(ContantXk.YDJSSDL);
-			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), end.getTime()/1000);
 			if(StringUtils.notEmp(pointValue))
 			{
 				//月待机损失电量
 				pewp.setYdjssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
+				ydjssdl=pewp.getYdjssdl();
 
 
 			}
@@ -579,11 +624,12 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 		if(pointmap.containsKey(ContantXk.YQXJCLSSDL))
 		{
 			ProBasicEquipmentPoint point= pointmap.get(ContantXk.YQXJCLSSDL);
-			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), end.getTime()/1000);
 			if(StringUtils.notEmp(pointValue))
 			{
 				//月缺陷降出力损失电量
 				pewp.setYqxjclssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
+				yqxjclssdl=pewp.getYqxjclssdl();
 
 
 			}
@@ -591,11 +637,12 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 		if(pointmap.containsKey(ContantXk.YSDTJSSDL))
 		{
 			ProBasicEquipmentPoint point= pointmap.get(ContantXk.YSDTJSSDL);
-			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), end.getTime()/1000);
 			if(StringUtils.notEmp(pointValue))
 			{
 				//月手动停机损失电量
 				pewp.setYsdtjssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
+				ysdtjssdl=pewp.getYsdtjssdl();
 
 
 			}
@@ -603,11 +650,12 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 		if(pointmap.containsKey(ContantXk.YXNSSDL))
 		{
 			ProBasicEquipmentPoint point= pointmap.get(ContantXk.YXNSSDL);
-			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), end.getTime()/1000);
 			if(StringUtils.notEmp(pointValue))
 			{
 				//月性能损失电量
 				pewp.setYxnssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
+				yxnssdl=pewp.getYxnssdl();
 
 
 			}
@@ -616,12 +664,15 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 		if(pointmap.containsKey(ContantXk.YXDTJSSDL))
 		{
 			ProBasicEquipmentPoint point= pointmap.get(ContantXk.YXDTJSSDL);
-			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), end.getTime()/1000);
 			if(StringUtils.notEmp(pointValue))
 			{
 				//月限电停机损失电量
 				pewp.setYxdtjssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
+				yxdtjssdl=pewp.getYxdtjssdl();
 
+				yxdtjssdl=0.0;
+				pewp.setYxdtjssdl(0.0);
 			}
 		}
 
@@ -629,42 +680,51 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 		if(pointmap.containsKey(ContantXk.YXDJCLSSDL))
 		{
 			ProBasicEquipmentPoint point= pointmap.get(ContantXk.YXDJCLSSDL);
-			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), end.getTime()/1000);
 			if(StringUtils.notEmp(pointValue))
 			{
 				//月限电降出力损失电量
 				pewp.setYxdjclssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
+				yxdjclssdl=pewp.getYxdjclssdl();
 
+				yxdjclssdl=0.0;
+				pewp.setYxdjclssdl(0.0);
 			}
 		}
 
 		if(pointmap.containsKey(ContantXk.YCWSLDWSSDL))
 		{
 			ProBasicEquipmentPoint point= pointmap.get(ContantXk.YCWSLDWSSDL);
-			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), end.getTime()/1000);
 			if(StringUtils.notEmp(pointValue))
 			{
 				//月场外受累电网损失电量
 				pewp.setYcwsldwssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
+				ycwsldwssdl=pewp.getYcwsldwssdl();
 
+				ycwsldwssdl=0.0;
+				pewp.setYcwsldwssdl(0.0);
 			}
 		}
 		if(pointmap.containsKey(ContantXk.YCWSLTQSSDL))
 		{
 			ProBasicEquipmentPoint point= pointmap.get(ContantXk.YCWSLTQSSDL);
-			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), end.getTime()/1000);
 			if(StringUtils.notEmp(pointValue))
 			{
 				//月场外受累天气损失电量
 				pewp.setYcwsltqssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
+				ycwsltqssdl=pewp.getYcwsltqssdl();
 
+				ycwsltqssdl=0.0;
+				pewp.setYcwsltqssdl(0.0);
 			}
 		}
 
 		if(pointmap.containsKey(ContantXk.YZFDL))
 		{
 			ProBasicEquipmentPoint point= pointmap.get(ContantXk.YZFDL);
-			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), end.getTime()/1000);
 			if(StringUtils.notEmp(pointValue))
 			{
 				//月增发电量
@@ -676,7 +736,7 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 		if(pointmap.containsKey(ContantXk.YQFDL))
 		{
 			ProBasicEquipmentPoint point= pointmap.get(ContantXk.YQFDL);
-			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), end.getTime()/1000);
 			if(StringUtils.notEmp(pointValue))
 			{
 				//月欠发电量
@@ -687,7 +747,7 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 		if(pointmap.containsKey(ContantXk.YZHD))
 		{
 			ProBasicEquipmentPoint point= pointmap.get(ContantXk.YZHD);
-			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), end.getTime()/1000);
 			if(StringUtils.notEmp(pointValue))
 			{
 				//月自耗电
@@ -696,6 +756,8 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 			}
 		}
 
+		double yllfdl=yfdl+ygzssdl+ycnslgzssdl+yjxssdl+ycnsljxssdl+ycnsljxssdl+yxdtjssdl+yxdjclssdl+ycwsldwssdl+ycwsltqssdl+ydjssdl+yqxjclssdl+ysdtjssdl+yxnssdl;
+		pewp.setYllfdl(StringUtils.round(yllfdl,2));
 //*******************************************月信息统计*********************************************************/
 
 //*******************************************年信息统计*********************************************************/
@@ -726,7 +788,7 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 
 			if(pointmap.containsKey(ContantXk.NPJGL))
 			{
-				ProBasicEquipmentPoint point= pointmap.get(ContantXk.NPJFS);
+				ProBasicEquipmentPoint point= pointmap.get(ContantXk.NPJGL);
 				List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getNemCode(), begin.getTime()/1000, end.getTime()/1000);
 				if(!pointls.isEmpty())
 				{
@@ -744,23 +806,36 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 			}
 
 		}
-
+		double nfdl=0.0;
+		double ngzssdl=0.0;
+		double ncnslgzssdl=0.0;
+		double njxssdl=0.0;
+		double ncnsljxssdl=0.0;
+		double ndjssdl=0.0;
+		double nqxjclssdl=0.0;
+		double nsdtjssdl=0.0;
+		double nxnssdl=0.0;
+		double nxdtjssdl=0.0;
+		double nxdjclssdl=0.0;
+		double ncwsldwssdl=0.0;
+		double ncwsltqssdl=0.0;
 		if(pointmap.containsKey(ContantXk.NFDL))
 		{
 			ProBasicEquipmentPoint point= pointmap.get(ContantXk.NFDL);
 
-			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), end.getTime()/1000);
 			if(StringUtils.notEmp(pointValue))
 			{
 				//年发电量
 				pewp.setNfdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
+				nfdl=pewp.getNfdl();
 
 			}
 		}
 		if(pointmap.containsKey(ContantXk.NKYDL))
 		{
 			ProBasicEquipmentPoint point= pointmap.get(ContantXk.NKYDL);
-			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), end.getTime()/1000);
 			if(StringUtils.notEmp(pointValue))
 			{
 				//年可用电量
@@ -773,7 +848,7 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 		if(pointmap.containsKey(ContantXk.NLLFDL))
 		{
 			ProBasicEquipmentPoint point= pointmap.get(ContantXk.NLLFDL);
-			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), end.getTime()/1000);
 			if(StringUtils.notEmp(pointValue))
 			{
 				//年理论发电量
@@ -786,24 +861,24 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 		if(pointmap.containsKey(ContantXk.NGZSSDL))
 		{
 			ProBasicEquipmentPoint point= pointmap.get(ContantXk.NGZSSDL);
-			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), end.getTime()/1000);
 			if(StringUtils.notEmp(pointValue))
 			{
 				//年故障损失电量
 				pewp.setNgzssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
-
+				ngzssdl=pewp.getNgzssdl();
 
 			}
 		}
 		if(pointmap.containsKey(ContantXk.NCNSLGZSSDL))
 		{
 			ProBasicEquipmentPoint point= pointmap.get(ContantXk.NCNSLGZSSDL);
-			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), end.getTime()/1000);
 			if(StringUtils.notEmp(pointValue))
 			{
 				//年场内受累故障损失电量
 				pewp.setNcnslgzssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
-
+				ncnslgzssdl=pewp.getNcnslgzssdl();
 
 			}
 		}
@@ -811,12 +886,12 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 		if(pointmap.containsKey(ContantXk.NJXSSDL))
 		{
 			ProBasicEquipmentPoint point= pointmap.get(ContantXk.NJXSSDL);
-			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), end.getTime()/1000);
 			if(StringUtils.notEmp(pointValue))
 			{
 				//年检修损失电量
 				pewp.setNjxssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
-
+				njxssdl=pewp.getNjxssdl();
 
 			}
 		}
@@ -824,12 +899,12 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 		if(pointmap.containsKey(ContantXk.NCNSLJXSSDL))
 		{
 			ProBasicEquipmentPoint point= pointmap.get(ContantXk.NCNSLJXSSDL);
-			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), end.getTime()/1000);
 			if(StringUtils.notEmp(pointValue))
 			{
 				//年场内受累检修损失电量
 				pewp.setNcnsljxssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
-
+				ncnsljxssdl=pewp.getNcnsljxssdl();
 
 
 			}
@@ -838,11 +913,12 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 		if(pointmap.containsKey(ContantXk.NDJSSDL))
 		{
 			ProBasicEquipmentPoint point= pointmap.get(ContantXk.NDJSSDL);
-			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), end.getTime()/1000);
 			if(StringUtils.notEmp(pointValue))
 			{
 				//年待机损失电量
 				pewp.setNdjssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
+				ndjssdl=pewp.getNdjssdl();
 
 
 			}
@@ -850,35 +926,38 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 		if(pointmap.containsKey(ContantXk.NQXJCLSSDL))
 		{
 			ProBasicEquipmentPoint point= pointmap.get(ContantXk.NQXJCLSSDL);
-			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), end.getTime()/1000);
 			if(StringUtils.notEmp(pointValue))
 			{
 				//年缺陷降出力损失电量
 				pewp.setNqxjclssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
 
+				nqxjclssdl=pewp.getNqxjclssdl();
 
 			}
 		}
 		if(pointmap.containsKey(ContantXk.NSDTJSSDL))
 		{
 			ProBasicEquipmentPoint point= pointmap.get(ContantXk.NSDTJSSDL);
-			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), end.getTime()/1000);
 			if(StringUtils.notEmp(pointValue))
 			{
 				//年手动停机损失电量
 				pewp.setNsdtjssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
 
+				nsdtjssdl=pewp.getNsdtjssdl();
 
 			}
 		}
 		if(pointmap.containsKey(ContantXk.NXNSSDL))
 		{
 			ProBasicEquipmentPoint point= pointmap.get(ContantXk.NXNSSDL);
-			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), end.getTime()/1000);
 			if(StringUtils.notEmp(pointValue))
 			{
 				//年性能损失电量
 				pewp.setNxnssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
+				nxnssdl=pewp.getNxnssdl();
 
 
 			}
@@ -887,12 +966,15 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 		if(pointmap.containsKey(ContantXk.NXDTJSSDL))
 		{
 			ProBasicEquipmentPoint point= pointmap.get(ContantXk.NXDTJSSDL);
-			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), end.getTime()/1000);
 			if(StringUtils.notEmp(pointValue))
 			{
 				//年限电停机损失电量
 				pewp.setNxdtjssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
+				nxdtjssdl=pewp.getNxdtjssdl();
 
+				nxdtjssdl=0.0;
+				pewp.setNxdtjssdl(0.0);
 			}
 		}
 
@@ -900,12 +982,15 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 		if(pointmap.containsKey(ContantXk.NXDJCLSSDL))
 		{
 			ProBasicEquipmentPoint point= pointmap.get(ContantXk.NXDJCLSSDL);
-			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), end.getTime()/1000);
 			if(StringUtils.notEmp(pointValue))
 			{
 				//年限电降出力损失电量
 				pewp.setNxdjclssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
+				nxdjclssdl=pewp.getNxdjclssdl();
 
+				nxdjclssdl=0.0;
+				pewp.setNxdjclssdl(0.0);
 
 			}
 		}
@@ -913,31 +998,37 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 		if(pointmap.containsKey(ContantXk.NCWSLDWSSDL))
 		{
 			ProBasicEquipmentPoint point= pointmap.get(ContantXk.NCWSLDWSSDL);
-			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), end.getTime()/1000);
 			if(StringUtils.notEmp(pointValue))
 			{
 				//年场外受累电网损失电量
 				pewp.setNcwsldwssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
+				ncwsldwssdl=pewp.getNcwsldwssdl();
 
+				ncwsldwssdl=0.0;
+				pewp.setNcwsldwssdl(0.0);
 
 			}
 		}
 		if(pointmap.containsKey(ContantXk.NCWSLTQSSDL))
 		{
 			ProBasicEquipmentPoint point= pointmap.get(ContantXk.NCWSLTQSSDL);
-			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), end.getTime()/1000);
 			if(StringUtils.notEmp(pointValue))
 			{
 				//年场外受累天气损失电量
 				pewp.setNcwsltqssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
+				ncwsltqssdl=pewp.getNcwsltqssdl();
 
+				ncwsltqssdl=0.0;
+				pewp.setNcwsltqssdl(0.0);
 			}
 		}
 
 		if(pointmap.containsKey(ContantXk.NZFDL))
 		{
 			ProBasicEquipmentPoint point= pointmap.get(ContantXk.NZFDL);
-			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), end.getTime()/1000);
 			if(StringUtils.notEmp(pointValue))
 			{
 				//年增发电量
@@ -949,7 +1040,7 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 		if(pointmap.containsKey(ContantXk.NQFDL))
 		{
 			ProBasicEquipmentPoint point= pointmap.get(ContantXk.NQFDL);
-			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), end.getTime()/1000);
 			if(StringUtils.notEmp(pointValue))
 			{
 				//年欠发电量
@@ -960,7 +1051,7 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 		if(pointmap.containsKey(ContantXk.NZHD))
 		{
 			ProBasicEquipmentPoint point= pointmap.get(ContantXk.NZHD);
-			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+			PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), end.getTime()/1000);
 			if(StringUtils.notEmp(pointValue))
 			{
 				//年自耗电
@@ -969,6 +1060,8 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 			}
 		}
 
+		double nllfdl=nfdl+ngzssdl+ncnslgzssdl+njxssdl+ncnsljxssdl+ncnsljxssdl+nxdtjssdl+nxdjclssdl+ncwsldwssdl+ncwsltqssdl+ndjssdl+nqxjclssdl+nsdtjssdl+nxnssdl;
+		pewp.setNllfdl(StringUtils.round(nllfdl,2));
 	}
 
 	private void setPowerandSpeedYear(ProEconEquipmentInfoDay1 pewp) {

realtime/generationXK-service/src/main/java/com/gyee/generation/task/thread/EquipmentInfo2ThreadPool.java

@@ -352,14 +352,24 @@ public class EquipmentInfo2ThreadPool implements Callable<String>, Serializable
 		pewp.setRsdtjxsmx(new BigDecimal(sdtjsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
 		//日合计性能小时（明细）
 		pewp.setRbwxsmx(new BigDecimal(zcfdsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+//		//日合计限电停机小时（明细）
+//		pewp.setRxdtjxsmx(new BigDecimal(xdtjsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+//		//日合计限电降出力小时（明细）
+//		pewp.setRxdjclxsmx(new BigDecimal(xdjclsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+//		//日合计场外受累电网小时（明细）
+//		pewp.setRcwsldwxsmx(new BigDecimal(dwslsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+//		//日合计场外受累电网小时（明细）
+//		pewp.setRcwsltqxsmx(new BigDecimal(hjslsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+
 		//日合计限电停机小时（明细）
-		pewp.setRxdtjxsmx(new BigDecimal(xdtjsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+		pewp.setRxdtjxsmx(new BigDecimal(0).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
 		//日合计限电降出力小时（明细）
-		pewp.setRxdjclxsmx(new BigDecimal(xdjclsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+		pewp.setRxdjclxsmx(new BigDecimal(0).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
 		//日合计场外受累电网小时（明细）
-		pewp.setRcwsldwxsmx(new BigDecimal(dwslsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+		pewp.setRcwsldwxsmx(new BigDecimal(0).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
 		//日合计场外受累电网小时（明细）
-		pewp.setRcwsltqxsmx(new BigDecimal(hjslsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+		pewp.setRcwsltqxsmx(new BigDecimal(0).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+
 		//日合计通讯中断小时（明细）
 		pewp.setRtxzdxsmx(new BigDecimal(txzdsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
 		//日合计离线小时（明细）
@@ -397,14 +407,28 @@ public class EquipmentInfo2ThreadPool implements Callable<String>, Serializable
 			pewp.setYsdtjxsmx(StringUtils.round(pepid.getYsdtjxsmx()+pewp.getRsdtjxsmx(),2));
 			//月合计性能小时（明细）
 			pewp.setYbwxsmx(StringUtils.round(pepid.getYbwxsmx()+pewp.getRbwxsmx(),2));
+
+
+//			//月合计限电停机小时（明细）
+//			pewp.setYxdtjxsmx(StringUtils.round(pepid.getYxdtjxsmx()+pewp.getRxdtjxsmx(),2));
+//			//月合计限电降出力小时（明细）
+//			pewp.setYxdjclxsmx(StringUtils.round(pepid.getYxdjclxsmx()+pewp.getRxdjclxsmx(),2));
+//			//月合计场外受累电网小时（明细）
+//			pewp.setYcwsldwxsmx(StringUtils.round(pepid.getYcwsldwxsmx()+pewp.getRcwsldwxsmx(),2));
+//			//月合计场外受累电网小时（明细）
+//			pewp.setYcwsltqxsmx(StringUtils.round(pepid.getYcwsltqxsmx()+pewp.getRcwsltqxsmx(),2));
+
+
 			//月合计限电停机小时（明细）
-			pewp.setYxdtjxsmx(StringUtils.round(pepid.getYxdtjxsmx()+pewp.getRxdtjxsmx(),2));
+			pewp.setYxdtjxsmx(StringUtils.round(0,2));
 			//月合计限电降出力小时（明细）
-			pewp.setYxdjclxsmx(StringUtils.round(pepid.getYxdjclxsmx()+pewp.getRxdjclxsmx(),2));
+			pewp.setYxdjclxsmx(StringUtils.round(0,2));
 			//月合计场外受累电网小时（明细）
-			pewp.setYcwsldwxsmx(StringUtils.round(pepid.getYcwsldwxsmx()+pewp.getRcwsldwxsmx(),2));
+			pewp.setYcwsldwxsmx(StringUtils.round(0,2));
 			//月合计场外受累电网小时（明细）
-			pewp.setYcwsltqxsmx(StringUtils.round(pepid.getYcwsltqxsmx()+pewp.getRcwsltqxsmx(),2));
+			pewp.setYcwsltqxsmx(StringUtils.round(0,2));
+
+
 			//月合计通讯中断小时（明细）
 			pewp.setYtxzdxsmx(StringUtils.round(pepid.getYtxzdxsmx()+pewp.getRtxzdxsmx(),2));
 			//月合计离线小时（明细）
@@ -441,14 +465,25 @@ public class EquipmentInfo2ThreadPool implements Callable<String>, Serializable
 			pewp.setNsdtjxsmx(StringUtils.round(pepid.getNsdtjxsmx()+pewp.getRsdtjxsmx(),2));
 			//年合计性能小时（明细）
 			pewp.setNbwxsmx(StringUtils.round(pepid.getNbwxsmx()+pewp.getRbwxsmx(),2));
+//			//年合计限电停机小时（明细）
+//			pewp.setNxdtjxsmx(StringUtils.round(pepid.getNxdtjxsmx()+pewp.getRxdtjxsmx(),2));
+//			//年合计限电降出力小时（明细）
+//			pewp.setNxdjclxsmx(StringUtils.round(pepid.getNxdjclxsmx()+pewp.getRxdjclxsmx(),2));
+//			//年合计场外受累电网小时（明细）
+//			pewp.setNcwsldwxsmx(StringUtils.round(pepid.getNcwsldwxsmx()+pewp.getRcwsldwxsmx(),2));
+//			//年合计场外受累电网小时（明细）
+//			pewp.setNcwsltqxsmx(StringUtils.round(pepid.getNcwsltqxsmx()+pewp.getRcwsltqxsmx(),2));
+
+
 			//年合计限电停机小时（明细）
-			pewp.setNxdtjxsmx(StringUtils.round(pepid.getNxdtjxsmx()+pewp.getRxdtjxsmx(),2));
+			pewp.setNxdtjxsmx(StringUtils.round(0,2));
 			//年合计限电降出力小时（明细）
-			pewp.setNxdjclxsmx(StringUtils.round(pepid.getNxdjclxsmx()+pewp.getRxdjclxsmx(),2));
+			pewp.setNxdjclxsmx(StringUtils.round(0,2));
 			//年合计场外受累电网小时（明细）
-			pewp.setNcwsldwxsmx(StringUtils.round(pepid.getNcwsldwxsmx()+pewp.getRcwsldwxsmx(),2));
+			pewp.setNcwsldwxsmx(StringUtils.round(0,2));
 			//年合计场外受累电网小时（明细）
-			pewp.setNcwsltqxsmx(StringUtils.round(pepid.getNcwsltqxsmx()+pewp.getRcwsltqxsmx(),2));
+			pewp.setNcwsltqxsmx(StringUtils.round(0,2));
+
 			//年合计通讯中断小时（明细）
 			pewp.setNtxzdxsmx(StringUtils.round(pepid.getNtxzdxsmx()+pewp.getRtxzdxsmx(),2));
 			//年合计离线小时（明细）
@@ -679,12 +714,18 @@ public class EquipmentInfo2ThreadPool implements Callable<String>, Serializable
 		pewp.setRdjxs(new BigDecimal(djsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
 		//日合计运行小时
 		pewp.setRyxxs(new BigDecimal(zcfdsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+//		//日合计限电小时
+//		pewp.setRxdxs(new BigDecimal(xdtjsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+
 		//日合计限电小时
-		pewp.setRxdxs(new BigDecimal(xdtjsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+		pewp.setRxdxs(new BigDecimal(0).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
 		//日合计通讯中断小时
 		pewp.setRtxzdxs(new BigDecimal(txzdsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+//		//日合计受累小时
+//		pewp.setRslxs(new BigDecimal(slsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+
 		//日合计受累小时
-		pewp.setRslxs(new BigDecimal(slsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+		pewp.setRslxs(new BigDecimal(0).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
 
 
 		//*******************************************日信息统计*********************************************************/
@@ -707,12 +748,19 @@ public class EquipmentInfo2ThreadPool implements Callable<String>, Serializable
 			pewp.setYgztjxs(StringUtils.round(pepid.getYgztjxs()+pewp.getRgztjxs(),2));
 			//月合计运行小时
 			pewp.setYyxxs(StringUtils.round(pepid.getYyxxs()+pewp.getRyxxs(),2));
+//			//月合计限电小时
+//			pewp.setYxdxs(StringUtils.round(pepid.getYxdxs()+pewp.getRxdxs(),2));
+
+
 			//月合计限电小时
-			pewp.setYxdxs(StringUtils.round(pepid.getYxdxs()+pewp.getRxdxs(),2));
+			pewp.setYxdxs(StringUtils.round(0,2));
 			//月合计通讯中断小时
 			pewp.setYtxzdxs(StringUtils.round(pepid.getYtxzdxs()+pewp.getRtxzdxs(),2));
+//			//月合计受累小时
+//			pewp.setYslxs(StringUtils.round(pepid.getYslxs()+pewp.getRslxs(),2));
+
 			//月合计受累小时
-			pewp.setYslxs(StringUtils.round(pepid.getYslxs()+pewp.getRslxs(),2));
+			pewp.setYslxs(StringUtils.round(0,2));
 
 		}
 		//*******************************************月信息统计*********************************************************/
@@ -734,12 +782,18 @@ public class EquipmentInfo2ThreadPool implements Callable<String>, Serializable
 			pewp.setNgztjxs(StringUtils.round(pepid.getNgztjxs()+pewp.getRgztjxs(),2));
 			//年合计运行小时
 			pewp.setNyxxs(StringUtils.round(pepid.getNyxxs()+pewp.getRyxxs(),2));
+//			//年合计限电小时
+//			pewp.setNxdxs(StringUtils.round(pepid.getNxdxs()+pewp.getRxdxs(),2));
+
 			//年合计限电小时
-			pewp.setNxdxs(StringUtils.round(pepid.getNxdxs()+pewp.getRxdxs(),2));
+			pewp.setNxdxs(StringUtils.round(0,2));
 			//年合计通讯中断小时
 			pewp.setNtxzdxs(StringUtils.round(pepid.getNtxzdxs()+pewp.getRtxzdxs(),2));
+//			//年合计受累小时
+//			pewp.setNslxs(StringUtils.round(pepid.getNslxs()+pewp.getRslxs(),2));
+
 			//年合计受累小时
-			pewp.setNslxs(StringUtils.round(pepid.getNslxs()+pewp.getRslxs(),2));
+			pewp.setNslxs(StringUtils.round(0,2));
 
 		}
 		//*******************************************年信息统计*********************************************************/

realtime/generationXK-service/src/main/java/com/gyee/generation/task/thread/EquipmentInfo3ThreadPool.java

@@ -353,14 +353,24 @@ public class EquipmentInfo3ThreadPool implements Callable<String>, Serializable
 		pewp.setRsdtjcsmx(sdtjcs);
 		//日合计性能次数（明细）
 		pewp.setRbwcsmx(zcfdcs);
+//		//日合计限电停机次数（明细）
+//		pewp.setRxdtjcsmx(xdtjcs);
+//		//日合计限电降出力次数（明细）
+//		pewp.setRxdjclcsmx(xdjclcs);
+//		//日合计场外受累电网次数（明细）
+//		pewp.setRcwsldwcsmx(dwslcs);
+//		//日合计场外受累电网次数（明细）
+//		pewp.setRcwsltqcsmx(hjslcs);
+
 		//日合计限电停机次数（明细）
-		pewp.setRxdtjcsmx(xdtjcs);
+		pewp.setRxdtjcsmx(0.0);
 		//日合计限电降出力次数（明细）
-		pewp.setRxdjclcsmx(xdjclcs);
+		pewp.setRxdjclcsmx(0.0);
 		//日合计场外受累电网次数（明细）
-		pewp.setRcwsldwcsmx(dwslcs);
+		pewp.setRcwsldwcsmx(0.0);
 		//日合计场外受累电网次数（明细）
-		pewp.setRcwsltqcsmx(hjslcs);
+		pewp.setRcwsltqcsmx(0.0);
+
 		//日合计通讯中断次数（明细）
 		pewp.setRtxzdcsmx(txzdcs);
 		//日合计离线次数（明细）
@@ -396,14 +406,25 @@ public class EquipmentInfo3ThreadPool implements Callable<String>, Serializable
 			pewp.setYsdtjcsmx(StringUtils.round(pepid.getYsdtjcsmx()+pewp.getRsdtjcsmx(),2));
 			//月合计性能次数（明细）
 			pewp.setYbwcsmx(StringUtils.round(pepid.getYbwcsmx()+pewp.getRbwcsmx(),2));
+//			//月合计限电停机次数（明细）
+//			pewp.setYxdtjcsmx(StringUtils.round(pepid.getYxdtjcsmx()+pewp.getRxdtjcsmx(),2));
+//			//月合计限电降出力次数（明细）
+//			pewp.setYxdjclcsmx(StringUtils.round(pepid.getYxdjclcsmx()+pewp.getRxdjclcsmx(),2));
+//			//月合计场外受累电网次数（明细）
+//			pewp.setYcwsldwcsmx(StringUtils.round(pepid.getYcwsldwcsmx()+pewp.getRcwsldwcsmx(),2));
+//			//月合计场外受累电网次数（明细）
+//			pewp.setYcwsltqcsmx(StringUtils.round(pepid.getYcwsltqcsmx()+pewp.getRcwsltqcsmx(),2));
+
+
 			//月合计限电停机次数（明细）
-			pewp.setYxdtjcsmx(StringUtils.round(pepid.getYxdtjcsmx()+pewp.getRxdtjcsmx(),2));
+			pewp.setYxdtjcsmx(StringUtils.round(0,2));
 			//月合计限电降出力次数（明细）
-			pewp.setYxdjclcsmx(StringUtils.round(pepid.getYxdjclcsmx()+pewp.getRxdjclcsmx(),2));
+			pewp.setYxdjclcsmx(StringUtils.round(0,2));
 			//月合计场外受累电网次数（明细）
-			pewp.setYcwsldwcsmx(StringUtils.round(pepid.getYcwsldwcsmx()+pewp.getRcwsldwcsmx(),2));
+			pewp.setYcwsldwcsmx(StringUtils.round(0,2));
 			//月合计场外受累电网次数（明细）
-			pewp.setYcwsltqcsmx(StringUtils.round(pepid.getYcwsltqcsmx()+pewp.getRcwsltqcsmx(),2));
+			pewp.setYcwsltqcsmx(StringUtils.round(0,2));
+
 			//月合计通讯中断次数（明细）
 			pewp.setYtxzdcsmx(StringUtils.round(pepid.getYtxzdcsmx()+pewp.getRtxzdcsmx(),2));
 			//月合计离线次数（明细）
@@ -440,14 +461,24 @@ public class EquipmentInfo3ThreadPool implements Callable<String>, Serializable
 			pewp.setNsdtjcsmx(StringUtils.round(pepid.getNsdtjcsmx()+pewp.getRsdtjcsmx(),2));
 			//年合计性能次数（明细）
 			pewp.setNbwcsmx(StringUtils.round(pepid.getNbwcsmx()+pewp.getRbwcsmx(),2));
+//			//年合计限电停机次数（明细）
+//			pewp.setNxdtjcsmx(StringUtils.round(pepid.getNxdtjcsmx()+pewp.getRxdtjcsmx(),2));
+//			//年合计限电降出力次数（明细）
+//			pewp.setNxdjclcsmx(StringUtils.round(pepid.getNxdjclcsmx()+pewp.getRxdjclcsmx(),2));
+//			//年合计场外受累电网次数（明细）
+//			pewp.setNcwsldwcsmx(StringUtils.round(pepid.getNcwsldwcsmx()+pewp.getRcwsldwcsmx(),2));
+//			//年合计场外受累电网次数（明细）
+//			pewp.setNcwsltqcsmx(StringUtils.round(pepid.getNcwsltqcsmx()+pewp.getRcwsltqcsmx(),2));
+
 			//年合计限电停机次数（明细）
-			pewp.setNxdtjcsmx(StringUtils.round(pepid.getNxdtjcsmx()+pewp.getRxdtjcsmx(),2));
+			pewp.setNxdtjcsmx(StringUtils.round(0,2));
 			//年合计限电降出力次数（明细）
-			pewp.setNxdjclcsmx(StringUtils.round(pepid.getNxdjclcsmx()+pewp.getRxdjclcsmx(),2));
+			pewp.setNxdjclcsmx(StringUtils.round(0,2));
 			//年合计场外受累电网次数（明细）
-			pewp.setNcwsldwcsmx(StringUtils.round(pepid.getNcwsldwcsmx()+pewp.getRcwsldwcsmx(),2));
+			pewp.setNcwsldwcsmx(StringUtils.round(0,2));
 			//年合计场外受累电网次数（明细）
-			pewp.setNcwsltqcsmx(StringUtils.round(pepid.getNcwsltqcsmx()+pewp.getRcwsltqcsmx(),2));
+			pewp.setNcwsltqcsmx(StringUtils.round(0,2));
+
 			//年合计通讯中断次数（明细）
 			pewp.setNtxzdcsmx(StringUtils.round(pepid.getNtxzdcsmx()+pewp.getRtxzdcsmx(),2));
 			//年合计离线次数（明细）
@@ -669,14 +700,16 @@ public class EquipmentInfo3ThreadPool implements Callable<String>, Serializable
 		pewp.setRdjcs(djcs);
 		//日合计运行次数
 		pewp.setRyxcs(zcfdcs);
-		//日合计限电次数
-		pewp.setRxdcs(xdtjcs);
+//		//日合计限电次数
+//		pewp.setRxdcs(xdtjcs);
 		//日合计通讯中断次数
 		pewp.setRtxzdcs(txzdcs);
-		//日合计受累次数
-		pewp.setRslcs(slsc);
+//		//日合计受累次数
+//		pewp.setRslcs(slsc);
 
 
+		pewp.setRxdcs(0.0);
+		pewp.setRslcs(0.0);
 		//*******************************************日信息统计*********************************************************/
 
 		//*******************************************月信息统计*********************************************************/
@@ -699,12 +732,19 @@ public class EquipmentInfo3ThreadPool implements Callable<String>, Serializable
 			pewp.setYgztjcs(StringUtils.round(pepid.getYgztjcs()+pewp.getRgztjcs(),2));
 			//月合计运行次数
 			pewp.setYyxcs(StringUtils.round(pepid.getYyxcs()+pewp.getRyxcs(),2));
-			//月合计限电次数
-			pewp.setYxdcs(StringUtils.round(pepid.getYxdcs()+pewp.getRxdcs(),2));
+//			//月合计限电次数
+//			pewp.setYxdcs(StringUtils.round(pepid.getYxdcs()+pewp.getRxdcs(),2));
 			//月合计通讯中断次数
 			pewp.setYtxzdcs(StringUtils.round(pepid.getYtxzdcs()+pewp.getRtxzdcs(),2));
+//			//月合计受累次数
+//			pewp.setYslcs(StringUtils.round(pepid.getYslcs()+pewp.getRslcs(),2));
+
+
+			//月合计限电次数
+			pewp.setYxdcs(StringUtils.round(0,2));
+
 			//月合计受累次数
-			pewp.setYslcs(StringUtils.round(pepid.getYslcs()+pewp.getRslcs(),2));
+			pewp.setYslcs(StringUtils.round(0,2));
 
 		}
 		//*******************************************月信息统计*********************************************************/
@@ -729,12 +769,17 @@ public class EquipmentInfo3ThreadPool implements Callable<String>, Serializable
 			pewp.setNgztjcs(StringUtils.round(pepid.getNgztjcs()+pewp.getRgztjcs(),2));
 			//年合计运行次数
 			pewp.setNyxcs(StringUtils.round(pepid.getNyxcs()+pewp.getRyxcs(),2));
-			//年合计限电次数
-			pewp.setNxdcs(StringUtils.round(pepid.getNxdcs()+pewp.getRxdcs(),2));
+//			//年合计限电次数
+//			pewp.setNxdcs(StringUtils.round(pepid.getNxdcs()+pewp.getRxdcs(),2));
 			//年合计通讯中断次数
 			pewp.setNtxzdcs(StringUtils.round(pepid.getNtxzdcs()+pewp.getRtxzdcs(),2));
+//			//年合计受累次数
+//			pewp.setNslcs(StringUtils.round(pepid.getNslcs()+pewp.getRslcs(),2));
+
+			//年合计限电次数
+			pewp.setNxdcs(StringUtils.round(0,2));
 			//年合计受累次数
-			pewp.setNslcs(StringUtils.round(pepid.getNslcs()+pewp.getRslcs(),2));
+			pewp.setNslcs(StringUtils.round(0,2));
 
 		}
 		//*******************************************年信息统计*********************************************************/

realtime/generationXK-service/src/main/java/com/gyee/generation/task/thread/EquipmentInfo4ThreadPool.java

@@ -174,13 +174,35 @@ public class EquipmentInfo4ThreadPool implements Callable<String>, Serializable
 		//获得功率一致性系数
 		if (wgmap.containsKey(wt.getId())) {
 			ProEconWindturbineGoodness wg = wgmap.get(wt.getId());
-			pewp.setRglyzxxs(wg.getDayCoefficient());
+
+			if(wg.getDayCoefficient()>100)
+			{
+				pewp.setRglyzxxs(100.0);
+			}else if(wg.getDayCoefficient()<0)
+			{
+				pewp.setRglyzxxs(0.0);
+			}else
+			{
+				pewp.setRglyzxxs(wg.getDayCoefficient());
+			}
+
 		}
 
 		//获得拟合优度
 		if (wgmap.containsKey(wt.getId())) {
 			ProEconWindturbineGoodness wg = wgmap.get(wt.getId());
-			pewp.setRnhyd(wg.getDayGoodness());
+//			pewp.setRnhyd(wg.getDayGoodness());
+
+			if(wg.getDayGoodness()>100)
+			{
+				pewp.setRnhyd(100.0);
+			}else if(wg.getDayGoodness()<0)
+			{
+				pewp.setRnhyd(0.0);
+			}else
+			{
+				pewp.setRnhyd(wg.getDayGoodness());
+			}
 		}
 
 		if (StringUtils.notEmp(pepid2)) {
@@ -302,7 +324,14 @@ public class EquipmentInfo4ThreadPool implements Callable<String>, Serializable
 
 						}
 
-						pewp.setRdfpcl(number);
+						if(totalnumbere!=0)
+						{
+							double dfpcl = new BigDecimal(number).divide(new BigDecimal(totalnumbere), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue();
+							pewp.setRdfpcl(dfpcl);
+						}else
+						{
+							pewp.setRdfpcl(0.0);
+						}
 					}
 
 
@@ -463,13 +492,36 @@ public class EquipmentInfo4ThreadPool implements Callable<String>, Serializable
 			//获得功率一致性系数
 			if (wgmap.containsKey(wt.getId())) {
 				ProEconWindturbineGoodness wg = wgmap.get(wt.getId());
-				pewp.setYglyzxxs(wg.getMonthCoefficient());
+
+				if(wg.getMonthCoefficient()>100)
+				{
+					pewp.setYglyzxxs(100.0);
+				}else if(wg.getMonthCoefficient()<0)
+				{
+					pewp.setYglyzxxs(0.0);
+				}else
+				{
+					pewp.setYglyzxxs(wg.getMonthCoefficient());
+				}
+
 			}
 
 			//获得拟合优度
 			if (wgmap.containsKey(wt.getId())) {
 				ProEconWindturbineGoodness wg = wgmap.get(wt.getId());
-				pewp.setYnhyd(wg.getMonthGoodness());
+
+
+				if(wg.getMonthGoodness()>100)
+				{
+					pewp.setYnhyd(100.0);
+				}else if(wg.getMonthGoodness()<0)
+				{
+					pewp.setYnhyd(0.0);
+				}else
+				{
+					pewp.setYnhyd(wg.getMonthGoodness());
+				}
+
 			}
 
 			if (StringUtils.notEmp(pepid2)) {
@@ -521,7 +573,7 @@ public class EquipmentInfo4ThreadPool implements Callable<String>, Serializable
 
 				if (StringUtils.notEmp(peiost)) {
 					//静风时长累计
-					pewp.setYjfsc(pewp.getYjfsc() + pepid.getRjfsc());
+					pewp.setYjfsc(pewp.getRjfsc() + pepid.getYjfsc());
 
 					if (pewp.getYedfs() == 0) {
 						//如果没有满发，额定风速赋值保证功率达到满发的对应风速
@@ -711,13 +763,35 @@ public class EquipmentInfo4ThreadPool implements Callable<String>, Serializable
 			//获得功率一致性系数
 			if (wgmap.containsKey(wt.getId())) {
 				ProEconWindturbineGoodness wg = wgmap.get(wt.getId());
-				pewp.setNglyzxxs(wg.getYearCoefficient());
+
+
+				if(wg.getYearCoefficient()>100)
+				{
+					pewp.setNglyzxxs(100.0);
+				}else if(wg.getYearCoefficient()<0)
+				{
+					pewp.setNglyzxxs(0.0);
+				}else
+				{
+					pewp.setNglyzxxs(wg.getYearCoefficient());
+				}
 			}
 
 			//获得拟合优度
 			if (wgmap.containsKey(wt.getId())) {
 				ProEconWindturbineGoodness wg = wgmap.get(wt.getId());
-				pewp.setNnhyd(wg.getYearGoodness());
+
+
+				if(wg.getYearGoodness()>100)
+				{
+					pewp.setNnhyd(100.0);
+				}else if(wg.getYearGoodness()<0)
+				{
+					pewp.setNnhyd(0.0);
+				}else
+				{
+					pewp.setNnhyd(wg.getYearGoodness());
+				}
 			}
 
 			if (StringUtils.notEmp(pepid2)) {
@@ -769,7 +843,7 @@ public class EquipmentInfo4ThreadPool implements Callable<String>, Serializable
 
 				if (StringUtils.notEmp(peiost)) {
 					//静风时长累计
-					pewp.setNjfsc(pewp.getNjfsc() + pepid.getRjfsc());
+					pewp.setNjfsc(pepid.getNjfsc() + pewp.getRjfsc());
 
 					if (pewp.getNedfs() == 0) {
 						//如果没有满发，额定风速赋值保证功率达到满发的对应风速

realtime/generationXK-service/src/main/resources/application-jn.yml

@@ -130,8 +130,9 @@ db:
 #  url2: http://127.0.0.1:8011/ts
 
 #参与计算的场站
-runWindpowerstation: SXJ_KGDL_GJY_FDC_STA
+#runWindpowerstation: SXJ_KGDL_BHB_FDC_STA
 #runWindpowerstation: SXJ_KGDL_DJY_FDC_STA,SXJ_KGDL_NJL_FDC_STA,SXJ_KGDL_YF_FDC_STA,SXJ_KGDL_YLZ_FDC_STA,SXJ_KGDL_XWT_FDC_STA,SXJ_KGDL_PTZ_FDC_STA,SXJ_KGDL_GJY_FDC_STA,SXJ_KGDL_BHB_FDC_STA,SXJ_KGDL_HSM_FDC_STA,SXJ_KGDL_YTY_FDC_STA,SXJ_KGDL_BHB3_FDC_STA,SXJ_KGDL_SY_GDC_STA,SXJ_KGDL_PDL_FDC_STA,SXJ_KGDL_ZK_FDC_STA,SXJ_KGDL_JR_GDC_STA,SXJ_KGDL_FS_GDC_STA,SXJ_KGDL_HR_GDC_STA,SXJ_KGDL_YY_GDC_STA,SXJ_KGDL_PL_GDC_STA,SXJ_KGDL_YG_GDC_STA,SXJ_KGDL_YX_GDC_STA,SXJ_KGDL_TZ_GDC_STA,SXJ_KGDL_TL_GDC_STA
+runWindpowerstation: SXJ_KGDL_DJY_FDC_STA,SXJ_KGDL_NJL_FDC_STA,SXJ_KGDL_YF_FDC_STA,SXJ_KGDL_YLZ_FDC_STA,SXJ_KGDL_XWT_FDC_STA,SXJ_KGDL_PTZ_FDC_STA,SXJ_KGDL_GJY_FDC_STA,SXJ_KGDL_BHB_FDC_STA,SXJ_KGDL_HSM_FDC_STA,SXJ_KGDL_YTY_FDC_STA,SXJ_KGDL_BHB3_FDC_STA,SXJ_KGDL_PDL_FDC_STA,SXJ_KGDL_ZK_FDC_STA
 
 #计算状态用ai或者di
 clauStatus:

realtime/generationXK-service/src/main/resources/xxl-job-executor5.properties

@@ -0,0 +1,25 @@
+### xxl-job admin address list, such as "http://address" or "http://address01,http://address02"
+#xxl.job.admin.addresses=http://localhost:8175/xxl-job-admin
+xxl.job.admin.addresses=http://10.81.3.152:8175/xxl-job-admin
+### xxl-job, access token
+xxl.job.accessToken=
+
+### xxl-job executor appname
+### 场站计算
+xxl.job.executor.appname=generationTarget-job-5
+### 区域公司计算
+#xxl.job.executor.appname=generationRG-job
+### xxl-job executor registry-address: default use address to registry , otherwise use ip:port if address is null
+xxl.job.executor.address=
+### xxl-job executor server-info
+xxl.job.executor.ip=
+#场站端口
+xxl.job.executor.port=9206
+#区域端口
+#xxl.job.executor.port=9202
+
+### xxl-job executor log-path
+xxl.job.executor.logpath=/data/nem/computeEngine/logs
+### xxl-job executor log-retention-days
+xxl.job.executor.logretentiondays=30
+

realtime/generationXK-service/src/test/java/com/gyee/generation/HealthTest.java

@@ -1,8 +1,7 @@
 package com.gyee.generation;
 
-import com.gyee.generation.service.InitialRedisService;
-import com.gyee.generation.service.InputOrOutPutService;
-import com.gyee.generation.service.initalcache.CacheService;
+import com.gyee.common.util.DateUtils;
+import com.gyee.generation.service.*;
 import com.gyee.generation.util.SpringUtils;
 import org.springframework.boot.SpringApplication;
 
@@ -22,10 +21,10 @@ public class HealthTest {
         Calendar c = Calendar.getInstance();
         Date begin=null;
         Date end=null;
-        CacheService cacheService= SpringUtils.getBean("cacheService");
-        cacheService.initRedisCache();
-
-        System.out.println("完成!。。。。。。");
+//        CacheService cacheService= SpringUtils.getBean("cacheService");
+//        cacheService.initRedisCache();
+//
+//        System.out.println("完成!。。。。。。");
 //
 //
 //
@@ -78,8 +77,8 @@ public class HealthTest {
 //        end=new Date();
 //        System.out.println("执行用时"+ DateUtils.secondsDiff(begin,end) +"秒");
 //        System.out.println("初始化散点图度程序执行结束!。。。。。。");
-
-
+//
+//
 //        begin=new Date();
 //        System.out.println("切入切出统计调度程序执行开始!。。。。。。");
 //
@@ -190,49 +189,51 @@ public class HealthTest {
 //
 //
 
-//        c.set(Calendar.DAY_OF_MONTH,1);
-//
-//        c.setTime(DateUtils.truncate(c.getTime()));
-//
-//        begin=new Date();
-//        System.out.println("设备指标记录调度程序执行开始!。。。。。。");
-//        for(int i=0;i<20;i++)
+        c.set(Calendar.DAY_OF_MONTH,18);
+
+        c.setTime(DateUtils.truncate(c.getTime()));
+
+        begin=new Date();
+        System.out.println("设备指标记录调度程序执行开始!。。。。。。");
+//        for(int i=0;i<2;i++)
 //        {
+
+
+
+            System.out.println(DateUtils.format(c.getTime(),"yyyy-MM-dd HH:mm:ss").toString());
+            EquipmentInfo1Service equipmentInfo1Service= SpringUtils.getBean("equipmentInfo1Service");
+            EquipmentInfo2Service equipmentInfo2Service= SpringUtils.getBean("equipmentInfo2Service");
+            EquipmentInfo3Service equipmentInfo3Service= SpringUtils.getBean("equipmentInfo3Service");
+            EquipmentInfo4Service equipmentInfo4Service= SpringUtils.getBean("equipmentInfo4Service");
+            EquipmentInfo5Service equipmentInfo5Service= SpringUtils.getBean("equipmentInfo5Service");
+            EquipmentInfoDayTopService equipmentInfoDayTopService= SpringUtils.getBean("equipmentInfoDayTopService");
+            WtAlysisDayService wtAlysisDayService= SpringUtils.getBean("wtAlysisDayService");
+
+            equipmentInfo1Service.calEquipmentInfoDay(c.getTime());
+            equipmentInfo2Service.calEquipmentInfoDay(c.getTime());
+
+            equipmentInfo3Service.calEquipmentInfoDay(c.getTime());
+
+
+
+            equipmentInfo5Service.calEquipmentInfoDay(c.getTime());
+
+            equipmentInfo4Service.calEquipmentInfoDay(c.getTime());
 //
-//
-//
-//            System.out.println(DateUtils.format(c.getTime(),"yyyy-MM-dd HH:mm:ss").toString());
-//            EquipmentInfo1Service equipmentInfo1Service= SpringUtils.getBean("equipmentInfo1Service");
-//            EquipmentInfo2Service equipmentInfo2Service= SpringUtils.getBean("equipmentInfo2Service");
-//            EquipmentInfo3Service equipmentInfo3Service= SpringUtils.getBean("equipmentInfo3Service");
-//            EquipmentInfo4Service equipmentInfo4Service= SpringUtils.getBean("equipmentInfo4Service");
-//            EquipmentInfo5Service equipmentInfo5Service= SpringUtils.getBean("equipmentInfo5Service");
-//            EquipmentInfoDayTopService equipmentInfoDayTopService= SpringUtils.getBean("equipmentInfoDayTopService");
-//            WtAlysisDayService wtAlysisDayService= SpringUtils.getBean("wtAlysisDayService");
-//
-//            equipmentInfo1Service.calEquipmentInfoDay(c.getTime());
-//            equipmentInfo2Service.calEquipmentInfoDay(c.getTime());
-//
-//            equipmentInfo3Service.calEquipmentInfoDay(c.getTime());
-//
-//            equipmentInfo4Service.calEquipmentInfoDay(c.getTime());
-//
-//            equipmentInfo5Service.calEquipmentInfoDay(c.getTime());
-//
-//            equipmentInfoDayTopService.calEquipmentInfoDayTop(c.getTime());
-//            equipmentInfoDayTopService.calEquipmentInfoMonthTop(c.getTime());
-//            equipmentInfoDayTopService.calEquipmentInfoYearTop(c.getTime());
-//
-//            wtAlysisDayService.calEquipmentInfoDay(c.getTime());
-//
-//            c.add(Calendar.DAY_OF_MONTH,1);
-//
+            equipmentInfoDayTopService.calEquipmentInfoDayTop(c.getTime());
+            equipmentInfoDayTopService.calEquipmentInfoMonthTop(c.getTime());
+            equipmentInfoDayTopService.calEquipmentInfoYearTop(c.getTime());
+
+            wtAlysisDayService.calEquipmentInfoDay(c.getTime());
+
+            c.add(Calendar.DAY_OF_MONTH,1);
+
 //            System.out.println("完成一次!。。。。。。");
 //        }
-//
-//        end=new Date();
-//        System.out.println("执行用时"+ DateUtils.secondsDiff(begin,end) +"秒");
-//        System.out.println("设备指标记录调度程序执行结束!。。。。。。");
+
+        end=new Date();
+        System.out.println("执行用时"+ DateUtils.secondsDiff(begin,end) +"秒");
+        System.out.println("设备指标记录调度程序执行结束!。。。。。。");
 //
 //
 //

web/health/src/main/java/com/gyee/health/service/ShutdownEventService.java

@@ -0,0 +1,43 @@
+package com.gyee.health.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.gyee.health.model.auto.ProEconShutdownEvent;
+import com.gyee.health.service.auto.IProEconShutdownEventService;
+import com.gyee.health.util.StringUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+@Service
+public class ShutdownEventService {
+
+    @Resource
+    private IProEconShutdownEventService proEconShutdownEventService;
+
+    public List<ProEconShutdownEvent> getShutdownEventList(String wtId, Date beginDate, Date endDate) {
+
+
+        //构造分页构造器
+            List<ProEconShutdownEvent> vos = new ArrayList<>();
+        if (StringUtils.notEmp(wtId) && StringUtils.notEmp(beginDate) && StringUtils.notEmp(endDate)) {
+
+            //构造条件构造器
+            LambdaQueryWrapper<ProEconShutdownEvent> queryWrapper = new LambdaQueryWrapper<>();
+            //添加过滤条件
+
+
+            queryWrapper.eq(ProEconShutdownEvent::getWindturbineId, wtId).
+                    ge(ProEconShutdownEvent::getStopTime, beginDate).
+                    le(ProEconShutdownEvent::getStopTime, endDate);
+
+            //执行查询
+            vos=proEconShutdownEventService.list(queryWrapper);
+        }
+
+        return vos;
+
+    }
+}