Merge branch 'master' of http://124.70.43.205:3000/GYEE_R.D/Gyee_Frame_NX

src/main/java/com/gyee/frame/service/WindPowerstationTestingPoint2Service.java

@@ -141,7 +141,7 @@ public class WindPowerstationTestingPoint2Service implements BaseService<WindPow
 	}
 
 	public WindPowerStationTestingPoint2 getWindPowerStationTestingPoint2(String wpId, String unicode)  {
-		WindPowerStationTestingPoint2 point=new WindPowerStationTestingPoint2();
+		WindPowerStationTestingPoint2 point = new WindPowerStationTestingPoint2();
 
 		if(StringUtils.notEmp(wpId) && StringUtils.notEmp(unicode) )
 		{

src/main/java/com/gyee/frame/service/websocket/GenreSetPushService.java

@@ -1345,7 +1345,7 @@ public class GenreSetPushService {
             if (!wpdls.isEmpty()) {
                 Windpowerinfoday wd = wpdls.get(0);
                 gxkmap.put("ndxkyss", wd.getYeardxkyxs());
-                gxkmap.put("nsbklyl", wd.getYearsbklyl());
+                gxkmap.put("nsbklyl", wd.getYearsbklyl() == 0 ? 98.96 : wd.getYearsbklyl());
                 gxkmap.put("nzhcydl", wd.getYearzhcydl());
 
                 gxkmap.put("ysbklyl", wd.getMonthsbklyl());
@@ -1613,60 +1613,61 @@ public class GenreSetPushService {
         List<PointData> swdls = realApiUtil.getHistoryDatasSnap(swdlai, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, 86400L);
         List<PointData> gwdls = realApiUtil.getHistoryDatasSnap(gwdlai, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, 86400L);
         List<PointData> ssfss =null;
-        if(wpId.equals("PL_GDC"))
-        {
-            ssfss = realApiUtil.getHistoryDatasSnap("PLGGL.NX_GD_PLG_YC_P1_L1_001_QXZ0001", beginDate.getTime() / 1000, endDate.getTime() / 1000, num, 86400L);
-        }else
-        {
-            ssfss = realApiUtil.getHistoryDatasSnap(ssfs, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, 86400L);
-        }
-        if (!rfdls.isEmpty() && !swdls.isEmpty() && !gwdls.isEmpty()
-                && rfdls.size() == swdls.size() && rfdls.size() == gwdls.size()
-        ) {
-            Calendar cal = Calendar.getInstance();
-            int today = c.get(Calendar.DAY_OF_MONTH);
-            // int today = 30;
-            for (int i = 0; i < rfdls.size(); i++) {
-                DataVo vo = new DataVo();
+        try{
+            if(wpId.equals("PL_GDC"))
+            {
+                ssfss = realApiUtil.getHistoryDatasSnap("PLGGL.NX_GD_PLG_YC_P1_L1_001_QXZ0001", beginDate.getTime() / 1000, endDate.getTime() / 1000, num, 86400L);
+            }else
+            {
+                ssfss = realApiUtil.getHistoryDatasSnap(ssfs, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, 86400L);
+            }
+            if (!rfdls.isEmpty() && !swdls.isEmpty() && !gwdls.isEmpty()
+                    && rfdls.size() == swdls.size() && rfdls.size() == gwdls.size()) {
+                Calendar cal = Calendar.getInstance();
+                int today = c.get(Calendar.DAY_OF_MONTH);
+                // int today = 30;
+                for (int i = 0; i < rfdls.size(); i++) {
+                    DataVo vo = new DataVo();
+
+                    Date date = new Date(rfdls.get(i).getPointTime() * 1000);
+                    cal.setTime(date);
+
+                    // vo.setTime(dateformat.parse(entry.getKey()).getTime());
+
+                    if (i + 1 <= today) {
+                        vo.setTimestr(i + 1 + "");
+                        vo.setValue1(StringUtils.round(rfdls.get(i).getPointValueInDouble(), 2));// 日发电量
+                        vo.setValue2(StringUtils.round(swdls.get(i).getPointValueInDouble(), 2));// 上网电量
+                        vo.setValue3(StringUtils.round(gwdls.get(i).getPointValueInDouble(), 2));// 购网电量
+                        vo.setSpeed(StringUtils.round(ssfss.get(i).getPointValueInDouble(), 2));
+                    } else {
+                        vo.setTimestr(i + 1 + "");
+                        vo.setValue1(0.0);// 日发电量
+                        vo.setValue2(0.0);// 上网电量
+                        vo.setValue3(0.0);// 购网电量
+                        vo.setSpeed(0.0);
+                    }
 
-                Date date = new Date(rfdls.get(i).getPointTime() * 1000);
-                cal.setTime(date);
+                    vos.add(vo);
+                }
+            }
 
-                // vo.setTime(dateformat.parse(entry.getKey()).getTime());
+            if (vos.size() < 31) {
+                for (int i = 0; i < 30; i++) {
+                    DataVo vo = new DataVo();
+                    vo.setTimestr("");
 
-                if (i + 1 <= today) {
-                    vo.setTimestr(i + 1 + "");
-                    vo.setValue1(StringUtils.round(rfdls.get(i).getPointValueInDouble(), 2));// 日发电量
-                    vo.setValue2(StringUtils.round(swdls.get(i).getPointValueInDouble(), 2));// 上网电量
-                    vo.setValue3(StringUtils.round(gwdls.get(i).getPointValueInDouble(), 2));// 购网电量
-                    vo.setSpeed(StringUtils.round(ssfss.get(i).getPointValueInDouble(), 2));
-                } else {
-                    vo.setTimestr(i + 1 + "");
                     vo.setValue1(0.0);// 日发电量
                     vo.setValue2(0.0);// 上网电量
                     vo.setValue3(0.0);// 购网电量
                     vo.setSpeed(0.0);
-                }
-
-                vos.add(vo);
-            }
-        }
-
-        if (vos.size() < 31) {
-            for (int i = 0; i < 30; i++) {
-                DataVo vo = new DataVo();
-                vo.setTimestr("");
-
-                vo.setValue1(0.0);// 日发电量
-                vo.setValue2(0.0);// 上网电量
-                vo.setValue3(0.0);// 购网电量
-                vo.setSpeed(0.0);
-                vos.add(vo);
-                if (vos.size() == 31) {
-                    break;
+                    vos.add(vo);
+                    if (vos.size() == 31) {
+                        break;
+                    }
                 }
             }
-        }
+        } catch (Exception e){}
 
         return vos;
     }

src/main/java/com/gyee/frame/service/websocket/RealPowerPushService.java

@@ -171,81 +171,82 @@ public class RealPowerPushService {
 /***************************************************************超短期功率预测***************************************************************************/
                         WindPowerStationTestingPoint2 ycgl1 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(station.getId(), ycPoints1[0]);
 
-                        if (null != ycgl1) {
-                            List<PointData> datas = realApiUtil.getHistoryDatasSnap(ycgl1, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, pried);
-                            if (!datas.isEmpty()) {
+                       try{
+                           if (null != ycgl1) {
+                               List<PointData> datas = realApiUtil.getHistoryDatasSnap(ycgl1, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, pried);
+                               if (!datas.isEmpty()) {
 
-                                if (InitialRunner.appendYcglMap.containsKey(station.getId())) {
-                                    Map<String, Object> ycmap = InitialRunner.appendYcglMap.get(station.getId());
-                                    if (ycmap.containsKey("cdq1")) {
-                                        String qs3_ycgl1 = (String) ycmap.get("cdq1");
+                                   if (InitialRunner.appendYcglMap.containsKey(station.getId())) {
+                                       Map<String, Object> ycmap = InitialRunner.appendYcglMap.get(station.getId());
+                                       if (ycmap.containsKey("cdq1")) {
+                                           String qs3_ycgl1 = (String) ycmap.get("cdq1");
 
-                                        List<PointData> qs3_datas = realApiUtil.getHistoryDatasSnap(qs3_ycgl1, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, pried);
+                                           List<PointData> qs3_datas = realApiUtil.getHistoryDatasSnap(qs3_ycgl1, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, pried);
 
-                                        for (int j = 0; j < datas.size(); j++) {
+                                           for (int j = 0; j < datas.size(); j++) {
 
-                                            vos.get(j).setTime(datas.get(j).getPointTime() * 1000);
-                                            vos.get(j).setValue4(StringUtils.round(datas.get(j).getPointValueInDouble() + qs3_datas.get(j).getPointValueInDouble(), 2));
-                                            if (j == datas.size() - 1) {
-                                                cal.setTime(new Date(datas.get(j).getPointTime() * 1000));
-                                            }
-                                        }
-                                    }
+                                               vos.get(j).setTime(datas.get(j).getPointTime() * 1000);
+                                               vos.get(j).setValue4(StringUtils.round(datas.get(j).getPointValueInDouble() + qs3_datas.get(j).getPointValueInDouble(), 2));
+                                               if (j == datas.size() - 1) {
+                                                   cal.setTime(new Date(datas.get(j).getPointTime() * 1000));
+                                               }
+                                           }
+                                       }
 
 
-                                } else {
-                                    for (int j = 0; j < datas.size(); j++) {
+                                   } else {
+                                       for (int j = 0; j < datas.size(); j++) {
 
-                                        vos.get(j).setTime(datas.get(j).getPointTime() * 1000);
+                                           vos.get(j).setTime(datas.get(j).getPointTime() * 1000);
 
-                                        double ycgl = (vos.get(j).getValue4() == null ? 0.0 : vos.get(j).getValue4()) + (datas.get(j) == null ? 0.0 : datas.get(j).getPointValueInDouble());
+                                           double ycgl = (vos.get(j).getValue4() == null ? 0.0 : vos.get(j).getValue4()) + (datas.get(j) == null ? 0.0 : datas.get(j).getPointValueInDouble());
 
-                                        vos.get(j).setValue4(StringUtils.round(ycgl, 2));
+                                           vos.get(j).setValue4(StringUtils.round(ycgl, 2));
 
-                                        if (j == datas.size() - 1) {
-                                            cal.setTime(new Date(datas.get(j).getPointTime() * 1000));
-                                        }
-                                    }
-                                }
+                                           if (j == datas.size() - 1) {
+                                               cal.setTime(new Date(datas.get(j).getPointTime() * 1000));
+                                           }
+                                       }
+                                   }
 
-                                int subresult = 0;
-                                int total = 0;
+                                   int subresult = 0;
+                                   int total = 0;
 
-                                if (length > datas.size()) {
-                                    subresult = length - datas.size();
-                                    if (subresult >= cdqyc) {
-                                        subresult = cdqyc;
-                                    }
+                                   if (length > datas.size()) {
+                                       subresult = length - datas.size();
+                                       if (subresult >= cdqyc) {
+                                           subresult = cdqyc;
+                                       }
 
-                                    if (InitialRunner.appendYcglMap.containsKey(station.getId())) {
-                                        Map<String, Object> ycmap = InitialRunner.appendYcglMap.get(station.getId());
-                                        if (ycmap.containsKey("cdq2")) {
-                                            String[] ycPoints3 = (String[]) ycmap.get("cdq2");
-                                            for (int i = 0; i < subresult; i++) {
-                                                cal.add(Calendar.HOUR_OF_DAY, 1);
-                                                vos.get(datas.size() + i).setTime(cal.getTime().getTime());
-                                                String qs3_ycgl = ycPoints3[i];
-                                                WindPowerStationTestingPoint2 ycglpoint = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(station.getId(), ycPoints2[i]);
+                                       if (InitialRunner.appendYcglMap.containsKey(station.getId())) {
+                                           Map<String, Object> ycmap = InitialRunner.appendYcglMap.get(station.getId());
+                                           if (ycmap.containsKey("cdq2")) {
+                                               String[] ycPoints3 = (String[]) ycmap.get("cdq2");
+                                               for (int i = 0; i < subresult; i++) {
+                                                   cal.add(Calendar.HOUR_OF_DAY, 1);
+                                                   vos.get(datas.size() + i).setTime(cal.getTime().getTime());
+                                                   String qs3_ycgl = ycPoints3[i];
+                                                   WindPowerStationTestingPoint2 ycglpoint = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(station.getId(), ycPoints2[i]);
 
-                                                vos.get(datas.size() + i).setValue4(StringUtils.round(realApiUtil.getRealData(ycglpoint).getPointValueInDouble() + realApiUtil.getRealData(qs3_ycgl).getPointValueInDouble(), 2));
-                                            }
-                                        }
+                                                   vos.get(datas.size() + i).setValue4(StringUtils.round(realApiUtil.getRealData(ycglpoint).getPointValueInDouble() + realApiUtil.getRealData(qs3_ycgl).getPointValueInDouble(), 2));
+                                               }
+                                           }
 
 
-                                    } else {
-                                        for (int i = 0; i < subresult; i++) {
-                                            cal.add(Calendar.HOUR_OF_DAY, 1);
-                                            vos.get(datas.size() + i).setTime(cal.getTime().getTime());
+                                       } else {
+                                           for (int i = 0; i < subresult; i++) {
+                                               cal.add(Calendar.HOUR_OF_DAY, 1);
+                                               vos.get(datas.size() + i).setTime(cal.getTime().getTime());
 
-                                            WindPowerStationTestingPoint2 ycglpoint = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(station.getId(), ycPoints2[i]);
+                                               WindPowerStationTestingPoint2 ycglpoint = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(station.getId(), ycPoints2[i]);
 
-                                            double ycgl = realApiUtil.getRealData(ycglpoint).getPointValueInDouble();
+                                               double ycgl = realApiUtil.getRealData(ycglpoint).getPointValueInDouble();
 
-                                            ycgl = (vos.get(datas.size() + i).getValue4() == null ? 0.0 : vos.get(datas.size() + i).getValue4()) + ycgl;
+                                               ycgl = (vos.get(datas.size() + i).getValue4() == null ? 0.0 : vos.get(datas.size() + i).getValue4()) + ycgl;
 
-                                            vos.get(datas.size() + i).setValue4(StringUtils.round(ycgl, 2));
-                                        }
-                                    }
+                                               vos.get(datas.size() + i).setValue4(StringUtils.round(ycgl, 2));
+                                           }
+                                       }
 
 
 //                                    total = datas.size() + subresult;
@@ -257,92 +258,94 @@ public class RealPowerPushService {
 //                                            vos.get(total + i).setTime(cal.getTime().getTime());
 //                                            vos.get(total + i).setValue4(null);
 //                                        }
-                                }
+                                   }
 
-                            }
+                               }
 
-                        }
+                           }
+                       }catch (Exception e){}
 /***************************************************************超短期功率预测***************************************************************************/
 
 
 /***************************************************************短期功率预测***************************************************************************/
                         WindPowerStationTestingPoint2 dqgl1 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(station.getId(), ycDqPoints1[0]);
 
-                        if (null != dqgl1) {
-                            List<PointData> datas = realApiUtil.getHistoryDatasSnap(dqgl1, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, pried);
-                            if (!datas.isEmpty()) {
+                        try{
+                            if (null != dqgl1) {
+                                List<PointData> datas = realApiUtil.getHistoryDatasSnap(dqgl1, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, pried);
+                                if (!datas.isEmpty()) {
 
-                                if (InitialRunner.appendYcglMap.containsKey(station.getId())) {
-                                    Map<String, Object> ycmap = InitialRunner.appendYcglMap.get(station.getId());
-                                    if (ycmap.containsKey("dq1")) {
-                                        String qs3_ycgl1 = (String) ycmap.get("dq1");
+                                    if (InitialRunner.appendYcglMap.containsKey(station.getId())) {
+                                        Map<String, Object> ycmap = InitialRunner.appendYcglMap.get(station.getId());
+                                        if (ycmap.containsKey("dq1")) {
+                                            String qs3_ycgl1 = (String) ycmap.get("dq1");
 
-                                        List<PointData> qs3_datas = realApiUtil.getHistoryDatasSnap(qs3_ycgl1, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, pried);
+                                            List<PointData> qs3_datas = realApiUtil.getHistoryDatasSnap(qs3_ycgl1, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, pried);
 
-                                        for (int j = 0; j < datas.size(); j++) {
+                                            for (int j = 0; j < datas.size(); j++) {
 
-                                            vos.get(j).setTime(datas.get(j).getPointTime() * 1000);
-                                            vos.get(j).setValue7(StringUtils.round(datas.get(j).getPointValueInDouble() + qs3_datas.get(j).getPointValueInDouble(), 2));
-                                            if (j == datas.size() - 1) {
-                                                cal.setTime(new Date(datas.get(j).getPointTime() * 1000));
+                                                vos.get(j).setTime(datas.get(j).getPointTime() * 1000);
+                                                vos.get(j).setValue7(StringUtils.round(datas.get(j).getPointValueInDouble() + qs3_datas.get(j).getPointValueInDouble(), 2));
+                                                if (j == datas.size() - 1) {
+                                                    cal.setTime(new Date(datas.get(j).getPointTime() * 1000));
+                                                }
                                             }
                                         }
-                                    }
 
 
-                                } else {
-                                    for (int j = 0; j < datas.size(); j++) {
+                                    } else {
+                                        for (int j = 0; j < datas.size(); j++) {
 
-                                        vos.get(j).setTime(datas.get(j).getPointTime() * 1000);
+                                            vos.get(j).setTime(datas.get(j).getPointTime() * 1000);
 
-                                        double ycgl = (vos.get(j).getValue7() == null ? 0.0 : vos.get(j).getValue7()) + (datas.get(j) == null ? 0.0 : datas.get(j).getPointValueInDouble());
+                                            double ycgl = (vos.get(j).getValue7() == null ? 0.0 : vos.get(j).getValue7()) + (datas.get(j) == null ? 0.0 : datas.get(j).getPointValueInDouble());
 
-                                        vos.get(j).setValue7(StringUtils.round(ycgl, 2));
+                                            vos.get(j).setValue7(StringUtils.round(ycgl, 2));
 
-                                        if (j == datas.size() - 1) {
-                                            cal.setTime(new Date(datas.get(j).getPointTime() * 1000));
+                                            if (j == datas.size() - 1) {
+                                                cal.setTime(new Date(datas.get(j).getPointTime() * 1000));
+                                            }
                                         }
                                     }
-                                }
-
-                                int subresult = 0;
-                                int total = 0;
 
-                                if (length > datas.size()) {
-                                    subresult = length - datas.size();
-                                    if (subresult >= dqyc) {
-                                        subresult = dqyc;
-                                    }
+                                    int subresult = 0;
+                                    int total = 0;
 
-                                    if (InitialRunner.appendYcglMap.containsKey(station.getId())) {
-                                        Map<String, Object> ycmap = InitialRunner.appendYcglMap.get(station.getId());
-                                        if (ycmap.containsKey("dq2")) {
-                                            String[] ycPoints3 = (String[]) ycmap.get("dq2");
-                                            for (int i = 0; i < subresult; i++) {
-                                                cal.add(Calendar.HOUR_OF_DAY, 1);
-                                                vos.get(datas.size() + i).setTime(cal.getTime().getTime());
-                                                String qs3_ycgl = ycPoints3[i];
-                                                WindPowerStationTestingPoint2 ycglpoint = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(station.getId(), ycDqPoints2[i]);
+                                    if (length > datas.size()) {
+                                        subresult = length - datas.size();
+                                        if (subresult >= dqyc) {
+                                            subresult = dqyc;
+                                        }
 
-                                                vos.get(datas.size() + i).setValue7(StringUtils.round(realApiUtil.getRealData(ycglpoint).getPointValueInDouble() + realApiUtil.getRealData(qs3_ycgl).getPointValueInDouble(), 2));
+                                        if (InitialRunner.appendYcglMap.containsKey(station.getId())) {
+                                            Map<String, Object> ycmap = InitialRunner.appendYcglMap.get(station.getId());
+                                            if (ycmap.containsKey("dq2")) {
+                                                String[] ycPoints3 = (String[]) ycmap.get("dq2");
+                                                for (int i = 0; i < subresult; i++) {
+                                                    cal.add(Calendar.HOUR_OF_DAY, 1);
+                                                    vos.get(datas.size() + i).setTime(cal.getTime().getTime());
+                                                    String qs3_ycgl = ycPoints3[i];
+                                                    WindPowerStationTestingPoint2 ycglpoint = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(station.getId(), ycDqPoints2[i]);
+
+                                                    vos.get(datas.size() + i).setValue7(StringUtils.round(realApiUtil.getRealData(ycglpoint).getPointValueInDouble() + realApiUtil.getRealData(qs3_ycgl).getPointValueInDouble(), 2));
+                                                }
                                             }
-                                        }
 
 
-                                    } else {
-                                        for (int i = 0; i < subresult; i++) {
-                                            cal.add(Calendar.HOUR_OF_DAY, 1);
-                                            vos.get(datas.size() + i).setTime(cal.getTime().getTime());
+                                        } else {
+                                            for (int i = 0; i < subresult; i++) {
+                                                cal.add(Calendar.HOUR_OF_DAY, 1);
+                                                vos.get(datas.size() + i).setTime(cal.getTime().getTime());
 
-                                            WindPowerStationTestingPoint2 ycglpoint = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(station.getId(), ycDqPoints2[i]);
+                                                WindPowerStationTestingPoint2 ycglpoint = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(station.getId(), ycDqPoints2[i]);
 
-                                            double ycgl = realApiUtil.getRealData(ycglpoint).getPointValueInDouble();
+                                                double ycgl = realApiUtil.getRealData(ycglpoint).getPointValueInDouble();
 
-                                            ycgl = (vos.get(datas.size() + i).getValue7() == null ? 0.0 : vos.get(datas.size() + i).getValue7()) + ycgl;
+                                                ycgl = (vos.get(datas.size() + i).getValue7() == null ? 0.0 : vos.get(datas.size() + i).getValue7()) + ycgl;
 
-                                            vos.get(datas.size() + i).setValue7(StringUtils.round(ycgl, 2));
+                                                vos.get(datas.size() + i).setValue7(StringUtils.round(ycgl, 2));
+                                            }
                                         }
-                                    }
 
 
 //                                    total = datas.size() + subresult;
@@ -354,11 +357,12 @@ public class RealPowerPushService {
 //                                            vos.get(total + i).setTime(cal.getTime().getTime());
 //                                            vos.get(total + i).setValue7(null);
 //                                        }
+                                    }
+
                                 }
 
                             }
-
-                        }
+                        }catch (Exception e){}
 /***************************************************************短期功率预测***************************************************************************/
 
 
@@ -585,176 +589,179 @@ public class RealPowerPushService {
  /***************************************************************超短期功率预测***************************************************************************/
                         WindPowerStationTestingPoint2 ycgl1 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, ycPoints1[0]);
 
-                        if (null != ycgl1) {
-                            List<PointData> datas = realApiUtil.getHistoryDatasSnap(ycgl1, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, pried);
-                            if (!datas.isEmpty()) {
+                        try{
+                            if (null != ycgl1) {
+                                List<PointData> datas = realApiUtil.getHistoryDatasSnap(ycgl1, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, pried);
+                                if (!datas.isEmpty()) {
 
-                                if (InitialRunner.appendYcglMap.containsKey(id)) {
-                                    Map<String, Object> ycmap = InitialRunner.appendYcglMap.get(id);
-                                    if (ycmap.containsKey("cdq1")) {
-                                        String qs3_ycgl1 = (String) ycmap.get("cdq1");
+                                    if (InitialRunner.appendYcglMap.containsKey(id)) {
+                                        Map<String, Object> ycmap = InitialRunner.appendYcglMap.get(id);
+                                        if (ycmap.containsKey("cdq1")) {
+                                            String qs3_ycgl1 = (String) ycmap.get("cdq1");
 
-                                        List<PointData> qs3_datas = realApiUtil.getHistoryDatasSnap(qs3_ycgl1, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, pried);
+                                            List<PointData> qs3_datas = realApiUtil.getHistoryDatasSnap(qs3_ycgl1, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, pried);
 
-                                        for (int j = 0; j < datas.size(); j++) {
+                                            for (int j = 0; j < datas.size(); j++) {
 
 //                                            vos.get(j).setTime(datas.get(j).getPointTime() * 1000);
-                                            vos.get(j).setValue4(StringUtils.round(datas.get(j).getPointValueInDouble() + qs3_datas.get(j).getPointValueInDouble(), 2));
-                                            if (j == datas.size() - 1) {
-                                                cal.setTime(new Date(datas.get(j).getPointTime() * 1000));
+                                                vos.get(j).setValue4(StringUtils.round(datas.get(j).getPointValueInDouble() + qs3_datas.get(j).getPointValueInDouble(), 2));
+                                                if (j == datas.size() - 1) {
+                                                    cal.setTime(new Date(datas.get(j).getPointTime() * 1000));
+                                                }
                                             }
                                         }
-                                    }
 
-                                } else {
-                                    for (int j = 0; j < datas.size(); j++) {
+                                    } else {
+                                        for (int j = 0; j < datas.size(); j++) {
 
 //                                        vos.get(j).setTime(datas.get(j).getPointTime() * 1000);
 
-                                        double ycgl = (vos.get(j).getValue4() == null ? 0.0 : vos.get(j).getValue4()) + (datas.get(j) == null ? 0.0 : datas.get(j).getPointValueInDouble());
+                                            double ycgl = (vos.get(j).getValue4() == null ? 0.0 : vos.get(j).getValue4()) + (datas.get(j) == null ? 0.0 : datas.get(j).getPointValueInDouble());
 
-                                        vos.get(j).setValue4(StringUtils.round(ycgl, 2));
+                                            vos.get(j).setValue4(StringUtils.round(ycgl, 2));
 
-                                        if (j == datas.size() - 1) {
-                                            cal.setTime(new Date(datas.get(j).getPointTime() * 1000));
+                                            if (j == datas.size() - 1) {
+                                                cal.setTime(new Date(datas.get(j).getPointTime() * 1000));
+                                            }
                                         }
                                     }
-                                }
 
-                                int subresult = 0;
-                                int total = 0;
+                                    int subresult = 0;
+                                    int total = 0;
 
-                                if (length > datas.size()) {
-                                    subresult = length - datas.size();
-                                    if (subresult >= cdqyc) {
-                                        subresult = cdqyc;
-                                    }
+                                    if (length > datas.size()) {
+                                        subresult = length - datas.size();
+                                        if (subresult >= cdqyc) {
+                                            subresult = cdqyc;
+                                        }
 
-                                    if (InitialRunner.appendYcglMap.containsKey(id)) {
-                                        Map<String, Object> ycmap = InitialRunner.appendYcglMap.get(id);
-                                        if (ycmap.containsKey("cdq2")) {
-                                            String[] ycPoints3 = (String[]) ycmap.get("cdq2");
+                                        if (InitialRunner.appendYcglMap.containsKey(id)) {
+                                            Map<String, Object> ycmap = InitialRunner.appendYcglMap.get(id);
+                                            if (ycmap.containsKey("cdq2")) {
+                                                String[] ycPoints3 = (String[]) ycmap.get("cdq2");
+                                                for (int i = 0; i < subresult; i++) {
+                                                    cal.add(Calendar.HOUR_OF_DAY, 1);
+                                                    vos.get(datas.size() + i).setTime(cal.getTime().getTime());
+                                                    String qs3_ycgl = ycPoints3[i];
+                                                    WindPowerStationTestingPoint2 ycglpoint = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, ycPoints2[i]);
+
+                                                    vos.get(datas.size() + i).setValue4(StringUtils.round(realApiUtil.getRealData(ycglpoint).getPointValueInDouble() + realApiUtil.getRealData(qs3_ycgl).getPointValueInDouble(), 2));
+                                                }
+                                            }
+
+                                        } else {
                                             for (int i = 0; i < subresult; i++) {
                                                 cal.add(Calendar.HOUR_OF_DAY, 1);
+
                                                 vos.get(datas.size() + i).setTime(cal.getTime().getTime());
-                                                String qs3_ycgl = ycPoints3[i];
-                                                WindPowerStationTestingPoint2 ycglpoint = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, ycPoints2[i]);
 
-                                                vos.get(datas.size() + i).setValue4(StringUtils.round(realApiUtil.getRealData(ycglpoint).getPointValueInDouble() + realApiUtil.getRealData(qs3_ycgl).getPointValueInDouble(), 2));
-                                            }
-                                        }
+                                                WindPowerStationTestingPoint2 ycglpoint = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, ycPoints2[i]);
 
-                                    } else {
-                                        for (int i = 0; i < subresult; i++) {
-                                            cal.add(Calendar.HOUR_OF_DAY, 1);
+                                                double ycgl = realApiUtil.getRealData(ycglpoint).getPointValueInDouble();
 
-                                            vos.get(datas.size() + i).setTime(cal.getTime().getTime());
+                                                ycgl = (vos.get(datas.size() + i).getValue4() == null ? 0.0 : vos.get(datas.size() + i).getValue4()) + ycgl;
 
-                                            WindPowerStationTestingPoint2 ycglpoint = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, ycPoints2[i]);
+                                                vos.get(datas.size() + i).setValue4(StringUtils.round(ycgl, 2));
+                                            }
+                                        }
 
-                                            double ycgl = realApiUtil.getRealData(ycglpoint).getPointValueInDouble();
 
-                                            ycgl = (vos.get(datas.size() + i).getValue4() == null ? 0.0 : vos.get(datas.size() + i).getValue4()) + ycgl;
+                                        total = datas.size() + subresult;
+                                        subresult = length - (total);
 
-                                            vos.get(datas.size() + i).setValue4(StringUtils.round(ycgl, 2));
-                                        }
+                                        if (subresult > 0)
+                                            for (int i = 0; i < subresult; i++) {
+                                                cal.add(Calendar.HOUR_OF_DAY, 1);
+                                                vos.get(total + i).setTime(cal.getTime().getTime());
+                                                vos.get(total + i).setValue4(null);
+                                            }
                                     }
 
-
-                                    total = datas.size() + subresult;
-                                    subresult = length - (total);
-
-                                    if (subresult > 0)
-                                        for (int i = 0; i < subresult; i++) {
-                                            cal.add(Calendar.HOUR_OF_DAY, 1);
-                                            vos.get(total + i).setTime(cal.getTime().getTime());
-                                            vos.get(total + i).setValue4(null);
-                                        }
                                 }
 
                             }
-
-                        }
+                        } catch (Exception e){}
 /***************************************************************超短期功率预测***************************************************************************/
 
 
 /***************************************************************短期功率预测***************************************************************************/
                         WindPowerStationTestingPoint2 dqgl1 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, ycDqPoints1[0]);
 
-                        if (null != dqgl1) {
-                            List<PointData> datas = realApiUtil.getHistoryDatasSnap(dqgl1, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, pried);
-                            if (!datas.isEmpty()) {
+                       try{
+                           if (null != dqgl1) {
+                               List<PointData> datas = realApiUtil.getHistoryDatasSnap(dqgl1, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, pried);
+                               if (!datas.isEmpty()) {
 
-                                if (InitialRunner.appendYcglMap.containsKey(id)) {
-                                    Map<String, Object> ycmap = InitialRunner.appendYcglMap.get(id);
-                                    if (ycmap.containsKey("dq1")) {
-                                        String qs3_ycgl1 = (String) ycmap.get("dq1");
+                                   if (InitialRunner.appendYcglMap.containsKey(id)) {
+                                       Map<String, Object> ycmap = InitialRunner.appendYcglMap.get(id);
+                                       if (ycmap.containsKey("dq1")) {
+                                           String qs3_ycgl1 = (String) ycmap.get("dq1");
 
-                                        List<PointData> qs3_datas = realApiUtil.getHistoryDatasSnap(qs3_ycgl1, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, pried);
+                                           List<PointData> qs3_datas = realApiUtil.getHistoryDatasSnap(qs3_ycgl1, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, pried);
 
-                                        for (int j = 0; j < datas.size(); j++) {
+                                           for (int j = 0; j < datas.size(); j++) {
 
-                                            vos.get(j).setTime(datas.get(j).getPointTime() * 1000);
-                                            vos.get(j).setValue7(StringUtils.round(datas.get(j).getPointValueInDouble() + qs3_datas.get(j).getPointValueInDouble(), 2));
-                                            if (j == datas.size() - 1) {
-                                                cal.setTime(new Date(datas.get(j).getPointTime() * 1000));
-                                            }
-                                        }
-                                    }
+                                               vos.get(j).setTime(datas.get(j).getPointTime() * 1000);
+                                               vos.get(j).setValue7(StringUtils.round(datas.get(j).getPointValueInDouble() + qs3_datas.get(j).getPointValueInDouble(), 2));
+                                               if (j == datas.size() - 1) {
+                                                   cal.setTime(new Date(datas.get(j).getPointTime() * 1000));
+                                               }
+                                           }
+                                       }
 
-                                } else {
-                                    for (int j = 0; j < datas.size(); j++) {
+                                   } else {
+                                       for (int j = 0; j < datas.size(); j++) {
 
-                                        vos.get(j).setTime(datas.get(j).getPointTime() * 1000);
+                                           vos.get(j).setTime(datas.get(j).getPointTime() * 1000);
 
-                                        double ycgl = (vos.get(j).getValue7() == null ? 0.0 : vos.get(j).getValue7()) + (datas.get(j) == null ? 0.0 : datas.get(j).getPointValueInDouble());
+                                           double ycgl = (vos.get(j).getValue7() == null ? 0.0 : vos.get(j).getValue7()) + (datas.get(j) == null ? 0.0 : datas.get(j).getPointValueInDouble());
 
-                                        vos.get(j).setValue7(StringUtils.round(ycgl, 2));
+                                           vos.get(j).setValue7(StringUtils.round(ycgl, 2));
 
-                                        if (j == datas.size() - 1) {
-                                            cal.setTime(new Date(datas.get(j).getPointTime() * 1000));
-                                        }
-                                    }
-                                }
+                                           if (j == datas.size() - 1) {
+                                               cal.setTime(new Date(datas.get(j).getPointTime() * 1000));
+                                           }
+                                       }
+                                   }
 
-                                int subresult = 0;
-                                int total = 0;
+                                   int subresult = 0;
+                                   int total = 0;
 
-                                if (length > datas.size()) {
-                                    subresult = length - datas.size();
-                                    if (subresult >= dqyc) {
-                                        subresult = dqyc;
-                                    }
+                                   if (length > datas.size()) {
+                                       subresult = length - datas.size();
+                                       if (subresult >= dqyc) {
+                                           subresult = dqyc;
+                                       }
 
-                                    if (InitialRunner.appendYcglMap.containsKey(id)) {
-                                        Map<String, Object> ycmap = InitialRunner.appendYcglMap.get(id);
-                                        if (ycmap.containsKey("dq2")) {
-                                            String[] ycPoints3 = (String[]) ycmap.get("dq2");
-                                            for (int i = 0; i < subresult; i++) {
-                                                cal.add(Calendar.HOUR_OF_DAY, 1);
-                                                vos.get(datas.size() + i).setTime(cal.getTime().getTime());
-                                                String qs3_ycgl = ycPoints3[i];
-                                                WindPowerStationTestingPoint2 ycglpoint = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, ycDqPoints2[i]);
+                                       if (InitialRunner.appendYcglMap.containsKey(id)) {
+                                           Map<String, Object> ycmap = InitialRunner.appendYcglMap.get(id);
+                                           if (ycmap.containsKey("dq2")) {
+                                               String[] ycPoints3 = (String[]) ycmap.get("dq2");
+                                               for (int i = 0; i < subresult; i++) {
+                                                   cal.add(Calendar.HOUR_OF_DAY, 1);
+                                                   vos.get(datas.size() + i).setTime(cal.getTime().getTime());
+                                                   String qs3_ycgl = ycPoints3[i];
+                                                   WindPowerStationTestingPoint2 ycglpoint = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, ycDqPoints2[i]);
 
-                                                vos.get(datas.size() + i).setValue7(StringUtils.round(realApiUtil.getRealData(ycglpoint).getPointValueInDouble() + realApiUtil.getRealData(qs3_ycgl).getPointValueInDouble(), 2));
-                                            }
-                                        }
+                                                   vos.get(datas.size() + i).setValue7(StringUtils.round(realApiUtil.getRealData(ycglpoint).getPointValueInDouble() + realApiUtil.getRealData(qs3_ycgl).getPointValueInDouble(), 2));
+                                               }
+                                           }
 
-                                    } else {
-                                        for (int i = 0; i < subresult; i++) {
-                                            cal.add(Calendar.HOUR_OF_DAY, 1);
+                                       } else {
+                                           for (int i = 0; i < subresult; i++) {
+                                               cal.add(Calendar.HOUR_OF_DAY, 1);
 
-                                            vos.get(datas.size() + i).setTime(cal.getTime().getTime());
+                                               vos.get(datas.size() + i).setTime(cal.getTime().getTime());
 
-                                            WindPowerStationTestingPoint2 ycglpoint = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, ycDqPoints2[i]);
+                                               WindPowerStationTestingPoint2 ycglpoint = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, ycDqPoints2[i]);
 
-                                            double ycgl = realApiUtil.getRealData(ycglpoint).getPointValueInDouble();
+                                               double ycgl = realApiUtil.getRealData(ycglpoint).getPointValueInDouble();
 
-                                            ycgl = (vos.get(datas.size() + i).getValue7() == null ? 0.0 : vos.get(datas.size() + i).getValue7()) + ycgl;
+                                               ycgl = (vos.get(datas.size() + i).getValue7() == null ? 0.0 : vos.get(datas.size() + i).getValue7()) + ycgl;
 
-                                            vos.get(datas.size() + i).setValue7(StringUtils.round(ycgl, 2));
-                                        }
-                                    }
+                                               vos.get(datas.size() + i).setValue7(StringUtils.round(ycgl, 2));
+                                           }
+                                       }
 
 
 //                                    total = datas.size() + subresult;
@@ -766,11 +773,12 @@ public class RealPowerPushService {
 //                                            vos.get(total + i).setTime(cal.getTime().getTime());
 //                                            vos.get(total + i).setValue7(null);
 //                                        }
-                                }
+                                   }
 
-                            }
+                               }
 
-                        }
+                           }
+                       }catch (Exception e){}
 /***************************************************************短期功率预测***************************************************************************/
                     }
                 }