Merge remote-tracking branch 'origin/master'

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

@@ -20,19 +20,13 @@ public class GenerationMain {
 
 //        CacheService cacheService= SpringUtils.getBean("cacheService");
 //        cacheService.initRedisCache();
-
-
-//        InitialPointGoldenXkService InitialPointGoldenXkService= SpringUtils.getBean("initialPointGoldenXkService");
 //
-//        System.out.println("开始导出风机测点。。。。。。");
-//        InitialPointGoldenXkService.initalFj();
-//        System.out.println("结束导出风机测点。。。。。。");
-//        System.out.println("开始导出风场测点。。。。。。");
-//        InitialPointGoldenXkService.initalFc();
-//        System.out.println("结束导出风场测点。。。。。。");
 //
 //        InitialPointGoldenXkByEqEdosService initialPointGoldenXkByEqEdosService= SpringUtils.getBean("initialPointGoldenXkByEqEdosService");
 //
+//
+//
+//
 //        System.out.println("开始导出主变测点。。。。。。");
 //        initialPointGoldenXkByEqEdosService.initalZb();
 //        System.out.println("结束导出主变测点。。。。。。");
@@ -86,7 +80,7 @@ public class GenerationMain {
 //        {
 //            inputOrOutPutService.inputOrOutputSpeed(new Date());
 //        }
-
+//
 //        Date date =new Date();
 //
 //        Calendar c=Calendar.getInstance();
@@ -164,7 +158,25 @@ public class GenerationMain {
 //            System.out.println(DateUtils.toDate1(date)+"完成");
 //
 //        }
-
+//
+//
+//
+//        Calendar c=Calendar.getInstance();
+//        c.set(Calendar.MONTH,1);
+//        c.set(Calendar.DAY_OF_MONTH,10);
+//        Date date = DateUtils.truncate(c.getTime());
+//
+//        for (int i = 0; i < 2; i++) {
+//
+//       WindturbineGoodnessService windturbineGoodnessService= SpringUtils.getBean("windturbineGoodnessService");
+//        windturbineGoodnessService.calWindturbineGoodness(c.getTime());
+//            c.add(Calendar.DAY_OF_MONTH, 1);
+//            date = c.getTime();
+//            System.out.println(DateUtils.toDate1(date)+"完成");
+//
+//        }
+//
+//
 
 //        Calendar c=Calendar.getInstance();
 //        c.set(Calendar.MONTH,7);

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

@@ -19,7 +19,7 @@ import org.springframework.core.env.Environment;
 
 @Configuration
 @PropertySource("classpath:xxl-job-executor.properties")
-//@PropertySource("classpath:xxl-job-executorWPXNY.properties")
+//@PropertySource("classpath:xxl-job-executorWPGD.properties")
 //@PropertySource("classpath:xxl-job-executorRG.properties")
 public class XxlJobConfig implements EnvironmentAware {
     private Environment env;

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

@@ -1265,7 +1265,7 @@ public class WindPowerInfo1Service {
 
             if(pointmap.containsKey(ContantXk.NPJGL))
             {
-                ProBasicPowerstationPoint point= pointmap.get(ContantXk.NPJFS);
+                ProBasicPowerstationPoint point= pointmap.get(ContantXk.NPJGL);
                 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/WindPowerInfo2Service.java

@@ -665,154 +665,158 @@ public class WindPowerInfo2Service {
 
         Map<String, Map<String, ProBasicEquipmentPoint>> wtpAimap = CacheContext.wtpAimap;
 
-        for (ProBasicEquipment wt : wtls) {
-
-            lastState = -1;//上一分钟状态
-            Map<String, ProBasicEquipmentPoint> aimap = wtpAimap.get(wt.getId());
-            if (aimap.containsKey(ContantXk.MXZT)) {
-
-                ProBasicEquipmentPoint point = aimap.get(ContantXk.MXZT);
-                //按照分钟时间进行统计状态快照值
-                List<PointData> pointls = edosUtil.getHistoryDatasSnap(point.getNemCode(), begin.getTime() / 1000, end.getTime() / 1000);
-                if (!pointls.isEmpty()) {
-                    for (PointData po : pointls) {
-
-                        if (po.getPointValueInDouble() == 0) {
-
-                            if (lastState != po.getPointValueInDouble()) {
-                                //将当前状态保存到上一分钟状态
-                                lastState = po.getPointValueInDouble();
-
-                            }
-                            //待机时长加1分钟
-                            djsc++;
-                        } else if (po.getPointValueInDouble() == 1) {
-                            if (lastState != po.getPointValueInDouble()) {
-                                //将当前状态保存到上一分钟状态
-                                lastState = po.getPointValueInDouble();
+        if(!wtls.isEmpty())
+        {
+            for (ProBasicEquipment wt : wtls) {
+
+                lastState = -1;//上一分钟状态
+                Map<String, ProBasicEquipmentPoint> aimap = wtpAimap.get(wt.getId());
+                if (aimap.containsKey(ContantXk.MXZT)) {
+
+                    ProBasicEquipmentPoint point = aimap.get(ContantXk.MXZT);
+                    //按照分钟时间进行统计状态快照值
+                    List<PointData> pointls = edosUtil.getHistoryDatasSnap(point.getNemCode(), begin.getTime() / 1000, end.getTime() / 1000);
+                    if (!pointls.isEmpty()) {
+                        for (PointData po : pointls) {
+
+                            if (po.getPointValueInDouble() == 0) {
+
+                                if (lastState != po.getPointValueInDouble()) {
+                                    //将当前状态保存到上一分钟状态
+                                    lastState = po.getPointValueInDouble();
+
+                                }
+                                //待机时长加1分钟
+                                djsc++;
+                            } else if (po.getPointValueInDouble() == 1) {
+                                if (lastState != po.getPointValueInDouble()) {
+                                    //将当前状态保存到上一分钟状态
+                                    lastState = po.getPointValueInDouble();
+
+                                }
+
+                                //手动停机时长加1分钟
+                                sdtjsc++;
+                            } else if (po.getPointValueInDouble() == 2) {
+                                if (lastState != po.getPointValueInDouble()) {
+                                    //将当前状态保存到上一分钟状态
+                                    lastState = po.getPointValueInDouble();
+
+                                }
+                                //正常发电时长加1分钟
+                                zcfdsc++;
+                            } else if (po.getPointValueInDouble() == 3) {
+                                if (lastState != po.getPointValueInDouble()) {
+                                    //将当前状态保存到上一分钟状态
+                                    lastState = po.getPointValueInDouble();
+
+                                }
+
+                                //发电降出力时长加1分钟
+                                fdjclsc++;
+                            } else if (po.getPointValueInDouble() == 4) {
+                                if (lastState != po.getPointValueInDouble()) {
+                                    //将当前状态保存到上一分钟状态
+                                    lastState = po.getPointValueInDouble();
+
+                                }
+
+                                //故障时长加1分钟
+                                gzsc++;
+                            } else if (po.getPointValueInDouble() == 5) {
+                                if (lastState != po.getPointValueInDouble()) {
+                                    //将当前状态保存到上一分钟状态
+                                    lastState = po.getPointValueInDouble();
+
+                                }
+
+                                //故障受累时长加1分钟
+                                gzslsc++;
+                            } else if (po.getPointValueInDouble() == 6) {
+                                if (lastState != po.getPointValueInDouble()) {
+                                    //将当前状态保存到上一分钟状态
+                                    lastState = po.getPointValueInDouble();
+
+                                }
+
+                                //检修时长加1分钟
+                                jxsc++;
+                            } else if (po.getPointValueInDouble() == 7) {
+                                if (lastState != po.getPointValueInDouble()) {
+                                    //将当前状态保存到上一分钟状态
+                                    lastState = po.getPointValueInDouble();
+
+                                }
+
+                                //检修受累时长加1分钟
+                                jxslsc++;
+                            } else if (po.getPointValueInDouble() == 8) {
+                                if (lastState != po.getPointValueInDouble()) {
+                                    //将当前状态保存到上一分钟状态
+                                    lastState = po.getPointValueInDouble();
+
+                                }
+
+                                //限电降出力时长加1分钟
+                                xdjclsc++;
+                            } else if (po.getPointValueInDouble() == 9) {
+                                if (lastState != po.getPointValueInDouble()) {
+
+                                    //将当前状态保存到上一分钟状态
+                                    lastState = po.getPointValueInDouble();
+
+                                }
+
+                                //限电停机时长加1分钟
+                                xdtjsc++;
+                            } else if (po.getPointValueInDouble() == 10) {
+                                if (lastState != po.getPointValueInDouble()) {
+
+                                    //将当前状态保存到上一分钟状态
+                                    lastState = po.getPointValueInDouble();
+
+                                }
+
+                                //电网受累时长加1分钟
+                                dwslsc++;
+                            } else if (po.getPointValueInDouble() == 11) {
+                                if (lastState != po.getPointValueInDouble()) {
+
+                                    //将当前状态保存到上一分钟状态
+                                    lastState = po.getPointValueInDouble();
+
+                                }
+                                //环境受累时长加1分钟
+                                hjslsc++;
+                            } else if (po.getPointValueInDouble() == 12) {
+                                if (lastState != po.getPointValueInDouble()) {
+
+                                    //将当前状态保存到上一分钟状态
+                                    lastState = po.getPointValueInDouble();
+
+                                }
+                                //通讯中断时长加1分钟
+                                txzdsc++;
+                            } else if (po.getPointValueInDouble() == 13) {
+                                if (lastState != po.getPointValueInDouble()) {
+
+                                    //将当前状态保存到上一分钟状态
+                                    lastState = po.getPointValueInDouble();
+
+                                }
 
+                                //设备离线时长加1分钟
+                                sblxsc++;
                             }
 
-                            //手动停机时长加1分钟
-                            sdtjsc++;
-                        } else if (po.getPointValueInDouble() == 2) {
-                            if (lastState != po.getPointValueInDouble()) {
-                                //将当前状态保存到上一分钟状态
-                                lastState = po.getPointValueInDouble();
-
-                            }
-                            //正常发电时长加1分钟
-                            zcfdsc++;
-                        } else if (po.getPointValueInDouble() == 3) {
-                            if (lastState != po.getPointValueInDouble()) {
-                                //将当前状态保存到上一分钟状态
-                                lastState = po.getPointValueInDouble();
-
-                            }
-
-                            //发电降出力时长加1分钟
-                            fdjclsc++;
-                        } else if (po.getPointValueInDouble() == 4) {
-                            if (lastState != po.getPointValueInDouble()) {
-                                //将当前状态保存到上一分钟状态
-                                lastState = po.getPointValueInDouble();
-
-                            }
-
-                            //故障时长加1分钟
-                            gzsc++;
-                        } else if (po.getPointValueInDouble() == 5) {
-                            if (lastState != po.getPointValueInDouble()) {
-                                //将当前状态保存到上一分钟状态
-                                lastState = po.getPointValueInDouble();
-
-                            }
-
-                            //故障受累时长加1分钟
-                            gzslsc++;
-                        } else if (po.getPointValueInDouble() == 6) {
-                            if (lastState != po.getPointValueInDouble()) {
-                                //将当前状态保存到上一分钟状态
-                                lastState = po.getPointValueInDouble();
-
-                            }
-
-                            //检修时长加1分钟
-                            jxsc++;
-                        } else if (po.getPointValueInDouble() == 7) {
-                            if (lastState != po.getPointValueInDouble()) {
-                                //将当前状态保存到上一分钟状态
-                                lastState = po.getPointValueInDouble();
-
-                            }
-
-                            //检修受累时长加1分钟
-                            jxslsc++;
-                        } else if (po.getPointValueInDouble() == 8) {
-                            if (lastState != po.getPointValueInDouble()) {
-                                //将当前状态保存到上一分钟状态
-                                lastState = po.getPointValueInDouble();
-
-                            }
-
-                            //限电降出力时长加1分钟
-                            xdjclsc++;
-                        } else if (po.getPointValueInDouble() == 9) {
-                            if (lastState != po.getPointValueInDouble()) {
-
-                                //将当前状态保存到上一分钟状态
-                                lastState = po.getPointValueInDouble();
-
-                            }
-
-                            //限电停机时长加1分钟
-                            xdtjsc++;
-                        } else if (po.getPointValueInDouble() == 10) {
-                            if (lastState != po.getPointValueInDouble()) {
-
-                                //将当前状态保存到上一分钟状态
-                                lastState = po.getPointValueInDouble();
-
-                            }
-
-                            //电网受累时长加1分钟
-                            dwslsc++;
-                        } else if (po.getPointValueInDouble() == 11) {
-                            if (lastState != po.getPointValueInDouble()) {
-
-                                //将当前状态保存到上一分钟状态
-                                lastState = po.getPointValueInDouble();
-
-                            }
-                            //环境受累时长加1分钟
-                            hjslsc++;
-                        } else if (po.getPointValueInDouble() == 12) {
-                            if (lastState != po.getPointValueInDouble()) {
-
-                                //将当前状态保存到上一分钟状态
-                                lastState = po.getPointValueInDouble();
-
-                            }
-                            //通讯中断时长加1分钟
-                            txzdsc++;
-                        } else if (po.getPointValueInDouble() == 13) {
-                            if (lastState != po.getPointValueInDouble()) {
-
-                                //将当前状态保存到上一分钟状态
-                                lastState = po.getPointValueInDouble();
-
-                            }
-
-                            //设备离线时长加1分钟
-                            sblxsc++;
                         }
 
                     }
 
                 }
-
             }
         }
+
         //日合计故障小时（明细）
         pewp.setRhjgzxsmx(new BigDecimal(gzsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
         //日合计场内受累故障小时（明细）

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

@@ -662,142 +662,146 @@ public class WindPowerInfo3Service {
 
         Map<String, Map<String, ProBasicEquipmentPoint>> wtpAimap = CacheContext.wtpAimap;
 
-        for (ProBasicEquipment wt : wtls) {
-
-            lastState = -1;//上一分钟状态
-            Map<String, ProBasicEquipmentPoint> aimap = wtpAimap.get(wt.getId());
-            if (aimap.containsKey(ContantXk.MXZT)) {
-
-                ProBasicEquipmentPoint point = aimap.get(ContantXk.MXZT);
-                //按照分钟时间进行统计状态快照值
-                List<PointData> pointls = edosUtil.getHistoryDatasSnap(point.getNemCode(), begin.getTime() / 1000, end.getTime() / 1000);
-                if (!pointls.isEmpty()) {
-                    for (PointData po : pointls) {
-
-                        if (po.getPointValueInDouble() == 0) {
-
-                            if (lastState != po.getPointValueInDouble()) {
-                                //将当前状态保存到上一分钟状态
-                                lastState = po.getPointValueInDouble();
-                                //待机次数加1
-                                djcs++;
-                            }
-
-                        } else if (po.getPointValueInDouble() == 1) {
-                            if (lastState != po.getPointValueInDouble()) {
-                                //将当前状态保存到上一分钟状态
-                                lastState = po.getPointValueInDouble();
-                                //手动停机次数加1
-                                sdtjcs++;
-                            }
-
-                        } else if (po.getPointValueInDouble() == 2) {
-                            if (lastState != po.getPointValueInDouble()) {
-                                //将当前状态保存到上一分钟状态
-                                lastState = po.getPointValueInDouble();
-                                //正常发电次数加1
-                                zcfdcs++;
-                            }
-
-                        } else if (po.getPointValueInDouble() == 3) {
-                            if (lastState != po.getPointValueInDouble()) {
-                                //将当前状态保存到上一分钟状态
-                                lastState = po.getPointValueInDouble();
-                                //发电降出力次数加1
-                                fdjclcs++;
-                            }
-
-
-                        } else if (po.getPointValueInDouble() == 4) {
-                            if (lastState != po.getPointValueInDouble()) {
-                                //将当前状态保存到上一分钟状态
-                                lastState = po.getPointValueInDouble();
-                                //故障次数加1
-                                gzcs++;
-                            }
+        if(!wtls.isEmpty())
+        {
+            for (ProBasicEquipment wt : wtls) {
+
+                lastState = -1;//上一分钟状态
+                Map<String, ProBasicEquipmentPoint> aimap = wtpAimap.get(wt.getId());
+                if (aimap.containsKey(ContantXk.MXZT)) {
+
+                    ProBasicEquipmentPoint point = aimap.get(ContantXk.MXZT);
+                    //按照分钟时间进行统计状态快照值
+                    List<PointData> pointls = edosUtil.getHistoryDatasSnap(point.getNemCode(), begin.getTime() / 1000, end.getTime() / 1000);
+                    if (!pointls.isEmpty()) {
+                        for (PointData po : pointls) {
+
+                            if (po.getPointValueInDouble() == 0) {
+
+                                if (lastState != po.getPointValueInDouble()) {
+                                    //将当前状态保存到上一分钟状态
+                                    lastState = po.getPointValueInDouble();
+                                    //待机次数加1
+                                    djcs++;
+                                }
+
+                            } else if (po.getPointValueInDouble() == 1) {
+                                if (lastState != po.getPointValueInDouble()) {
+                                    //将当前状态保存到上一分钟状态
+                                    lastState = po.getPointValueInDouble();
+                                    //手动停机次数加1
+                                    sdtjcs++;
+                                }
+
+                            } else if (po.getPointValueInDouble() == 2) {
+                                if (lastState != po.getPointValueInDouble()) {
+                                    //将当前状态保存到上一分钟状态
+                                    lastState = po.getPointValueInDouble();
+                                    //正常发电次数加1
+                                    zcfdcs++;
+                                }
+
+                            } else if (po.getPointValueInDouble() == 3) {
+                                if (lastState != po.getPointValueInDouble()) {
+                                    //将当前状态保存到上一分钟状态
+                                    lastState = po.getPointValueInDouble();
+                                    //发电降出力次数加1
+                                    fdjclcs++;
+                                }
+
+
+                            } else if (po.getPointValueInDouble() == 4) {
+                                if (lastState != po.getPointValueInDouble()) {
+                                    //将当前状态保存到上一分钟状态
+                                    lastState = po.getPointValueInDouble();
+                                    //故障次数加1
+                                    gzcs++;
+                                }
+
+
+                            } else if (po.getPointValueInDouble() == 5) {
+                                if (lastState != po.getPointValueInDouble()) {
+                                    //将当前状态保存到上一分钟状态
+                                    lastState = po.getPointValueInDouble();
+                                    //故障受累次数加1
+                                    gzslcs++;
+                                }
+
+
+                            } else if (po.getPointValueInDouble() == 6) {
+                                if (lastState != po.getPointValueInDouble()) {
+                                    //将当前状态保存到上一分钟状态
+                                    lastState = po.getPointValueInDouble();
+                                    //检修次数加1
+                                    jxcs++;
+                                }
+
+
+                            } else if (po.getPointValueInDouble() == 7) {
+                                if (lastState != po.getPointValueInDouble()) {
+                                    //将当前状态保存到上一分钟状态
+                                    lastState = po.getPointValueInDouble();
+                                    //检修受累次数加1
+                                    jxslcs++;
+                                }
+
+
+                            } else if (po.getPointValueInDouble() == 8) {
+                                if (lastState != po.getPointValueInDouble()) {
+                                    //将当前状态保存到上一分钟状态
+                                    lastState = po.getPointValueInDouble();
+                                    //限电降出力次数加1
+                                    xdjclcs++;
+                                }
+
+
+                            } else if (po.getPointValueInDouble() == 9) {
+                                if (lastState != po.getPointValueInDouble()) {
+
+                                    //将当前状态保存到上一分钟状态
+                                    lastState = po.getPointValueInDouble();
+                                    //限电停机次数加1
+                                    xdtjcs++;
+                                }
+
+
+                            } else if (po.getPointValueInDouble() == 10) {
+                                if (lastState != po.getPointValueInDouble()) {
+
+                                    //将当前状态保存到上一分钟状态
+                                    lastState = po.getPointValueInDouble();
+                                    //电网受累次数加1
+                                    dwslcs++;
+                                }
+
+
+                            } else if (po.getPointValueInDouble() == 11) {
+                                if (lastState != po.getPointValueInDouble()) {
+
+                                    //将当前状态保存到上一分钟状态
+                                    lastState = po.getPointValueInDouble();
+                                    //环境受累次数加1
+                                    hjslcs++;
+                                }
+
+                            } else if (po.getPointValueInDouble() == 12) {
+                                if (lastState != po.getPointValueInDouble()) {
+
+                                    //将当前状态保存到上一分钟状态
+                                    lastState = po.getPointValueInDouble();
+                                    //通讯中断次数加1
+                                    txzdcs++;
+                                }
+
+                            } else if (po.getPointValueInDouble() == 13) {
+                                if (lastState != po.getPointValueInDouble()) {
+
+                                    //将当前状态保存到上一分钟状态
+                                    lastState = po.getPointValueInDouble();
+                                    //设备离线次数加1
+                                    sblxcs++;
+                                }
 
-
-                        } else if (po.getPointValueInDouble() == 5) {
-                            if (lastState != po.getPointValueInDouble()) {
-                                //将当前状态保存到上一分钟状态
-                                lastState = po.getPointValueInDouble();
-                                //故障受累次数加1
-                                gzslcs++;
-                            }
-
-
-                        } else if (po.getPointValueInDouble() == 6) {
-                            if (lastState != po.getPointValueInDouble()) {
-                                //将当前状态保存到上一分钟状态
-                                lastState = po.getPointValueInDouble();
-                                //检修次数加1
-                                jxcs++;
-                            }
-
-
-                        } else if (po.getPointValueInDouble() == 7) {
-                            if (lastState != po.getPointValueInDouble()) {
-                                //将当前状态保存到上一分钟状态
-                                lastState = po.getPointValueInDouble();
-                                //检修受累次数加1
-                                jxslcs++;
-                            }
-
-
-                        } else if (po.getPointValueInDouble() == 8) {
-                            if (lastState != po.getPointValueInDouble()) {
-                                //将当前状态保存到上一分钟状态
-                                lastState = po.getPointValueInDouble();
-                                //限电降出力次数加1
-                                xdjclcs++;
-                            }
-
-
-                        } else if (po.getPointValueInDouble() == 9) {
-                            if (lastState != po.getPointValueInDouble()) {
-
-                                //将当前状态保存到上一分钟状态
-                                lastState = po.getPointValueInDouble();
-                                //限电停机次数加1
-                                xdtjcs++;
-                            }
-
-
-                        } else if (po.getPointValueInDouble() == 10) {
-                            if (lastState != po.getPointValueInDouble()) {
-
-                                //将当前状态保存到上一分钟状态
-                                lastState = po.getPointValueInDouble();
-                                //电网受累次数加1
-                                dwslcs++;
-                            }
-
-
-                        } else if (po.getPointValueInDouble() == 11) {
-                            if (lastState != po.getPointValueInDouble()) {
-
-                                //将当前状态保存到上一分钟状态
-                                lastState = po.getPointValueInDouble();
-                                //环境受累次数加1
-                                hjslcs++;
-                            }
-
-                        } else if (po.getPointValueInDouble() == 12) {
-                            if (lastState != po.getPointValueInDouble()) {
-
-                                //将当前状态保存到上一分钟状态
-                                lastState = po.getPointValueInDouble();
-                                //通讯中断次数加1
-                                txzdcs++;
-                            }
-
-                        } else if (po.getPointValueInDouble() == 13) {
-                            if (lastState != po.getPointValueInDouble()) {
-
-                                //将当前状态保存到上一分钟状态
-                                lastState = po.getPointValueInDouble();
-                                //设备离线次数加1
-                                sblxcs++;
                             }
 
                         }
@@ -805,10 +809,10 @@ public class WindPowerInfo3Service {
                     }
 
                 }
-
             }
         }
 
+
         //日合计故障次数（明细）
         pewp.setRhjgzcsmx(gzcs);
         //日合计场内受累故障次数（明细）

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

@@ -32,7 +32,7 @@ public class WindPowerInfo4Service {
     private IProEconPowerstationInfoDay4Service proEconPowerstationInfoDay4Service;
 
     @Resource
-    private IProEconStateTransitionRatesService proEconStateTransitionRatesService;
+    private IProEconEquipmentInfoDay5Service proEconEquipmentInfoDay5Service;
 
     @Resource
     private IProEconFaultLiminatedefectsService proEconFaultLiminatedefectsService;
@@ -776,7 +776,7 @@ public class WindPowerInfo4Service {
 ///*******************************************日信息统计*********************************************************/
 //MTTR、MTTF、MTBF
 
-        if (!wtls.isEmpty()) {
+        if (null!=wtls && !wtls.isEmpty()) {
             ProBasicEquipment wt = wtls.get(0);
             if (StringUtils.notEmp(pepid2) && StringUtils.notEmp(pepid3)) {
                 //故障小时
@@ -807,20 +807,20 @@ public class WindPowerInfo4Service {
             switch (types) {
                 case "0":
 //日场站统计
-                    QueryWrapper<ProEconStateTransitionRates> queryWrapper = new QueryWrapper<>();
+                    QueryWrapper<ProEconEquipmentInfoDay5> queryWrapper = new QueryWrapper<>();
                     queryWrapper.eq("record_date",DateUtils.truncate(begin))
                             .eq("windpwoer_id",wt.getWindpowerstationId());
-                    List<ProEconStateTransitionRates> pestrls = proEconStateTransitionRatesService.list(queryWrapper);
+                    List<ProEconEquipmentInfoDay5> pestrls = proEconEquipmentInfoDay5Service.list(queryWrapper);
 //                            .stream()
 //                            .filter(i -> i.getRecordDate().compareTo(begin) == 0 && i.getWindpwoerId().equals(wt.getWindpowerstationId())
 //                            ).collect(Collectors.toList());
                     //大于3米20分钟转换及时次数
-                    DoubleSummaryStatistics timerate8_summary = pestrls.stream().mapToDouble(ProEconStateTransitionRates::getTimerate8).summaryStatistics();
+                    DoubleSummaryStatistics timerate8_summary = pestrls.stream().mapToDouble(ProEconEquipmentInfoDay5::getTimerate8).summaryStatistics();
                     //大于3米20分钟转换及时次数合计
                     double timerate8_sum = timerate8_summary.getSum();
 
                     //大于3米状态转换总次数次数
-                    DoubleSummaryStatistics timerate14_summary = pestrls.stream().mapToDouble(ProEconStateTransitionRates::getTimerate14).summaryStatistics();
+                    DoubleSummaryStatistics timerate14_summary = pestrls.stream().mapToDouble(ProEconEquipmentInfoDay5::getTimerate14).summaryStatistics();
                     //大于3米状态转换总次数合计
                     double timerate14_sum = timerate14_summary.getSum();
 
@@ -829,16 +829,16 @@ public class WindPowerInfo4Service {
                         double temp = new BigDecimal(timerate8_sum).divide(new BigDecimal(timerate14_sum), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue();
                         pewp.setRztzhjsl(temp);
                     } else {
-                        pewp.setRztzhjsl(100.0);
+                        pewp.setRztzhjsl(0.0);
                     }
 
                     //20分钟复位及时次数
-                    DoubleSummaryStatistics timerate19_summary = pestrls.stream().mapToDouble(ProEconStateTransitionRates::getTimerate19).summaryStatistics();
+                    DoubleSummaryStatistics timerate19_summary = pestrls.stream().mapToDouble(ProEconEquipmentInfoDay5::getTimerate19).summaryStatistics();
                     //20分钟复位及时次数合计
                     double timerate19_sum = timerate19_summary.getSum();
 
                     //总复位次数
-                    DoubleSummaryStatistics timerate20_summary = pestrls.stream().mapToDouble(ProEconStateTransitionRates::getTimerate20).summaryStatistics();
+                    DoubleSummaryStatistics timerate20_summary = pestrls.stream().mapToDouble(ProEconEquipmentInfoDay5::getTimerate20).summaryStatistics();
                     //总复位次数合计
                     double timerate20_sum = timerate20_summary.getSum();
 
@@ -847,7 +847,7 @@ public class WindPowerInfo4Service {
                         double temp = new BigDecimal(timerate19_sum).divide(new BigDecimal(timerate20_sum), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue();
                         pewp.setRfwjsl(temp);
                     } else {
-                        pewp.setRfwjsl(100.0);
+                        pewp.setRfwjsl(0.0);
                     }
                     QueryWrapper<ProEconFaultLiminatedefects> queryWrapper2 = new QueryWrapper<>();
                     queryWrapper2.eq("date_time",DateUtils.truncate(begin))
@@ -871,7 +871,7 @@ public class WindPowerInfo4Service {
                         double temp = new BigDecimal(right_sum).divide(new BigDecimal(fault_sum), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue();
                         pewp.setRgzxqjsl(temp);
                     } else {
-                        pewp.setRgzxqjsl(100.0);
+                        pewp.setRgzxqjsl(0.0);
                     }
 //日场站统计
                 case "1":
@@ -879,17 +879,17 @@ public class WindPowerInfo4Service {
                     queryWrapper = new QueryWrapper<>();
                     queryWrapper.eq("record_date",DateUtils.truncate(begin))
                             .eq("project_id",wt.getProjectId());
-                    pestrls = proEconStateTransitionRatesService.list(queryWrapper);
+                    pestrls = proEconEquipmentInfoDay5Service.list(queryWrapper);
 //                            .stream()
 //                            .filter(i -> i.getRecordDate().compareTo(begin) == 0 && i.getProjectId().equals(wt.getProjectId())
 //                            ).collect(Collectors.toList());
                     //大于3米20分钟转换及时次数
-                    timerate8_summary = pestrls.stream().mapToDouble(ProEconStateTransitionRates::getTimerate8).summaryStatistics();
+                    timerate8_summary = pestrls.stream().mapToDouble(ProEconEquipmentInfoDay5::getTimerate8).summaryStatistics();
                     //大于3米20分钟转换及时次数合计
                     timerate8_sum = timerate8_summary.getSum();
 
                     //大于3米状态转换总次数次数
-                    timerate14_summary = pestrls.stream().mapToDouble(ProEconStateTransitionRates::getTimerate14).summaryStatistics();
+                    timerate14_summary = pestrls.stream().mapToDouble(ProEconEquipmentInfoDay5::getTimerate14).summaryStatistics();
                     //大于3米状态转换总次数合计
                     timerate14_sum = timerate14_summary.getSum();
 
@@ -898,16 +898,16 @@ public class WindPowerInfo4Service {
                         double temp = new BigDecimal(timerate8_sum).divide(new BigDecimal(timerate14_sum), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue();
                         pewp.setRztzhjsl(temp);
                     } else {
-                        pewp.setRztzhjsl(100.0);
+                        pewp.setRztzhjsl(0.0);
                     }
 
                     //20分钟复位及时次数
-                    timerate19_summary = pestrls.stream().mapToDouble(ProEconStateTransitionRates::getTimerate19).summaryStatistics();
+                    timerate19_summary = pestrls.stream().mapToDouble(ProEconEquipmentInfoDay5::getTimerate19).summaryStatistics();
                     //20分钟复位及时次数合计
                     timerate19_sum = timerate19_summary.getSum();
 
                     //总复位次数
-                    timerate20_summary = pestrls.stream().mapToDouble(ProEconStateTransitionRates::getTimerate20).summaryStatistics();
+                    timerate20_summary = pestrls.stream().mapToDouble(ProEconEquipmentInfoDay5::getTimerate20).summaryStatistics();
                     //总复位次数合计
                     timerate20_sum = timerate20_summary.getSum();
 
@@ -916,7 +916,7 @@ public class WindPowerInfo4Service {
                         double temp = new BigDecimal(timerate19_sum).divide(new BigDecimal(timerate20_sum), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue();
                         pewp.setRfwjsl(temp);
                     } else {
-                        pewp.setRfwjsl(100.0);
+                        pewp.setRfwjsl(0.0);
                     }
                     queryWrapper2 = new QueryWrapper<>();
                     queryWrapper2.eq("date_time",DateUtils.truncate(begin))
@@ -940,7 +940,7 @@ public class WindPowerInfo4Service {
                         double temp = new BigDecimal(right_sum).divide(new BigDecimal(fault_sum), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue();
                         pewp.setRgzxqjsl(temp);
                     } else {
-                        pewp.setRgzxqjsl(100.0);
+                        pewp.setRgzxqjsl(0.0);
                     }
 //日工程统计
                 case "2":
@@ -948,17 +948,17 @@ public class WindPowerInfo4Service {
                     queryWrapper = new QueryWrapper<>();
                     queryWrapper.eq("record_date",DateUtils.truncate(begin))
                             .eq("line_id",wt.getLineId());
-                    pestrls = proEconStateTransitionRatesService.list(queryWrapper);
+                    pestrls = proEconEquipmentInfoDay5Service.list(queryWrapper);
 //                            .stream()
 //                            .filter(i -> i.getRecordDate().compareTo(begin) == 0 && i.getLineId().equals(wt.getLineId())
 //                            ).collect(Collectors.toList());
                     //大于3米20分钟转换及时次数
-                    timerate8_summary = pestrls.stream().mapToDouble(ProEconStateTransitionRates::getTimerate8).summaryStatistics();
+                    timerate8_summary = pestrls.stream().mapToDouble(ProEconEquipmentInfoDay5::getTimerate8).summaryStatistics();
                     //大于3米20分钟转换及时次数合计
                     timerate8_sum = timerate8_summary.getSum();
 
                     //大于3米状态转换总次数次数
-                    timerate14_summary = pestrls.stream().mapToDouble(ProEconStateTransitionRates::getTimerate14).summaryStatistics();
+                    timerate14_summary = pestrls.stream().mapToDouble(ProEconEquipmentInfoDay5::getTimerate14).summaryStatistics();
                     //大于3米状态转换总次数合计
                     timerate14_sum = timerate14_summary.getSum();
 
@@ -967,16 +967,16 @@ public class WindPowerInfo4Service {
                         double temp = new BigDecimal(timerate8_sum).divide(new BigDecimal(timerate14_sum), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue();
                         pewp.setRztzhjsl(temp);
                     } else {
-                        pewp.setRztzhjsl(100.0);
+                        pewp.setRztzhjsl(0.0);
                     }
 
                     //20分钟复位及时次数
-                    timerate19_summary = pestrls.stream().mapToDouble(ProEconStateTransitionRates::getTimerate19).summaryStatistics();
+                    timerate19_summary = pestrls.stream().mapToDouble(ProEconEquipmentInfoDay5::getTimerate19).summaryStatistics();
                     //20分钟复位及时次数合计
                     timerate19_sum = timerate19_summary.getSum();
 
                     //总复位次数
-                    timerate20_summary = pestrls.stream().mapToDouble(ProEconStateTransitionRates::getTimerate20).summaryStatistics();
+                    timerate20_summary = pestrls.stream().mapToDouble(ProEconEquipmentInfoDay5::getTimerate20).summaryStatistics();
                     //总复位次数合计
                     timerate20_sum = timerate20_summary.getSum();
 
@@ -985,7 +985,7 @@ public class WindPowerInfo4Service {
                         double temp = new BigDecimal(timerate19_sum).divide(new BigDecimal(timerate20_sum), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue();
                         pewp.setRfwjsl(temp);
                     } else {
-                        pewp.setRfwjsl(100.0);
+                        pewp.setRfwjsl(0.0);
                     }
                     queryWrapper2 = new QueryWrapper<>();
                     queryWrapper2.eq("date_time",DateUtils.truncate(begin))
@@ -1010,7 +1010,7 @@ public class WindPowerInfo4Service {
                         double temp = new BigDecimal(right_sum).divide(new BigDecimal(fault_sum), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue();
                         pewp.setRgzxqjsl(temp);
                     } else {
-                        pewp.setRgzxqjsl(100.0);
+                        pewp.setRgzxqjsl(0.0);
                     }
 //日线路统计
                 default:
@@ -1072,9 +1072,9 @@ public class WindPowerInfo4Service {
                     case "0":
 //月场站统计
 
-                        QueryWrapper<ProEconStateTransitionRates> queryWrapper = new QueryWrapper<>();
+                        QueryWrapper<ProEconEquipmentInfoDay5> queryWrapper = new QueryWrapper<>();
                         queryWrapper.ge("record_date",monthbegin).le("record_date",end).eq("windpwoer_id",wt.getWindpowerstationId());
-                        List<ProEconStateTransitionRates> pestrls = proEconStateTransitionRatesService.list(queryWrapper);
+                        List<ProEconEquipmentInfoDay5> pestrls = proEconEquipmentInfoDay5Service.list(queryWrapper);
 //                                .stream()
 //                                .filter(i ->
 //                                        (i.getRecordDate().compareTo(monthbegin) == 0 || i.getRecordDate().after(monthbegin))
@@ -1082,12 +1082,12 @@ public class WindPowerInfo4Service {
 //                                                && i.getWindpwoerId().equals(wt.getWindpowerstationId())
 //                                ).collect(Collectors.toList());
                         //大于3米20分钟转换及时次数
-                        DoubleSummaryStatistics timerate8_summary = pestrls.stream().mapToDouble(ProEconStateTransitionRates::getTimerate8).summaryStatistics();
+                        DoubleSummaryStatistics timerate8_summary = pestrls.stream().mapToDouble(ProEconEquipmentInfoDay5::getTimerate8).summaryStatistics();
                         //大于3米20分钟转换及时次数合计
                         double timerate8_sum = timerate8_summary.getSum();
 
                         //大于3米状态转换总次数次数
-                        DoubleSummaryStatistics timerate14_summary = pestrls.stream().mapToDouble(ProEconStateTransitionRates::getTimerate14).summaryStatistics();
+                        DoubleSummaryStatistics timerate14_summary = pestrls.stream().mapToDouble(ProEconEquipmentInfoDay5::getTimerate14).summaryStatistics();
                         //大于3米状态转换总次数合计
                         double timerate14_sum = timerate14_summary.getSum();
 
@@ -1096,16 +1096,16 @@ public class WindPowerInfo4Service {
                             double temp = new BigDecimal(timerate8_sum).divide(new BigDecimal(timerate14_sum), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue();
                             pewp.setYztzhjsl(temp);
                         } else {
-                            pewp.setYztzhjsl(100.0);
+                            pewp.setYztzhjsl(0.0);
                         }
 
                         //20分钟复位及时次数
-                        DoubleSummaryStatistics timerate19_summary = pestrls.stream().mapToDouble(ProEconStateTransitionRates::getTimerate19).summaryStatistics();
+                        DoubleSummaryStatistics timerate19_summary = pestrls.stream().mapToDouble(ProEconEquipmentInfoDay5::getTimerate19).summaryStatistics();
                         //20分钟复位及时次数合计
                         double timerate19_sum = timerate19_summary.getSum();
 
                         //总复位次数
-                        DoubleSummaryStatistics timerate20_summary = pestrls.stream().mapToDouble(ProEconStateTransitionRates::getTimerate20).summaryStatistics();
+                        DoubleSummaryStatistics timerate20_summary = pestrls.stream().mapToDouble(ProEconEquipmentInfoDay5::getTimerate20).summaryStatistics();
                         //总复位次数合计
                         double timerate20_sum = timerate20_summary.getSum();
 
@@ -1114,7 +1114,7 @@ public class WindPowerInfo4Service {
                             double temp = new BigDecimal(timerate19_sum).divide(new BigDecimal(timerate20_sum), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue();
                             pewp.setYfwjsl(temp);
                         } else {
-                            pewp.setYfwjsl(100.0);
+                            pewp.setYfwjsl(0.0);
                         }
                         QueryWrapper<ProEconFaultLiminatedefects> queryWrapper2 = new QueryWrapper<>();
                         queryWrapper2.ge("date_time",monthbegin).le("date_time",end).eq("windpowerstation_id",wt.getWindpowerstationId());
@@ -1140,7 +1140,7 @@ public class WindPowerInfo4Service {
                             double temp = new BigDecimal(right_sum).divide(new BigDecimal(fault_sum), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue();
                             pewp.setYgzxqjsl(temp);
                         } else {
-                            pewp.setYgzxqjsl(100.0);
+                            pewp.setYgzxqjsl(0.0);
                         }
                         //月场站统计
                     case "1":
@@ -1148,7 +1148,7 @@ public class WindPowerInfo4Service {
 
                         queryWrapper = new QueryWrapper<>();
                         queryWrapper.ge("record_date",monthbegin).le("record_date",end).eq("project_id",wt.getProjectId());
-                        pestrls = proEconStateTransitionRatesService.list(queryWrapper);
+                        pestrls = proEconEquipmentInfoDay5Service.list(queryWrapper);
 //                                .stream()
 //                                .filter(i ->
 //                                        (i.getRecordDate().compareTo(monthbegin) == 0 || i.getRecordDate().after(monthbegin))
@@ -1156,12 +1156,12 @@ public class WindPowerInfo4Service {
 //                                                && i.getProjectId().equals(wt.getProjectId())
 //                                ).collect(Collectors.toList());
                         //大于3米20分钟转换及时次数
-                        timerate8_summary = pestrls.stream().mapToDouble(ProEconStateTransitionRates::getTimerate8).summaryStatistics();
+                        timerate8_summary = pestrls.stream().mapToDouble(ProEconEquipmentInfoDay5::getTimerate8).summaryStatistics();
                         //大于3米20分钟转换及时次数合计
                         timerate8_sum = timerate8_summary.getSum();
 
                         //大于3米状态转换总次数次数
-                        timerate14_summary = pestrls.stream().mapToDouble(ProEconStateTransitionRates::getTimerate14).summaryStatistics();
+                        timerate14_summary = pestrls.stream().mapToDouble(ProEconEquipmentInfoDay5::getTimerate14).summaryStatistics();
                         //大于3米状态转换总次数合计
                         timerate14_sum = timerate14_summary.getSum();
 
@@ -1170,16 +1170,16 @@ public class WindPowerInfo4Service {
                             double temp = new BigDecimal(timerate8_sum).divide(new BigDecimal(timerate14_sum), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue();
                             pewp.setYztzhjsl(temp);
                         } else {
-                            pewp.setYztzhjsl(100.0);
+                            pewp.setYztzhjsl(0.0);
                         }
 
                         //20分钟复位及时次数
-                        timerate19_summary = pestrls.stream().mapToDouble(ProEconStateTransitionRates::getTimerate19).summaryStatistics();
+                        timerate19_summary = pestrls.stream().mapToDouble(ProEconEquipmentInfoDay5::getTimerate19).summaryStatistics();
                         //20分钟复位及时次数合计
                         timerate19_sum = timerate19_summary.getSum();
 
                         //总复位次数
-                        timerate20_summary = pestrls.stream().mapToDouble(ProEconStateTransitionRates::getTimerate20).summaryStatistics();
+                        timerate20_summary = pestrls.stream().mapToDouble(ProEconEquipmentInfoDay5::getTimerate20).summaryStatistics();
                         //总复位次数合计
                         timerate20_sum = timerate20_summary.getSum();
 
@@ -1188,7 +1188,7 @@ public class WindPowerInfo4Service {
                             double temp = new BigDecimal(timerate19_sum).divide(new BigDecimal(timerate20_sum), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue();
                             pewp.setYfwjsl(temp);
                         } else {
-                            pewp.setYfwjsl(100.0);
+                            pewp.setYfwjsl(0.0);
                         }
                          queryWrapper2 = new QueryWrapper<>();
                         queryWrapper2.ge("date_time",monthbegin).le("date_time",end).eq("project_id",wt.getProjectId());
@@ -1214,14 +1214,14 @@ public class WindPowerInfo4Service {
                             double temp = new BigDecimal(right_sum).divide(new BigDecimal(fault_sum), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue();
                             pewp.setYgzxqjsl(temp);
                         } else {
-                            pewp.setYgzxqjsl(100.0);
+                            pewp.setYgzxqjsl(0.0);
                         }
 //月工程统计
                     case "2":
 //月线路统计
                         queryWrapper = new QueryWrapper<>();
                         queryWrapper.ge("record_date",monthbegin).le("record_date",end).eq("line_id",wt.getLineId());
-                        pestrls = proEconStateTransitionRatesService.list(queryWrapper);
+                        pestrls = proEconEquipmentInfoDay5Service.list(queryWrapper);
 //                                .stream()
 //                                .filter(i ->
 //                                        (i.getRecordDate().compareTo(monthbegin) == 0 || i.getRecordDate().after(monthbegin))
@@ -1229,12 +1229,12 @@ public class WindPowerInfo4Service {
 //                                                && i.getLineId().equals(wt.getLineId())
 //                                ).collect(Collectors.toList());
                         //大于3米20分钟转换及时次数
-                        timerate8_summary = pestrls.stream().mapToDouble(ProEconStateTransitionRates::getTimerate8).summaryStatistics();
+                        timerate8_summary = pestrls.stream().mapToDouble(ProEconEquipmentInfoDay5::getTimerate8).summaryStatistics();
                         //大于3米20分钟转换及时次数合计
                         timerate8_sum = timerate8_summary.getSum();
 
                         //大于3米状态转换总次数次数
-                        timerate14_summary = pestrls.stream().mapToDouble(ProEconStateTransitionRates::getTimerate14).summaryStatistics();
+                        timerate14_summary = pestrls.stream().mapToDouble(ProEconEquipmentInfoDay5::getTimerate14).summaryStatistics();
                         //大于3米状态转换总次数合计
                         timerate14_sum = timerate14_summary.getSum();
 
@@ -1243,16 +1243,16 @@ public class WindPowerInfo4Service {
                             double temp = new BigDecimal(timerate8_sum).divide(new BigDecimal(timerate14_sum), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue();
                             pewp.setYztzhjsl(temp);
                         } else {
-                            pewp.setYztzhjsl(100.0);
+                            pewp.setYztzhjsl(0.0);
                         }
 
                         //20分钟复位及时次数
-                        timerate19_summary = pestrls.stream().mapToDouble(ProEconStateTransitionRates::getTimerate19).summaryStatistics();
+                        timerate19_summary = pestrls.stream().mapToDouble(ProEconEquipmentInfoDay5::getTimerate19).summaryStatistics();
                         //20分钟复位及时次数合计
                         timerate19_sum = timerate19_summary.getSum();
 
                         //总复位次数
-                        timerate20_summary = pestrls.stream().mapToDouble(ProEconStateTransitionRates::getTimerate20).summaryStatistics();
+                        timerate20_summary = pestrls.stream().mapToDouble(ProEconEquipmentInfoDay5::getTimerate20).summaryStatistics();
                         //总复位次数合计
                         timerate20_sum = timerate20_summary.getSum();
 
@@ -1261,7 +1261,7 @@ public class WindPowerInfo4Service {
                             double temp = new BigDecimal(timerate19_sum).divide(new BigDecimal(timerate20_sum), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue();
                             pewp.setYfwjsl(temp);
                         } else {
-                            pewp.setYfwjsl(100.0);
+                            pewp.setYfwjsl(0.0);
                         }
                         queryWrapper2 = new QueryWrapper<>();
                         queryWrapper2.ge("date_time",monthbegin).le("date_time",end).eq("line_Id",wt.getLineId());
@@ -1287,7 +1287,7 @@ public class WindPowerInfo4Service {
                             double temp = new BigDecimal(right_sum).divide(new BigDecimal(fault_sum), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue();
                             pewp.setYgzxqjsl(temp);
                         } else {
-                            pewp.setYgzxqjsl(100.0);
+                            pewp.setYgzxqjsl(0.0);
                         }
 //月线路统计
                     default:
@@ -1350,9 +1350,9 @@ public class WindPowerInfo4Service {
                     switch (types) {
                         case "0":
 //年场站统计
-                            QueryWrapper<ProEconStateTransitionRates> queryWrapper = new QueryWrapper<>();
+                            QueryWrapper<ProEconEquipmentInfoDay5> queryWrapper = new QueryWrapper<>();
                             queryWrapper.ge("record_date",yearbegin).le("record_date",end).eq("windpwoer_id",wt.getWindpowerstationId());
-                            List<ProEconStateTransitionRates> pestrls = proEconStateTransitionRatesService.list(queryWrapper);
+                            List<ProEconEquipmentInfoDay5> pestrls = proEconEquipmentInfoDay5Service.list(queryWrapper);
 //                                    .stream()
 //                                    .filter(i ->
 //                                            (i.getRecordDate().compareTo(yearbegin) == 0 || i.getRecordDate().after(yearbegin))
@@ -1360,12 +1360,12 @@ public class WindPowerInfo4Service {
 //                                                    && i.getWindpwoerId().equals(wt.getWindpowerstationId())
 //                                    ).collect(Collectors.toList());
                             //大于3米20分钟转换及时次数
-                            DoubleSummaryStatistics timerate8_summary = pestrls.stream().mapToDouble(ProEconStateTransitionRates::getTimerate8).summaryStatistics();
+                            DoubleSummaryStatistics timerate8_summary = pestrls.stream().mapToDouble(ProEconEquipmentInfoDay5::getTimerate8).summaryStatistics();
                             //大于3米20分钟转换及时次数合计
                             double timerate8_sum = timerate8_summary.getSum();
 
                             //大于3米状态转换总次数次数
-                            DoubleSummaryStatistics timerate14_summary = pestrls.stream().mapToDouble(ProEconStateTransitionRates::getTimerate14).summaryStatistics();
+                            DoubleSummaryStatistics timerate14_summary = pestrls.stream().mapToDouble(ProEconEquipmentInfoDay5::getTimerate14).summaryStatistics();
                             //大于3米状态转换总次数合计
                             double timerate14_sum = timerate14_summary.getSum();
 
@@ -1374,16 +1374,16 @@ public class WindPowerInfo4Service {
                                 double temp = new BigDecimal(timerate8_sum).divide(new BigDecimal(timerate14_sum), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue();
                                 pewp.setNztzhjsl(temp);
                             } else {
-                                pewp.setNztzhjsl(100.0);
+                                pewp.setNztzhjsl(0.0);
                             }
 
                             //20分钟复位及时次数
-                            DoubleSummaryStatistics timerate19_summary = pestrls.stream().mapToDouble(ProEconStateTransitionRates::getTimerate19).summaryStatistics();
+                            DoubleSummaryStatistics timerate19_summary = pestrls.stream().mapToDouble(ProEconEquipmentInfoDay5::getTimerate19).summaryStatistics();
                             //20分钟复位及时次数合计
                             double timerate19_sum = timerate19_summary.getSum();
 
                             //总复位次数
-                            DoubleSummaryStatistics timerate20_summary = pestrls.stream().mapToDouble(ProEconStateTransitionRates::getTimerate20).summaryStatistics();
+                            DoubleSummaryStatistics timerate20_summary = pestrls.stream().mapToDouble(ProEconEquipmentInfoDay5::getTimerate20).summaryStatistics();
                             //总复位次数合计
                             double timerate20_sum = timerate20_summary.getSum();
 
@@ -1392,7 +1392,7 @@ public class WindPowerInfo4Service {
                                 double temp = new BigDecimal(timerate19_sum).divide(new BigDecimal(timerate20_sum), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue();
                                 pewp.setNfwjsl(temp);
                             } else {
-                                pewp.setNfwjsl(100.0);
+                                pewp.setNfwjsl(0.0);
                             }
 
                             QueryWrapper<ProEconFaultLiminatedefects> queryWrapper2 = new QueryWrapper<>();
@@ -1419,14 +1419,14 @@ public class WindPowerInfo4Service {
                                 double temp = new BigDecimal(right_sum).divide(new BigDecimal(fault_sum), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue();
                                 pewp.setNgzxqjsl(temp);
                             } else {
-                                pewp.setNgzxqjsl(100.0);
+                                pewp.setNgzxqjsl(0.0);
                             }
 //年场站统计
                         case "1":
 //年工程统计
                             queryWrapper = new QueryWrapper<>();
                             queryWrapper.ge("record_date",yearbegin).le("record_date",end).eq("windpwoer_id",wt.getWindpowerstationId());
-                            pestrls = proEconStateTransitionRatesService.list(queryWrapper);
+                            pestrls = proEconEquipmentInfoDay5Service.list(queryWrapper);
 //                                    .stream()
 //                                    .filter(i ->
 //                                            (i.getRecordDate().compareTo(yearbegin) == 0 || i.getRecordDate().after(yearbegin))
@@ -1434,12 +1434,12 @@ public class WindPowerInfo4Service {
 //                                                    && i.getProjectId().equals(wt.getProjectId())
 //                                    ).collect(Collectors.toList());
                             //大于3米20分钟转换及时次数
-                            timerate8_summary = pestrls.stream().mapToDouble(ProEconStateTransitionRates::getTimerate8).summaryStatistics();
+                            timerate8_summary = pestrls.stream().mapToDouble(ProEconEquipmentInfoDay5::getTimerate8).summaryStatistics();
                             //大于3米20分钟转换及时次数合计
                             timerate8_sum = timerate8_summary.getSum();
 
                             //大于3米状态转换总次数次数
-                            timerate14_summary = pestrls.stream().mapToDouble(ProEconStateTransitionRates::getTimerate14).summaryStatistics();
+                            timerate14_summary = pestrls.stream().mapToDouble(ProEconEquipmentInfoDay5::getTimerate14).summaryStatistics();
                             //大于3米状态转换总次数合计
                             timerate14_sum = timerate14_summary.getSum();
 
@@ -1448,16 +1448,16 @@ public class WindPowerInfo4Service {
                                 double temp = new BigDecimal(timerate8_sum).divide(new BigDecimal(timerate14_sum), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue();
                                 pewp.setNztzhjsl(temp);
                             } else {
-                                pewp.setNztzhjsl(100.0);
+                                pewp.setNztzhjsl(0.0);
                             }
 
                             //20分钟复位及时次数
-                            timerate19_summary = pestrls.stream().mapToDouble(ProEconStateTransitionRates::getTimerate19).summaryStatistics();
+                            timerate19_summary = pestrls.stream().mapToDouble(ProEconEquipmentInfoDay5::getTimerate19).summaryStatistics();
                             //20分钟复位及时次数合计
                             timerate19_sum = timerate19_summary.getSum();
 
                             //总复位次数
-                            timerate20_summary = pestrls.stream().mapToDouble(ProEconStateTransitionRates::getTimerate20).summaryStatistics();
+                            timerate20_summary = pestrls.stream().mapToDouble(ProEconEquipmentInfoDay5::getTimerate20).summaryStatistics();
                             //总复位次数合计
                             timerate20_sum = timerate20_summary.getSum();
 
@@ -1466,7 +1466,7 @@ public class WindPowerInfo4Service {
                                 double temp = new BigDecimal(timerate19_sum).divide(new BigDecimal(timerate20_sum), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue();
                                 pewp.setNfwjsl(temp);
                             } else {
-                                pewp.setNfwjsl(100.0);
+                                pewp.setNfwjsl(0.0);
                             }
 
                             queryWrapper2 = new QueryWrapper<>();
@@ -1493,14 +1493,14 @@ public class WindPowerInfo4Service {
                                 double temp = new BigDecimal(right_sum).divide(new BigDecimal(fault_sum), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue();
                                 pewp.setNgzxqjsl(temp);
                             } else {
-                                pewp.setNgzxqjsl(100.0);
+                                pewp.setNgzxqjsl(0.0);
                             }
 //年工程统计
                         case "2":
 //年线路统计
                             queryWrapper = new QueryWrapper<>();
                             queryWrapper.ge("record_date",yearbegin).le("record_date",end).eq("line_id",wt.getLineId());
-                            pestrls = proEconStateTransitionRatesService.list(queryWrapper);
+                            pestrls = proEconEquipmentInfoDay5Service.list(queryWrapper);
 //                                    .stream()
 //                                    .filter(i ->
 //                                            (i.getRecordDate().compareTo(yearbegin) == 0 || i.getRecordDate().after(yearbegin))
@@ -1508,12 +1508,12 @@ public class WindPowerInfo4Service {
 //                                                    && i.getLineId().equals(wt.getLineId())
 //                                    ).collect(Collectors.toList());
                             //大于3米20分钟转换及时次数
-                            timerate8_summary = pestrls.stream().mapToDouble(ProEconStateTransitionRates::getTimerate8).summaryStatistics();
+                            timerate8_summary = pestrls.stream().mapToDouble(ProEconEquipmentInfoDay5::getTimerate8).summaryStatistics();
                             //大于3米20分钟转换及时次数合计
                             timerate8_sum = timerate8_summary.getSum();
 
                             //大于3米状态转换总次数次数
-                            timerate14_summary = pestrls.stream().mapToDouble(ProEconStateTransitionRates::getTimerate14).summaryStatistics();
+                            timerate14_summary = pestrls.stream().mapToDouble(ProEconEquipmentInfoDay5::getTimerate14).summaryStatistics();
                             //大于3米状态转换总次数合计
                             timerate14_sum = timerate14_summary.getSum();
 
@@ -1522,16 +1522,16 @@ public class WindPowerInfo4Service {
                                 double temp = new BigDecimal(timerate8_sum).divide(new BigDecimal(timerate14_sum), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue();
                                 pewp.setNztzhjsl(temp);
                             } else {
-                                pewp.setNztzhjsl(100.0);
+                                pewp.setNztzhjsl(0.0);
                             }
 
                             //20分钟复位及时次数
-                            timerate19_summary = pestrls.stream().mapToDouble(ProEconStateTransitionRates::getTimerate19).summaryStatistics();
+                            timerate19_summary = pestrls.stream().mapToDouble(ProEconEquipmentInfoDay5::getTimerate19).summaryStatistics();
                             //20分钟复位及时次数合计
                             timerate19_sum = timerate19_summary.getSum();
 
                             //总复位次数
-                            timerate20_summary = pestrls.stream().mapToDouble(ProEconStateTransitionRates::getTimerate20).summaryStatistics();
+                            timerate20_summary = pestrls.stream().mapToDouble(ProEconEquipmentInfoDay5::getTimerate20).summaryStatistics();
                             //总复位次数合计
                             timerate20_sum = timerate20_summary.getSum();
 
@@ -1540,7 +1540,7 @@ public class WindPowerInfo4Service {
                                 double temp = new BigDecimal(timerate19_sum).divide(new BigDecimal(timerate20_sum), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue();
                                 pewp.setNfwjsl(temp);
                             } else {
-                                pewp.setNfwjsl(100.0);
+                                pewp.setNfwjsl(0.0);
                             }
                             queryWrapper2 = new QueryWrapper<>();
                             queryWrapper2.ge("date_time",monthbegin).le("date_time",end).eq("line_id",wt.getLineId());
@@ -1566,7 +1566,7 @@ public class WindPowerInfo4Service {
                                 double temp = new BigDecimal(right_sum).divide(new BigDecimal(fault_sum), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue();
                                 pewp.setNgzxqjsl(temp);
                             } else {
-                                pewp.setNgzxqjsl(100.0);
+                                pewp.setNgzxqjsl(0.0);
                             }
 //年线路统计
                         default:

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

@@ -52,11 +52,20 @@ public class WindturbineGoodnessService {
 
 
         List<ProEconWindturbineGoodness> vos=new ArrayList<>();
+
+        System.out.println("拟合优度风机数量"+CacheContext.wtls.size());
         for(ProBasicEquipment wt: CacheContext.wtls)
         {
+            Map<String, Map<String, Double>> coefficientMap=new HashMap<>();
+            Map<String, Map<String,Double>> fitMap=new HashMap<>();
+            try {
+               coefficientMap=coefficientService.coefficient(wt.getId(),DateUtils.truncate(recordDate));
+               fitMap=goodnessOfFitService.goodnessOfFit(wt.getId(),DateUtils.truncate(recordDate));
+            }catch (Exception e)
+            {
+                System.out.println(e.getMessage());
+            }
 
-            Map<String, Map<String, Double>> coefficientMap=coefficientService.coefficient(wt.getId(),DateUtils.truncate(recordDate));
-            Map<String, Map<String,Double>> fitMap=goodnessOfFitService.goodnessOfFit(wt.getId(),DateUtils.truncate(recordDate));
 
             QueryWrapper<ProEconEquipmentInfoDay1> queryWrapper2 = new QueryWrapper<>();
             queryWrapper2.eq("windturbine_id",wt.getId());
@@ -94,20 +103,38 @@ public class WindturbineGoodnessService {
                 po.setDaySpeed(day1ls.get(0).getRpjfs());
                 po.setMonthSpeed(day1ls.get(0).getYpjfs());
                 po.setYearSpeed(day1ls.get(0).getYpjfs());
+            }else
+            {
+                po.setDaySpeed(0.0);
+                po.setMonthSpeed(0.0);
+                po.setYearSpeed(0.0);
             }
+
             if(fitMap.containsKey(wt.getId()))
             {
                 Map<String, Double> map=fitMap.get(wt.getId());
                 po.setDayGoodness(map.get("day"));
                 po.setYearGoodness(map.get("month"));
                 po.setMonthGoodness(map.get("year"));
+            }else
+            {
+                po.setDayGoodness(0.0);
+                po.setYearGoodness(0.0);
+                po.setMonthGoodness(0.0);
             }
+
             if(coefficientMap.containsKey(wt.getId()))
             {
                 Map<String, Double> map=coefficientMap.get(wt.getId());
                 po.setDayCoefficient(map.get("day"));
                 po.setMonthCoefficient(map.get("month"));
                 po.setMonthCoefficient(map.get("year"));
+            }else
+            {
+
+                po.setDayCoefficient(0.0);
+                po.setMonthCoefficient(0.0);
+                po.setMonthCoefficient(0.0);
             }
 
 
@@ -185,9 +212,9 @@ public class WindturbineGoodnessService {
             ProEconWindturbineGoodness vo=vos.get(i);
             vo.setYearTop(i+1);
         }
-
-        proEconWindturbineGoodnessService.saveBatch(vos);
-
+        System.out.println("拟合优度风机存储数量"+vos.size());
+        proEconWindturbineGoodnessService.saveOrUpdateBatch(vos);
+        System.out.println("拟合优度风机存储结束");
     }
 
 }

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

@@ -557,7 +557,10 @@ public class InitialPointGoldenXkByEqEdosService implements IinitialPoint {
                     po.setWindpowerstationId(ws.getId());
                     po.setUniformCode(p.getUniformCode());
                     po.setTypeId(p.getTypeId());
+
+                    sb = new StringBuilder();
                     if (StringUtils.notEmp(postation.getId())) {
+
                         sb.append(postation.getId().substring(0,postation.getId().lastIndexOf("_")).replace("_", "")).append(".JSFW");
                     }
 
@@ -656,6 +659,8 @@ public class InitialPointGoldenXkByEqEdosService implements IinitialPoint {
                     po.setWindpowerstationId(ws.getId());
                     po.setUniformCode(p.getUniformCode());
                     po.setTypeId(p.getTypeId());
+
+                    sb = new StringBuilder();
                     if (StringUtils.notEmp(postation.getId())) {
                         sb.append(postation.getId().substring(0,postation.getId().lastIndexOf("_")).replace("_", "")).append(".JSFW");
                     }

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

@@ -1,5 +1,5 @@
 server:
-  port: 7011
+  port: 7031
   servlet:
     context-path: /
 
@@ -9,8 +9,8 @@ spring:
     allow-bean-definition-overriding: true #当遇到同样名字的时候，是否允许覆盖注册
   #redis集群
   redis:
-#    host: 124.70.18.168
-    host: 192.168.11.250
+    #    host: 124.70.18.168
+    host: 10.152.8.190
     port: 6379
     timeout: 100000
     #    集群环境打开下面注释，单机不需要打开
@@ -19,7 +19,7 @@ spring:
     #      nodes: 10.83.68.151:6379,10.83.68.152:6379,10.83.68.153:6379,10.83.68.154:6379,10.83.68.155:6379,10.83.68.156:6379,10.83.68.157:6379,10.83.68.158:6379,10.83.68.159:6379
     #      #默认值是5 一般当此值设置过大时，容易报：Too many Cluster redirections
     #      maxRedirects: 3
-    password:
+    password: 123456
     application:
       name: test
     jedis:
@@ -28,18 +28,18 @@ spring:
         min-idle: 0
         max-idle: 8
         max-wait: -1
-    database: 9
+    database: 0
   autoconfigure:
     exclude: org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: org.postgresql.Driver
-    url: jdbc:postgresql://192.168.11.248:5432/IMS_NEM_SD?rewriteBatchedStatements=true
+    url: jdbc:postgresql://10.152.8.190:5432/IMS_NEM_HNX?rewriteBatchedStatements=true
     username: postgres
     password: postgres
-#    url: jdbc:postgresql://124.70.75.91:5432/jn_test
-#    username: postgres
-#    password: gd123
+    #    url: jdbc:postgresql://124.70.75.91:5432/jn_test
+    #    username: postgres
+    #    password: gd123
     oracle-schema=:
     #    type: com.alibaba.druid.pool.DruidDataSource
     #    url: jdbc:mysql://127.0.0.1:3306/test?characterEncoding=utf8&serverTimezone=UTC
@@ -87,10 +87,10 @@ logging:
     com.example: debug
 #db url
 db:
-#  url: http://127.0.0.1:8011/ts
-  url: http://192.168.11.250:8011/ts
+  #  url: http://127.0.0.1:8011/ts
+  url: http://10.152.8.190:8011/ts
 #参与计算的场站
-runWindpowerstation: SD_GDDL_RZLX_FDC_STA,SD_GDDL_QDJN_FDC_STA,SD_GDDL_WHWD_FDC_STA,SD_GDDL_WHXQ_FDC_STA,SD_GDDL_RZWL_FDC_STA,SD_GDDL_WFZC_FDC_STA,SD_GDDL_DZXJ_FDC_STA,SD_GDDL_XTTA_FDC_STA,SD_LYDL_BH1_FDC_STA,SD_LYDL_BH2_FDC_STA,SD_LYDL_CG_FDC_STA,SD_LYDL_FJ_FDC_STA,SD_LYDL_YS_FDC_STA,SD_SXNY_FXFC_FDC_STA,SD_SXNY_JNSS_FDC_STA,SD_SXNY_WFBH_FDC_STA,SD_SXNY_PLHS_FDC_STA,SD_SXNY_JNCQ_FDC_STA,SD_SXNY_LXLN_FDC_STA,SD_SXNY_LQJS_FDC_STA,SD_SXNY_ZYXD_FDC_STA,SD_SXNY_ZYFS_FDC_STA,SD_GHTZ_HZJ_GDC_STA
+runWindpowerstation: HNX_LYDL_TEC_FDC_STA,HNX_GDDL_XL_FDC_STA,HNX_LYDL_XNX_FDC_STA,HNX_LYDL_XMS_FDC_STA,HNX_LYDL_JM_FDC_STA,HNX_SXNY_BT_GDC_STA,HNX_SXNY_FRS_FDC_STA,HNX_SXNY_HJL_FDC_STA,HNX_GDDL_FYD_FDC_STA,HNX_SXNY_FL_FDC_STA
 #计算状态用ai或者di
 clauStatus:
   ai: GJY03_GC,YLZ01_GC,PTZ02_GC   #配置期次

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

@@ -1,5 +1,5 @@
 server:
-  port: 7011
+  port: 7031
   servlet:
     context-path: /
 

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

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: hf
+    active: dev
 #    active: yun
 
 #    active: td

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

@@ -79,14 +79,14 @@ public class GenerationTest {
 //        //场站接入状态，总预测功率
 //        accessStatusService.accessStatus();
 //        //全场状态
-        accessStatusService.fullFieldState();
+//        accessStatusService.fullFieldState();
 
 
 //        statusService.powerRationing();
 //        statusService.statusReal();
 //        statusService.calculateStatusNumber();
 
-//          realtimeService.savaRealtimeTarget();
+          realtimeService.savaRealtimeTarget();
 //        cycleCalculationService.saveCyle();
 
 //        electricityMeteringService.saveGenerationDatas();

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/bmk/BenchmarkingService.java

@@ -71,6 +71,7 @@ public class BenchmarkingService {
         if (!companyids.endsWith("RGN")){
             list = list.stream().filter(wp->companyids.contains(wp.getCompanyId())).collect(Collectors.toList());
         }
+        SortUtils.sort(list,"orderNum",SortUtils.ASC);
         return list;
 
     }

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/specific/SpecificService.java

@@ -348,11 +348,11 @@ public class SpecificService {
         setCenterYtqInfo(companys,type,yearmonth,monthresultList);
         //设置比较数据
         monthresultList.stream().forEach(i->{
-            i.setMtbfCompare(i.getMtbf()>i.getTqmtbf()?1:2);
-            i.setMttrCompare(i.getMttr()>i.getTqmttr()?1:2);
-            i.setFwjslCompare(i.getFwjsl()>i.getTqfwjsl()?1:2);
-            i.setZtzhlCompare(i.getZtzhl()>i.getTqztzhl()?1:2);
-            i.setXqjslCompare(i.getXqjsl()>i.getTqxqjsl()?1:2);
+            i.setMtbfCompare(null == i.getTqmtbf() ? 2 : (i.getMtbf()>i.getTqmtbf()?1:2));
+            i.setMttrCompare(null == i.getTqmttr() ? 2 : (i.getMttr()>i.getTqmttr()?1:2));
+            i.setFwjslCompare(null == i.getTqfwjsl() ? 2: (i.getFwjsl()>i.getTqfwjsl()?1:2));
+            i.setZtzhlCompare(null == i.getTqztzhl() ? 2 : (i.getZtzhl()>i.getTqztzhl()?1:2));
+            i.setXqjslCompare(null == i.getTqxqjsl() ? 2 : (i.getXqjsl()>i.getTqxqjsl()?1:2));
         });
 
         //定义右边部分的结果list
@@ -363,11 +363,11 @@ public class SpecificService {
         setCenterNtqInfo(companys,type,yearmonth,yearresultList);
         //设置比较数据
         yearresultList.stream().forEach(i->{
-            i.setMtbfCompare(i.getMtbf()>i.getTqmtbf()?1:2);
-            i.setMttrCompare(i.getMttr()>i.getTqmttr()?1:2);
-            i.setFwjslCompare(i.getFwjsl()>i.getTqfwjsl()?1:2);
-            i.setZtzhlCompare(i.getZtzhl()>i.getTqztzhl()?1:2);
-            i.setXqjslCompare(i.getXqjsl()>i.getTqxqjsl()?1:2);
+            i.setMtbfCompare(null == i.getTqmtbf() ? 2 : (i.getMtbf()>i.getTqmtbf()?1:2));
+            i.setMttrCompare(null == i.getTqmttr() ? 2 : (i.getMttr()>i.getTqmttr()?1:2));
+            i.setFwjslCompare(null == i.getTqfwjsl() ? 2: (i.getFwjsl()>i.getTqfwjsl()?1:2));
+            i.setZtzhlCompare(null == i.getTqztzhl() ? 2 : (i.getZtzhl()>i.getTqztzhl()?1:2));
+            i.setXqjslCompare(null == i.getTqxqjsl() ? 2 : (i.getXqjsl()>i.getTqxqjsl()?1:2));
         });
 
         //封装最终返回结果

web/runeconomy-xk/src/main/resources/application-yun.yml

@@ -44,7 +44,7 @@ spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: org.postgresql.Driver
-    url: jdbc:postgresql://124.70.75.91:5432/jn_test #IMS_NEM_SD
+    url: jdbc:postgresql://124.70.75.91:5432/hn20130114 #IMS_NEM_SD
     username: postgres
     password: gd123
     #华为云测试地址

web/runeconomy-xk/src/main/resources/application.yml

@@ -1,6 +1,6 @@
 spring:
   profiles:
 #    active: jn
-#    active: yun
-    active: xk
+    active: yun
+#    active: xk
 #    active: sd