计算服务程序优化

realtime/computing-services7001/src/main/java/com/gyee/generation/service/FiveLossesService.java

@@ -863,19 +863,21 @@ public class FiveLossesService {
         for(int i= 0;i<ztmxDatasSnap.size();i++){
             for (int j=0;j<pointDataList.size();j++){
                 if (pointDataList.get(j).getPointTime().equals(ztmxDatasSnap.get(i).getPointTime())){
-                    double bzgl = bzglDatasSnap.get(i).getPointValueInDouble();
-                    double zsgl = zsglDatasSnap.get(i).getPointValueInDouble();
-                    double power = powerDatasSnap.get(i).getPointValueInDouble();
-                    double temp = bzgl - power;
-                    if (temp>0){
-                        bzss+=temp;
-                    }
-                    double temp1 = zsgl - power;
-                    if (temp1>0){
-                        zsss+=temp1;
-                    }
+                    if (i<bzglDatasSnap.size() && i<zsglDatasSnap.size() && i<powerDatasSnap.size()){
+                        double bzgl = bzglDatasSnap.get(i).getPointValueInDouble();
+                        double zsgl = zsglDatasSnap.get(i).getPointValueInDouble();
+                        double power = powerDatasSnap.get(i).getPointValueInDouble();
+                        double temp = bzgl - power;
+                        if (temp>0){
+                            bzss+=temp;
+                        }
+                        double temp1 = zsgl - power;
+                        if (temp1>0){
+                            zsss+=temp1;
+                        }
 //                    bzss += (bzgl-power<0?0:bzgl-power);
 //                    zsss += (zsgl-power<0?0:zsgl-power);
+                    }
                 }
             }
         }

realtime/computing-services7001/src/main/java/com/gyee/generation/service/TheorypowerService.java

@@ -109,9 +109,12 @@ public class TheorypowerService {
                                         zbzgl = doubleDoubleMap.get(wtspeed);
                                     }
                                 }
