历史计算服务修改

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

@@ -43,7 +43,7 @@ public class CoefficientService {
 
 
 
-        Date endDate = c.getTime();
+        Date endDate = currentDate;
 
         Map<String, Map<String, Double>> resultmap = new HashMap<>();
         //查询风机
@@ -55,103 +55,103 @@ public class CoefficientService {
 //        for (ProBasicEquipment wt : wtls) {
 
 //****************************************年功率一致性统计********************************************************************/
-            List<ProEconActivePowerData> yearList;
-
-            List<ProEconActivePowerData> queryYear = new ArrayList<>();
-
-            Map<String, ProBasicEquipmentPoint> wtpointmap = CacheContext.wtpAimap.get(wt.getId());
-            ProBasicEquipmentPoint fspoint = wtpointmap.get(ContantXk.CJ_SSFS);
-            List<PointData> fsls = edosUtil.getHistStat(fspoint.getNemCode(), yearbeginDate.getTime() / 1000, endDate.getTime() / 1000, null, 900L, StatData.AVG.getValue());
-
-            ProBasicEquipmentPoint glpoint = wtpointmap.get(ContantXk.CJ_SSGL);
-            List<PointData> glls = edosUtil.getHistStat(glpoint.getNemCode(), yearbeginDate.getTime() / 1000, endDate.getTime() / 1000, null, 900L, StatData.AVG.getValue());
-
-                if(!fsls.isEmpty() && !glls.isEmpty() && fsls.size()==glls.size())
-                {
-                    for(int i=0;i<fsls.size();i++)
-                    {
-                        PointData fspd=fsls.get(i);
-                        PointData glpd=fsls.get(i);
-                        ProEconActivePowerData po=new ProEconActivePowerData();
-                        po.setWindturbineId(wt.getId());
-                        po.setModelId(wt.getModelId());
-                        po.setWindpowerstationId(wt.getWindpowerstationId());
-                        po.setFrequency(fsls.size());
-                        po.setSpeed(StringUtils.round(fspd.getPointValueInDouble(),2));
-                        po.setPower(StringUtils.round(glpd.getPointValueInDouble(),2));
-                        queryYear.add(po);
-                    }
-                }
+        List<ProEconActivePowerData> yearList;
+
+        List<ProEconActivePowerData> queryYear = new ArrayList<>();
+
+        Map<String, ProBasicEquipmentPoint> wtpointmap = CacheContext.wtpAimap.get(wt.getId());
+        ProBasicEquipmentPoint fspoint = wtpointmap.get(ContantXk.CJ_SSFS);
+        List<PointData> fsls = edosUtil.getHistStat(fspoint.getNemCode(), yearbeginDate.getTime() / 1000, endDate.getTime() / 1000, null, 900L, StatData.AVG.getValue());
+
+        ProBasicEquipmentPoint glpoint = wtpointmap.get(ContantXk.CJ_SSGL);
+        List<PointData> glls = edosUtil.getHistStat(glpoint.getNemCode(), yearbeginDate.getTime() / 1000, endDate.getTime() / 1000, null, 900L, StatData.AVG.getValue());
+
+        if(!fsls.isEmpty() && !glls.isEmpty() && fsls.size()==glls.size())
+        {
+            for(int i=0;i<fsls.size();i++)
+            {
+                PointData fspd=fsls.get(i);
+                PointData glpd=fsls.get(i);
+                ProEconActivePowerData po=new ProEconActivePowerData();
+                po.setWindturbineId(wt.getId());
+                po.setModelId(wt.getModelId());
+                po.setWindpowerstationId(wt.getWindpowerstationId());
+                po.setFrequency(fsls.size());
+                po.setSpeed(StringUtils.round(fspd.getPointValueInDouble(),2));
+                po.setPower(StringUtils.round(glpd.getPointValueInDouble(),2));
+                queryYear.add(po);
+            }
+        }
 
 
-            yearList = calCoefficient(queryYear, wt);
+        yearList = calCoefficient(queryYear, wt);
 
 //****************************************月功率一致性统计********************************************************************/
 
-            List<ProEconActivePowerData> monthList;
-            List<ProEconActivePowerData> queryMonth = new ArrayList<>();
-
-
-            fsls = edosUtil.getHistStat(fspoint.getNemCode(), monthbeginDate.getTime() / 1000, endDate.getTime() / 1000, null, 900L, StatData.AVG.getValue());
-            glls = edosUtil.getHistStat(glpoint.getNemCode(), monthbeginDate.getTime() / 1000, endDate.getTime() / 1000, null, 900L, StatData.AVG.getValue());
-
-            if (!fsls.isEmpty() && !glls.isEmpty() && fsls.size() == glls.size()) {
-                for (int i = 0; i < fsls.size(); i++) {
-                    PointData fspd = fsls.get(i);
-                    PointData glpd = fsls.get(i);
-                    ProEconActivePowerData po = new ProEconActivePowerData();
-                    po.setWindturbineId(wt.getId());
-                    po.setModelId(wt.getModelId());
-                    po.setWindpowerstationId(wt.getWindpowerstationId());
-                    po.setFrequency(fsls.size());
-                    po.setSpeed(StringUtils.round(fspd.getPointValueInDouble(), 2));
-                    po.setPower(StringUtils.round(glpd.getPointValueInDouble(), 2));
-                    queryMonth.add(po);
-                }
+        List<ProEconActivePowerData> monthList;
+        List<ProEconActivePowerData> queryMonth = new ArrayList<>();
+
+
+        fsls = edosUtil.getHistStat(fspoint.getNemCode(), monthbeginDate.getTime() / 1000, endDate.getTime() / 1000, null, 900L, StatData.AVG.getValue());
+        glls = edosUtil.getHistStat(glpoint.getNemCode(), monthbeginDate.getTime() / 1000, endDate.getTime() / 1000, null, 900L, StatData.AVG.getValue());
+
+        if (!fsls.isEmpty() && !glls.isEmpty() && fsls.size() == glls.size()) {
+            for (int i = 0; i < fsls.size(); i++) {
+                PointData fspd = fsls.get(i);
+                PointData glpd = fsls.get(i);
+                ProEconActivePowerData po = new ProEconActivePowerData();
+                po.setWindturbineId(wt.getId());
+                po.setModelId(wt.getModelId());
+                po.setWindpowerstationId(wt.getWindpowerstationId());
+                po.setFrequency(fsls.size());
+                po.setSpeed(StringUtils.round(fspd.getPointValueInDouble(), 2));
+                po.setPower(StringUtils.round(glpd.getPointValueInDouble(), 2));
+                queryMonth.add(po);
             }
+        }
 
 
-            monthList = calCoefficient(queryMonth, wt);
+        monthList = calCoefficient(queryMonth, wt);
 
 
 //*****************************************日功率一致性统计********************************************************************/
 
 
-            List<ProEconActivePowerData> dayList;
+        List<ProEconActivePowerData> dayList;
 
 
-            List<ProEconActivePowerData> queryDay = new ArrayList<>();
+        List<ProEconActivePowerData> queryDay = new ArrayList<>();
 
 
-            fsls = edosUtil.getHistStat(fspoint.getNemCode(), beginDate.getTime() / 1000, endDate.getTime() / 1000, null, 900L, StatData.AVG.getValue());
-            glls = edosUtil.getHistStat(glpoint.getNemCode(), beginDate.getTime() / 1000, endDate.getTime() / 1000, null, 900L, StatData.AVG.getValue());
+        fsls = edosUtil.getHistStat(fspoint.getNemCode(), beginDate.getTime() / 1000, endDate.getTime() / 1000, null, 900L, StatData.AVG.getValue());
+        glls = edosUtil.getHistStat(glpoint.getNemCode(), beginDate.getTime() / 1000, endDate.getTime() / 1000, null, 900L, StatData.AVG.getValue());
 
-            if (!fsls.isEmpty() && !glls.isEmpty() && fsls.size() == glls.size()) {
-                for (int i = 0; i < fsls.size(); i++) {
-                    PointData fspd = fsls.get(i);
-                    PointData glpd = fsls.get(i);
-                    ProEconActivePowerData po = new ProEconActivePowerData();
-                    po.setWindturbineId(wt.getId());
-                    po.setModelId(wt.getModelId());
-                    po.setWindpowerstationId(wt.getWindpowerstationId());
-                    po.setFrequency(fsls.size());
-                    po.setSpeed(StringUtils.round(fspd.getPointValueInDouble(), 2));
-                    po.setPower(StringUtils.round(glpd.getPointValueInDouble(), 2));
-                    queryDay.add(po);
-                }
+        if (!fsls.isEmpty() && !glls.isEmpty() && fsls.size() == glls.size()) {
+            for (int i = 0; i < fsls.size(); i++) {
+                PointData fspd = fsls.get(i);
+                PointData glpd = fsls.get(i);
+                ProEconActivePowerData po = new ProEconActivePowerData();
+                po.setWindturbineId(wt.getId());
+                po.setModelId(wt.getModelId());
+                po.setWindpowerstationId(wt.getWindpowerstationId());
+                po.setFrequency(fsls.size());
+                po.setSpeed(StringUtils.round(fspd.getPointValueInDouble(), 2));
+                po.setPower(StringUtils.round(glpd.getPointValueInDouble(), 2));
+                queryDay.add(po);
             }
-            dayList = calCoefficient(queryDay, wt);
+        }
+        dayList = calCoefficient(queryDay, wt);
 
 
-            Double resultYear = coefficient(yearList, currentDate, wt.getId());
-            Double resultMonth = coefficient(monthList, currentDate, wt.getId());
-            Double resultDay = coefficient(dayList, currentDate, wt.getId());
+        Double resultYear = coefficient(yearList, currentDate, wt.getId());
+        Double resultMonth = coefficient(monthList, currentDate, wt.getId());
+        Double resultDay = coefficient(dayList, currentDate, wt.getId());
 
-            Map<String, Double> tempmap = new HashMap<>();
-            tempmap.put("year", resultYear);
-            tempmap.put("month", resultMonth);
-            tempmap.put("day", resultDay);
-            resultmap.put(wt.getId(), tempmap);
+        Map<String, Double> tempmap = new HashMap<>();
+        tempmap.put("year", resultYear);
+        tempmap.put("month", resultMonth);
+        tempmap.put("day", resultDay);
+        resultmap.put(wt.getId(), tempmap);
 
 //        }
 

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

@@ -75,7 +75,7 @@ public class EquipmentInfo15minuteService {
         }
         for(ProBasicEquipment wt:CacheContext.wtls)
         {
-            if(CacheContext.wppointmap.containsKey(wt.getId()))
+            if(CacheContext.wtpAimap.containsKey(wt.getId()))
             {
                 Map<String, ProBasicEquipmentPoint> pointmap=CacheContext.wtpAimap.get(wt.getId());
 
@@ -87,12 +87,12 @@ public class EquipmentInfo15minuteService {
                 pewp.setProjectId(wt.getProjectId());
                 pewp.setRegionId(wt.getRegionId());
                 pewp.setRecordDate(recordDate);
+                pewp.setWindturbineId(wt.getId());
 
 
-
-                if(pointmap.containsKey(ContantXk.SSPJFS))
+                if(pointmap.containsKey(ContantXk.CJ_SSFS))
                 {
-                    ProBasicEquipmentPoint point= pointmap.get(ContantXk.SSPJFS);
+                    ProBasicEquipmentPoint point= pointmap.get(ContantXk.CJ_SSFS);
                     List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getNemCode(), begin.getTime()/1000, end.getTime()/1000);
                     if(!pointls.isEmpty())
                     {
@@ -103,9 +103,9 @@ public class EquipmentInfo15minuteService {
 
                 }
 
-                if(pointmap.containsKey(ContantXk.SSZGL))
+                if(pointmap.containsKey(ContantXk.CJ_SSGL))
                 {
-                    ProBasicEquipmentPoint point= pointmap.get(ContantXk.SSZGL);
+                    ProBasicEquipmentPoint point= pointmap.get(ContantXk.CJ_SSGL);
                     List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getNemCode(), begin.getTime()/1000, end.getTime()/1000);
                     if(!pointls.isEmpty())
                     {

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

@@ -24,11 +24,11 @@ import java.util.*;
 public class GoodnessOfFitService {
 
 
-//        private static final Logger logger = LoggerFactory.getLogger(GoodnessOfFitService.class);
-        @Resource
-        private IEdosUtil edosUtil;
-        @Resource
-        private IProEconWtCurveFittingMonthService proEconWtCurveFittingMonthService;
+    //        private static final Logger logger = LoggerFactory.getLogger(GoodnessOfFitService.class);
+    @Resource
+    private IEdosUtil edosUtil;
+    @Resource
+    private IProEconWtCurveFittingMonthService proEconWtCurveFittingMonthService;
 
     public Map<String,Map<String,Double>> goodnessOfFit(String wtId,Date nowDate) throws Exception {
 
@@ -57,10 +57,10 @@ public class GoodnessOfFitService {
 
         List<FitClassVo> theList = new ArrayList<>();
 
-           List<ProEconWtCurveFittingMonth> powerList;
+        List<ProEconWtCurveFittingMonth> powerList;
         QueryWrapper<ProEconWtCurveFittingMonth> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("year",year).eq("month",month).eq("windturbine_id",wtId);
-            powerList = proEconWtCurveFittingMonthService.list(queryWrapper);
+        powerList = proEconWtCurveFittingMonthService.list(queryWrapper);
 //                    .stream().filter(i->i.getMonth().equals(month)
 //                && i.getWindturbineId().equals(wtId)
 //                && i.getYear().equals(year)).collect(Collectors.toList());
@@ -69,126 +69,126 @@ public class GoodnessOfFitService {
 //
 //            {
 
-                List<FitClassVo> fitsD= new ArrayList<>();
-                List<FitClassVo> fitsM= new ArrayList<>();
-                List<FitClassVo> fitsY= new ArrayList<>();
+        List<FitClassVo> fitsD= new ArrayList<>();
+        List<FitClassVo> fitsM= new ArrayList<>();
+        List<FitClassVo> fitsY= new ArrayList<>();
 
 
-                //月数据筛选日分钟间隔
-                Map<String, ProBasicEquipmentPoint> wtpointmap= CacheContext.wtpAimap.get(wt.getId());
-                ProBasicEquipmentPoint fspoint=wtpointmap.get(ContantXk.CJ_SSFS);
-                List<PointData>  fsls=edosUtil.getHistStat(fspoint.getNemCode(),startDate.getTime()/1000,endDate.getTime()/1000,null, 900L, StatData.AVG.getValue());
+        //月数据筛选日分钟间隔
+        Map<String, ProBasicEquipmentPoint> wtpointmap= CacheContext.wtpAimap.get(wt.getId());
+        ProBasicEquipmentPoint fspoint=wtpointmap.get(ContantXk.CJ_SSFS);
+        List<PointData>  fsls=edosUtil.getHistStat(fspoint.getNemCode(),startDate.getTime()/1000,endDate.getTime()/1000,null, 900L, StatData.AVG.getValue());
 
-                ProBasicEquipmentPoint glpoint=wtpointmap.get(ContantXk.CJ_SSGL);
-                List<PointData>  glls=edosUtil.getHistStat(glpoint.getNemCode(),startDate.getTime()/1000,endDate.getTime()/1000,null,900L, StatData.AVG.getValue());
+        ProBasicEquipmentPoint glpoint=wtpointmap.get(ContantXk.CJ_SSGL);
+        List<PointData>  glls=edosUtil.getHistStat(glpoint.getNemCode(),startDate.getTime()/1000,endDate.getTime()/1000,null,900L, StatData.AVG.getValue());
 
-                if(!fsls.isEmpty() && !glls.isEmpty() && fsls.size()==glls.size())
-                {
-                    for(int i=0;i<fsls.size();i++)
-                    {
-                        PointData fspd=fsls.get(i);
-                        PointData glpd=glls.get(i);
-                        FitClassVo po=new FitClassVo();
-                        po.setWindturbineId(wt.getId());
-                        po.setModelId(wt.getModelId());
-                        po.setWindpowerstationId(wt.getWindpowerstationId());
-
-                        po.setSpeed(StringUtils.round(fspd.getPointValueInDouble(),2));
-                        po.setPower(StringUtils.round(glpd.getPointValueInDouble(),2));
-                        fitsD.add(po);
-                    }
-                }
+        if(!fsls.isEmpty() && !glls.isEmpty() && fsls.size()==glls.size())
+        {
+            for(int i=0;i<fsls.size();i++)
+            {
+                PointData fspd=fsls.get(i);
+                PointData glpd=glls.get(i);
+                FitClassVo po=new FitClassVo();
+                po.setWindturbineId(wt.getId());
+                po.setModelId(wt.getModelId());
+                po.setWindpowerstationId(wt.getWindpowerstationId());
+
+                po.setSpeed(StringUtils.round(fspd.getPointValueInDouble(),2));
+                po.setPower(StringUtils.round(glpd.getPointValueInDouble(),2));
+                fitsD.add(po);
+            }
+        }
 
-                //月数据筛选15分钟间隔
-                fsls=edosUtil.getHistStat(fspoint.getNemCode(),startDateM.getTime()/1000,endDate.getTime()/1000,null,900L, StatData.AVG.getValue());
-                glls=edosUtil.getHistStat(glpoint.getNemCode(),startDateM.getTime()/1000,endDate.getTime()/1000,null,900L, StatData.AVG.getValue());
+        //月数据筛选15分钟间隔
+        fsls=edosUtil.getHistStat(fspoint.getNemCode(),startDateM.getTime()/1000,endDate.getTime()/1000,null,900L, StatData.AVG.getValue());
+        glls=edosUtil.getHistStat(glpoint.getNemCode(),startDateM.getTime()/1000,endDate.getTime()/1000,null,900L, StatData.AVG.getValue());
 
-                if(!fsls.isEmpty() && !glls.isEmpty() && fsls.size()==glls.size())
-                {
-                    for(int i=0;i<fsls.size();i++)
-                    {
-                        PointData fspd=fsls.get(i);
-                        PointData glpd=glls.get(i);
-                        FitClassVo po=new FitClassVo();
-                        po.setWindturbineId(wt.getId());
-                        po.setModelId(wt.getModelId());
-                        po.setWindpowerstationId(wt.getWindpowerstationId());
-
-                        po.setSpeed(StringUtils.round(fspd.getPointValueInDouble(),2));
-                        po.setPower(StringUtils.round(glpd.getPointValueInDouble(),2));
-                        fitsM.add(po);
-                    }
-                }
-                //年数据筛选15分钟间隔
-                fsls=edosUtil.getHistStat(fspoint.getNemCode(),startDateY.getTime()/1000,endDate.getTime()/1000,null,900L, StatData.AVG.getValue());
-                glls=edosUtil.getHistStat(glpoint.getNemCode(),startDateY.getTime()/1000,endDate.getTime()/1000,null,900L, StatData.AVG.getValue());
+        if(!fsls.isEmpty() && !glls.isEmpty() && fsls.size()==glls.size())
+        {
+            for(int i=0;i<fsls.size();i++)
+            {
+                PointData fspd=fsls.get(i);
+                PointData glpd=glls.get(i);
+                FitClassVo po=new FitClassVo();
+                po.setWindturbineId(wt.getId());
+                po.setModelId(wt.getModelId());
+                po.setWindpowerstationId(wt.getWindpowerstationId());
+
+                po.setSpeed(StringUtils.round(fspd.getPointValueInDouble(),2));
+                po.setPower(StringUtils.round(glpd.getPointValueInDouble(),2));
+                fitsM.add(po);
+            }
+        }
+        //年数据筛选15分钟间隔
+        fsls=edosUtil.getHistStat(fspoint.getNemCode(),startDateY.getTime()/1000,endDate.getTime()/1000,null,900L, StatData.AVG.getValue());
+        glls=edosUtil.getHistStat(glpoint.getNemCode(),startDateY.getTime()/1000,endDate.getTime()/1000,null,900L, StatData.AVG.getValue());
 
-                if(!fsls.isEmpty() && !glls.isEmpty() && fsls.size()==glls.size())
-                {
-                    for(int i=0;i<fsls.size();i++)
-                    {
-                        PointData fspd=fsls.get(i);
-                        PointData glpd=glls.get(i);
-                        FitClassVo po=new FitClassVo();
-                        po.setWindturbineId(wt.getId());
-                        po.setModelId(wt.getModelId());
-                        po.setWindpowerstationId(wt.getWindpowerstationId());
-
-                        po.setSpeed(StringUtils.round(fspd.getPointValueInDouble(),2));
-                        po.setPower(StringUtils.round(glpd.getPointValueInDouble(),2));
-                        fitsY.add(po);
-                    }
-                }
+        if(!fsls.isEmpty() && !glls.isEmpty() && fsls.size()==glls.size())
+        {
+            for(int i=0;i<fsls.size();i++)
+            {
+                PointData fspd=fsls.get(i);
+                PointData glpd=glls.get(i);
+                FitClassVo po=new FitClassVo();
+                po.setWindturbineId(wt.getId());
+                po.setModelId(wt.getModelId());
+                po.setWindpowerstationId(wt.getWindpowerstationId());
+
+                po.setSpeed(StringUtils.round(fspd.getPointValueInDouble(),2));
+                po.setPower(StringUtils.round(glpd.getPointValueInDouble(),2));
+                fitsY.add(po);
+            }
+        }
 
-                buildList(theMapY, theList, wt.getWindpowerstationId(), fitsY, powerList);
-                buildList(theMapM, theList, wt.getWindpowerstationId(), fitsM, powerList);
-                buildList(theMapD, theList, wt.getWindpowerstationId(), fitsD, powerList);
+        buildList(theMapY, theList, wt.getWindpowerstationId(), fitsY, powerList);
+        buildList(theMapM, theList, wt.getWindpowerstationId(), fitsM, powerList);
+        buildList(theMapD, theList, wt.getWindpowerstationId(), fitsD, powerList);
 
 
-                theMapD.forEach((key,value)->{
-                    if(resultmap.containsKey(key))
-                    {
-                        Map<String,Double> tempmap=resultmap.get(key);
-                        tempmap.put("day",value.getPower() > 1 ? 1 : value.getPower());
-                        resultmap.put(key,tempmap);
-                    }else
-                    {
-                        Map<String,Double> tempmap=new HashMap<>();
-                        tempmap.put("day",value.getPower() > 1 ? 1 : value.getPower());
-                        resultmap.put(key,tempmap);
-                    }
+        theMapD.forEach((key,value)->{
+            if(resultmap.containsKey(key))
+            {
+                Map<String,Double> tempmap=resultmap.get(key);
+                tempmap.put("day",value.getPower() > 1 ? 1 : value.getPower());
+                resultmap.put(key,tempmap);
+            }else
+            {
+                Map<String,Double> tempmap=new HashMap<>();
+                tempmap.put("day",value.getPower() > 1 ? 1 : value.getPower());
+                resultmap.put(key,tempmap);
+            }
 
-                });
+        });
 
-                theMapM.forEach((key,value)->{
-                    if(resultmap.containsKey(key))
-                    {
-                        Map<String,Double> tempmap=resultmap.get(key);
-                        tempmap.put("month",value.getPower() > 1 ? 1 : value.getPower());
-                        resultmap.put(key,tempmap);
-                    }else
-                    {
-                        Map<String,Double> tempmap=new HashMap<>();
-                        tempmap.put("month",value.getPower() > 1 ? 1 : value.getPower());
-                        resultmap.put(key,tempmap);
-                    }
+        theMapM.forEach((key,value)->{
+            if(resultmap.containsKey(key))
+            {
+                Map<String,Double> tempmap=resultmap.get(key);
+                tempmap.put("month",value.getPower() > 1 ? 1 : value.getPower());
+                resultmap.put(key,tempmap);
+            }else
+            {
+                Map<String,Double> tempmap=new HashMap<>();
+                tempmap.put("month",value.getPower() > 1 ? 1 : value.getPower());
+                resultmap.put(key,tempmap);
+            }
 
-                });
+        });
 
-                theMapY.forEach((key,value)->{
-                    if(resultmap.containsKey(key))
-                    {
-                        Map<String,Double> tempmap=resultmap.get(key);
-                        tempmap.put("year",value.getPower() > 1 ? 1 : value.getPower());
-                        resultmap.put(key,tempmap);
-                    }else
-                    {
-                        Map<String,Double> tempmap=new HashMap<>();
-                        tempmap.put("year",value.getPower() > 1 ? 1 : value.getPower());
-                        resultmap.put(key,tempmap);
-                    }
+        theMapY.forEach((key,value)->{
+            if(resultmap.containsKey(key))
+            {
+                Map<String,Double> tempmap=resultmap.get(key);
+                tempmap.put("year",value.getPower() > 1 ? 1 : value.getPower());
+                resultmap.put(key,tempmap);
+            }else
+            {
+                Map<String,Double> tempmap=new HashMap<>();
+                tempmap.put("year",value.getPower() > 1 ? 1 : value.getPower());
+                resultmap.put(key,tempmap);
+            }
 
-                });
+        });
 //            }
 
 
@@ -311,7 +311,7 @@ public class GoodnessOfFitService {
             int number=vo.getNumber();
             vo.setSpeed(item.getSpeed()+speed);
             vo.setPower(item.getPower()+value1);
-            vo.setEpower(item.getEpower()+value2);
+            vo.setEpower(epower+value2);
             number=number+1;
             vo.setNumber(number);
             theMap.put(item.getWindturbineId(),vo);

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

@@ -844,7 +844,7 @@ public class InitialPointGoldenXkByEqService implements IinitialPoint {
                             po.setNemCode(String.valueOf(sbtable));
                         }else
                         {
-                            po.setNemCode("INITIAL");
+                            po.setNemCode(String.valueOf(sbtable));
                         }
 
                         sb = new StringBuilder();

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

@@ -74,8 +74,28 @@ public class SaticSchedulePgTask {
     @Resource
     private EquipmentInfo15minuteService equipmentInfo15minuteService;
 
+    @Resource
+    private TimelinessRateService timelinessRateService;
+
+
+    /**
+     * 故障转换率
+     * 每15钟执行一次
+     */
+
+    @XxlJob("calFailRate_PG")
+    public void calFailRate_PG()  {
 
 
+        XxlJobHelper.log("故障转换率记录调度程序执行开始!........");
+        try {
+            timelinessRateService.failRate(new Date());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        XxlJobHelper.log("故障转换率记录调度任务处理完成!........");
+    }
+
     //3.添加定时任务
     /**
      * 切入切出统计