-                                if (zsglMap.containsKey(wtspeed)){
-                                    zzsgl = zsglMap.get(wtspeed);
+                                if (zsglMap!=null){
+                                    if (zsglMap.containsKey(wtspeed)){
+                                        zzsgl = zsglMap.get(wtspeed);
+                                    }
                                 }
+
                             }
                         } catch (Exception e) {
                             e.printStackTrace();

realtime/computing-services7001/src/test/java/com/gyee/generation/GenerationTest.java

@@ -49,13 +49,13 @@ public class GenerationTest {
     @Test
     public void test1() throws Exception {
 //        averageAndGeneratingService.saveAvespeedAndAvepowerAndScada();
-        statusService.calculateStatus();
+//        statusService.calculateStatus();
 //        realtimeSpeedPowerService.calculateRealtimeSpeedPower();
 //        generationService.saveMeterpointValueRealtime();
 //        theorypowerService.fittingPower();
 //        theorypowerService.theropower();
 //        averageAndGeneratingService.saveAvespeedAndAvepowerAndScada();
-//        fiveLossesService.lossesReal();
+        fiveLossesService.lossesReal();
 //        fiveLossesService.saveShutdownevent();
 //        safetyService.safetyReatimel();
 //        fiveLossesService.lossesReal();

realtime/computing-services7002/src/main/java/com/gyee/generation/service/FiveLossesService.java

@@ -101,49 +101,49 @@ public class FiveLossesService {
             }
             double fjzt = sectionData.getPointValueInDouble();
             if (StringUtils.isNotEmpty(finalFaultWinturbines) && finalFaultWinturbines.contains(wt.getId())){    //此风机在之前故障未恢复列表
-                    if (fjzt!=6){
-                        //将时间存储到结束时间，算时间与电量
-                        Optional<Shutdownevent> first = shutdownevents.stream().filter(i -> i.getWindturbineid().equals(wt.getId())).findFirst();
-                        if (first.isPresent()){
-                            Shutdownevent shutdownevent = first.get();
-                            Date starttime = DateUtils.parseLongToDate(sectionData.getPointTime()*1000);
-                            shutdownevent.setStarttime(starttime);
-                            Date stoptime = shutdownevent.getStoptime();
-                            double hour = DateUtils.hoursDiff2(stoptime, starttime);
-                            shutdownevent.setStophours(hour);
+                if (fjzt!=6){
+                    //将时间存储到结束时间，算时间与电量
+                    Optional<Shutdownevent> first = shutdownevents.stream().filter(i -> i.getWindturbineid().equals(wt.getId())).findFirst();
+                    if (first.isPresent()){
+                        Shutdownevent shutdownevent = first.get();
+                        Date starttime = DateUtils.parseLongToDate(sectionData.getPointTime()*1000);
+                        shutdownevent.setStarttime(starttime);
+                        Date stoptime = shutdownevent.getStoptime();
+                        double hour = DateUtils.hoursDiff2(stoptime, starttime);
+                        shutdownevent.setStophours(hour);
 
-                            List<PointData> ztmxDatasSnap = null;
-                            List<PointData> bzglDatasSnap = null;
-                            List<PointData> zsglDatasSnap = null;
-                            List<PointData> powerDatasSnap = null;
-                            try {
-                                ztmxDatasSnap = edosUtil.getHistoryDatasSnap(ztmxPoint,stoptime.getTime()/1000,starttime.getTime()/1000,null,60l);
-                                bzglDatasSnap = edosUtil.getHistoryDatasSnap(bzglPoint,stoptime.getTime()/1000,starttime.getTime()/1000,null,60l);
-                                zsglDatasSnap = edosUtil.getHistoryDatasSnap(zsglPoint,stoptime.getTime()/1000,starttime.getTime()/1000,null,60l);
-                                powerDatasSnap = edosUtil.getHistoryDatasSnap(powerPoint, stoptime.getTime() / 1000, starttime.getTime() / 1000, null, 60l);
-                            } catch (Exception e) {
-                                e.printStackTrace();
-                            }
-                            if (ztmxDatasSnap.size() == zsglDatasSnap.size()){
-                                //故障
-                                double gzss = generalLoss(ztmxDatasSnap, bzglDatasSnap, zsglDatasSnap, powerDatasSnap, 6.0, resultList, windturbinetestingpointnewMap.get(Contant.WTRGZSSDL));
-                                shutdownevent.setLosspower(gzss);
-                            }
-                            shutdowneventService.saveOrUpdate(shutdownevent);
+                        List<PointData> ztmxDatasSnap = null;
+                        List<PointData> bzglDatasSnap = null;
+                        List<PointData> zsglDatasSnap = null;
+                        List<PointData> powerDatasSnap = null;
+                        try {
+                            ztmxDatasSnap = edosUtil.getHistoryDatasSnap(ztmxPoint,stoptime.getTime()/1000,starttime.getTime()/1000,null,60l);
+                            bzglDatasSnap = edosUtil.getHistoryDatasSnap(bzglPoint,stoptime.getTime()/1000,starttime.getTime()/1000,null,60l);
+                            zsglDatasSnap = edosUtil.getHistoryDatasSnap(zsglPoint,stoptime.getTime()/1000,starttime.getTime()/1000,null,60l);
+                            powerDatasSnap = edosUtil.getHistoryDatasSnap(powerPoint, stoptime.getTime() / 1000, starttime.getTime() / 1000, null, 60l);
+                        } catch (Exception e) {
+                            e.printStackTrace();
                         }
+                        if (ztmxDatasSnap.size() == zsglDatasSnap.size()){
+                            //故障
+                            double gzss = generalLoss(ztmxDatasSnap, bzglDatasSnap, zsglDatasSnap, powerDatasSnap, 6.0, resultList, windturbinetestingpointnewMap.get(Contant.WTRGZSSDL));
+                            shutdownevent.setLosspower(gzss);
+                        }
+                        shutdowneventService.saveOrUpdate(shutdownevent);
                     }
-                    if (fjzt==8){
-                        Shutdownevent shutdownevent = new Shutdownevent();
-                        shutdownevent.setId(CommonUtils.getUUID());
-                        shutdownevent.setWindpowerstationid(wt.getWindpowerstationid());
-                        shutdownevent.setWindturbineid(wt.getId());
-                        Date date = DateUtils.parseLongToDate(sectionData.getPointTime()*1000);
-                        shutdownevent.setStoptime(date);
-                        shutdownevent.setProjectid(wt.getProjectid());
-                        shutdownevent.setStatuscode(4);
-                        shutdowneventService.save(shutdownevent);
-                    }
                 }
+                if (fjzt==8){
+                    Shutdownevent shutdownevent = new Shutdownevent();
+                    shutdownevent.setId(CommonUtils.getUUID());
+                    shutdownevent.setWindpowerstationid(wt.getWindpowerstationid());
+                    shutdownevent.setWindturbineid(wt.getId());
+                    Date date = DateUtils.parseLongToDate(sectionData.getPointTime()*1000);
+                    shutdownevent.setStoptime(date);
+                    shutdownevent.setProjectid(wt.getProjectid());
+                    shutdownevent.setStatuscode(4);
+                    shutdowneventService.save(shutdownevent);
+                }
+            }
 
             else if (StringUtils.isNotEmpty(finalMainWinturbines) && finalMainWinturbines.contains(wt.getId())){    //此风机在之前故障未恢复列表
                 if (fjzt!=8){
@@ -661,7 +661,7 @@ public class FiveLossesService {
 
             double xnss = wpdaydjloss.get() + wpdaysdtjloss.get()+wpdayxnloss.get()+wpdayfdjclloss.get();
             resultList.add(createWpPointData(wppointnewMap.get(Contant.XNSSDL),xnss));
-             //故障
+            //故障
             addWpPoint(resultList, wppointnewMap.get(Contant.RGZZSDL), wpdaygzloss);
             addWpPoint(resultList, wppointnewMap.get(Contant.YGZZSDL), wpmonthgzloss);
             addWpPoint(resultList, wppointnewMap.get(Contant.NGZZSDL), wpyeargzloss);
@@ -688,7 +688,7 @@ public class FiveLossesService {
             addWpPoint(resultList, wppointnewMap.get(Contant.RQFZSDL), wpdayxdjclloss);
             addWpPoint(resultList, wppointnewMap.get(Contant.YQFZSDL), wpmonthxdjclloss);
             addWpPoint(resultList, wppointnewMap.get(Contant.NQFZSDL), wpyearxdjclloss);
-                //限电停机
+            //限电停机
             addWpPoint(resultList, wppointnewMap.get(Contant.RXDZSDL), wpdayxdtjloss);
             addWpPoint(resultList, wppointnewMap.get(Contant.YXDZSDL), wpmonthxdtjloss);
             addWpPoint(resultList, wppointnewMap.get(Contant.NXDZSDL), wpyearxdtjloss);
@@ -699,7 +699,7 @@ public class FiveLossesService {
             addWpPoint(resultList, wppointnewMap.get(Contant.RWZZSDL), wpdaydwslloss);
             addWpPoint(resultList, wppointnewMap.get(Contant.YWZZSDL), wpmonthdwslloss);
             addWpPoint(resultList, wppointnewMap.get(Contant.NWZZSDL), wpyeardwslloss);
-              //环境受累
+            //环境受累
             addWpPoint(resultList, wppointnewMap.get(Contant.RTZZSDL), wpdayhjslloss);
             addWpPoint(resultList, wppointnewMap.get(Contant.YTZZSDL), wpmonthhjslloss);
             addWpPoint(resultList, wppointnewMap.get(Contant.NTZZSDL), wpyearhjslloss);
@@ -863,19 +863,21 @@ public class FiveLossesService {
         for(int i= 0;i<ztmxDatasSnap.size();i++){
             for (int j=0;j<pointDataList.size();j++){
                 if (pointDataList.get(j).getPointTime().equals(ztmxDatasSnap.get(i).getPointTime())){
-                    double bzgl = bzglDatasSnap.get(i).getPointValueInDouble();
-                    double zsgl = zsglDatasSnap.get(i).getPointValueInDouble();
-                    double power = powerDatasSnap.get(i).getPointValueInDouble();
-                    double temp = bzgl - power;
-                    if (temp>0){
-                        bzss+=temp;
-                    }
-                    double temp1 = zsgl - power;
-                    if (temp1>0){
-                        zsss+=temp1;
-                    }
+                    if (i<bzglDatasSnap.size() && i<zsglDatasSnap.size() && i<powerDatasSnap.size()){
+                        double bzgl = bzglDatasSnap.get(i).getPointValueInDouble();
+                        double zsgl = zsglDatasSnap.get(i).getPointValueInDouble();
+                        double power = powerDatasSnap.get(i).getPointValueInDouble();
+                        double temp = bzgl - power;
+                        if (temp>0){
+                            bzss+=temp;
+                        }
+                        double temp1 = zsgl - power;
+                        if (temp1>0){
+                            zsss+=temp1;
+                        }
 //                    bzss += (bzgl-power<0?0:bzgl-power);
 //                    zsss += (zsgl-power<0?0:zsgl-power);
+                    }
                 }
             }
         }

realtime/computing-services7002/src/main/java/com/gyee/generation/service/TheorypowerService.java

@@ -109,9 +109,12 @@ public class TheorypowerService {
                                         zbzgl = doubleDoubleMap.get(wtspeed);
                                     }
                                 }
-                                if (zsglMap.containsKey(wtspeed)){
-                                    zzsgl = zsglMap.get(wtspeed);
+                                if (zsglMap!=null){
+                                    if (zsglMap.containsKey(wtspeed)){
+                                        zzsgl = zsglMap.get(wtspeed);
+                                    }
                                 }
+
                             }
                         } catch (Exception e) {
                             e.printStackTrace();

realtime/computing-services7003/src/main/java/com/gyee/generation/service/FiveLossesService.java

@@ -101,49 +101,49 @@ public class FiveLossesService {
             }
             double fjzt = sectionData.getPointValueInDouble();
             if (StringUtils.isNotEmpty(finalFaultWinturbines) && finalFaultWinturbines.contains(wt.getId())){    //此风机在之前故障未恢复列表
-                    if (fjzt!=6){
-                        //将时间存储到结束时间，算时间与电量
-                        Optional<Shutdownevent> first = shutdownevents.stream().filter(i -> i.getWindturbineid().equals(wt.getId())).findFirst();
-                        if (first.isPresent()){
-                            Shutdownevent shutdownevent = first.get();
-                            Date starttime = DateUtils.parseLongToDate(sectionData.getPointTime()*1000);
-                            shutdownevent.setStarttime(starttime);
-                            Date stoptime = shutdownevent.getStoptime();
-                            double hour = DateUtils.hoursDiff2(stoptime, starttime);
-                            shutdownevent.setStophours(hour);
+                if (fjzt!=6){
+                    //将时间存储到结束时间，算时间与电量
+                    Optional<Shutdownevent> first = shutdownevents.stream().filter(i -> i.getWindturbineid().equals(wt.getId())).findFirst();
+                    if (first.isPresent()){
+                        Shutdownevent shutdownevent = first.get();
+                        Date starttime = DateUtils.parseLongToDate(sectionData.getPointTime()*1000);
+                        shutdownevent.setStarttime(starttime);
+                        Date stoptime = shutdownevent.getStoptime();
+                        double hour = DateUtils.hoursDiff2(stoptime, starttime);
+                        shutdownevent.setStophours(hour);
 
-                            List<PointData> ztmxDatasSnap = null;
-                            List<PointData> bzglDatasSnap = null;
-                            List<PointData> zsglDatasSnap = null;
-                            List<PointData> powerDatasSnap = null;
-                            try {
-                                ztmxDatasSnap = edosUtil.getHistoryDatasSnap(ztmxPoint,stoptime.getTime()/1000,starttime.getTime()/1000,null,60l);
-                                bzglDatasSnap = edosUtil.getHistoryDatasSnap(bzglPoint,stoptime.getTime()/1000,starttime.getTime()/1000,null,60l);
-                                zsglDatasSnap = edosUtil.getHistoryDatasSnap(zsglPoint,stoptime.getTime()/1000,starttime.getTime()/1000,null,60l);
-                                powerDatasSnap = edosUtil.getHistoryDatasSnap(powerPoint, stoptime.getTime() / 1000, starttime.getTime() / 1000, null, 60l);
-                            } catch (Exception e) {
-                                e.printStackTrace();
-                            }
-                            if (ztmxDatasSnap.size() == zsglDatasSnap.size()){
-                                //故障
-                                double gzss = generalLoss(ztmxDatasSnap, bzglDatasSnap, zsglDatasSnap, powerDatasSnap, 6.0, resultList, windturbinetestingpointnewMap.get(Contant.WTRGZSSDL));
-                                shutdownevent.setLosspower(gzss);
-                            }
-                            shutdowneventService.saveOrUpdate(shutdownevent);
+                        List<PointData> ztmxDatasSnap = null;
+                        List<PointData> bzglDatasSnap = null;
+                        List<PointData> zsglDatasSnap = null;
+                        List<PointData> powerDatasSnap = null;
+                        try {
+                            ztmxDatasSnap = edosUtil.getHistoryDatasSnap(ztmxPoint,stoptime.getTime()/1000,starttime.getTime()/1000,null,60l);
+                            bzglDatasSnap = edosUtil.getHistoryDatasSnap(bzglPoint,stoptime.getTime()/1000,starttime.getTime()/1000,null,60l);
+                            zsglDatasSnap = edosUtil.getHistoryDatasSnap(zsglPoint,stoptime.getTime()/1000,starttime.getTime()/1000,null,60l);
+                            powerDatasSnap = edosUtil.getHistoryDatasSnap(powerPoint, stoptime.getTime() / 1000, starttime.getTime() / 1000, null, 60l);
+                        } catch (Exception e) {
+                            e.printStackTrace();
                         }
+                        if (ztmxDatasSnap.size() == zsglDatasSnap.size()){
+                            //故障
+                            double gzss = generalLoss(ztmxDatasSnap, bzglDatasSnap, zsglDatasSnap, powerDatasSnap, 6.0, resultList, windturbinetestingpointnewMap.get(Contant.WTRGZSSDL));
+                            shutdownevent.setLosspower(gzss);
+                        }
+                        shutdowneventService.saveOrUpdate(shutdownevent);
                     }
-                    if (fjzt==8){
-                        Shutdownevent shutdownevent = new Shutdownevent();
-                        shutdownevent.setId(CommonUtils.getUUID());
-                        shutdownevent.setWindpowerstationid(wt.getWindpowerstationid());
-                        shutdownevent.setWindturbineid(wt.getId());
-                        Date date = DateUtils.parseLongToDate(sectionData.getPointTime()*1000);
-                        shutdownevent.setStoptime(date);
-                        shutdownevent.setProjectid(wt.getProjectid());
-                        shutdownevent.setStatuscode(4);
-                        shutdowneventService.save(shutdownevent);
-                    }
                 }
+                if (fjzt==8){
+                    Shutdownevent shutdownevent = new Shutdownevent();
+                    shutdownevent.setId(CommonUtils.getUUID());
+                    shutdownevent.setWindpowerstationid(wt.getWindpowerstationid());
+                    shutdownevent.setWindturbineid(wt.getId());
+                    Date date = DateUtils.parseLongToDate(sectionData.getPointTime()*1000);
+                    shutdownevent.setStoptime(date);
+                    shutdownevent.setProjectid(wt.getProjectid());
+                    shutdownevent.setStatuscode(4);
+                    shutdowneventService.save(shutdownevent);
+                }
+            }
 
             else if (StringUtils.isNotEmpty(finalMainWinturbines) && finalMainWinturbines.contains(wt.getId())){    //此风机在之前故障未恢复列表
                 if (fjzt!=8){
@@ -661,7 +661,7 @@ public class FiveLossesService {
 
             double xnss = wpdaydjloss.get() + wpdaysdtjloss.get()+wpdayxnloss.get()+wpdayfdjclloss.get();
             resultList.add(createWpPointData(wppointnewMap.get(Contant.XNSSDL),xnss));
-             //故障
+            //故障
             addWpPoint(resultList, wppointnewMap.get(Contant.RGZZSDL), wpdaygzloss);
             addWpPoint(resultList, wppointnewMap.get(Contant.YGZZSDL), wpmonthgzloss);
             addWpPoint(resultList, wppointnewMap.get(Contant.NGZZSDL), wpyeargzloss);
@@ -688,7 +688,7 @@ public class FiveLossesService {
             addWpPoint(resultList, wppointnewMap.get(Contant.RQFZSDL), wpdayxdjclloss);
             addWpPoint(resultList, wppointnewMap.get(Contant.YQFZSDL), wpmonthxdjclloss);
             addWpPoint(resultList, wppointnewMap.get(Contant.NQFZSDL), wpyearxdjclloss);
-                //限电停机
+            //限电停机
             addWpPoint(resultList, wppointnewMap.get(Contant.RXDZSDL), wpdayxdtjloss);
             addWpPoint(resultList, wppointnewMap.get(Contant.YXDZSDL), wpmonthxdtjloss);
             addWpPoint(resultList, wppointnewMap.get(Contant.NXDZSDL), wpyearxdtjloss);
@@ -699,7 +699,7 @@ public class FiveLossesService {
             addWpPoint(resultList, wppointnewMap.get(Contant.RWZZSDL), wpdaydwslloss);
             addWpPoint(resultList, wppointnewMap.get(Contant.YWZZSDL), wpmonthdwslloss);
             addWpPoint(resultList, wppointnewMap.get(Contant.NWZZSDL), wpyeardwslloss);
-              //环境受累
+            //环境受累
             addWpPoint(resultList, wppointnewMap.get(Contant.RTZZSDL), wpdayhjslloss);
             addWpPoint(resultList, wppointnewMap.get(Contant.YTZZSDL), wpmonthhjslloss);
             addWpPoint(resultList, wppointnewMap.get(Contant.NTZZSDL), wpyearhjslloss);
@@ -863,19 +863,21 @@ public class FiveLossesService {
         for(int i= 0;i<ztmxDatasSnap.size();i++){
             for (int j=0;j<pointDataList.size();j++){
                 if (pointDataList.get(j).getPointTime().equals(ztmxDatasSnap.get(i).getPointTime())){
-                    double bzgl = bzglDatasSnap.get(i).getPointValueInDouble();
-                    double zsgl = zsglDatasSnap.get(i).getPointValueInDouble();
-                    double power = powerDatasSnap.get(i).getPointValueInDouble();
-                    double temp = bzgl - power;
-                    if (temp>0){
-                        bzss+=temp;
-                    }
-                    double temp1 = zsgl - power;
-                    if (temp1>0){
-                        zsss+=temp1;
-                    }
+                    if (i<bzglDatasSnap.size() && i<zsglDatasSnap.size() && i<powerDatasSnap.size()){
+                        double bzgl = bzglDatasSnap.get(i).getPointValueInDouble();
+                        double zsgl = zsglDatasSnap.get(i).getPointValueInDouble();
+                        double power = powerDatasSnap.get(i).getPointValueInDouble();
+                        double temp = bzgl - power;
+                        if (temp>0){
+                            bzss+=temp;
+                        }
+                        double temp1 = zsgl - power;
+                        if (temp1>0){
+                            zsss+=temp1;
+                        }
 //                    bzss += (bzgl-power<0?0:bzgl-power);
 //                    zsss += (zsgl-power<0?0:zsgl-power);
+                    }
                 }
             }
         }

realtime/computing-services7003/src/main/java/com/gyee/generation/service/TheorypowerService.java

@@ -109,9 +109,12 @@ public class TheorypowerService {
                                         zbzgl = doubleDoubleMap.get(wtspeed);
                                     }
                                 }
-                                if (zsglMap.containsKey(wtspeed)){
-                                    zzsgl = zsglMap.get(wtspeed);
+                                if (zsglMap!=null){
+                                    if (zsglMap.containsKey(wtspeed)){
+                                        zzsgl = zsglMap.get(wtspeed);
+                                    }
                                 }
+
                             }
                         } catch (Exception e) {
                             e.printStackTrace();