123

histroy/benchmarking-histroy-hb/target/classes/application.yml

@@ -9,8 +9,8 @@ spring:
     allow-bean-definition-overriding: true #当遇到同样名字的时候，是否允许覆盖注册
   #redis集群
   redis:
-    host: 192.168.2.202
-#    host: 10.83.68.94
+#    host: 192.168.2.202
+    host: 10.83.68.94
     port: 6379
     timeout: 100000
     #    集群环境打开下面注释，单机不需要打开
@@ -35,8 +35,8 @@ spring:
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: oracle.jdbc.OracleDriver
     #外网
-#    url: jdbc:oracle:thin:@10.83.68.165:1521:gdsj
-    url: jdbc:oracle:thin:@192.168.2.215:1521:gdsj
+    url: jdbc:oracle:thin:@10.83.68.165:1521:gdsj
+#    url: jdbc:oracle:thin:@192.168.2.215:1521:gdsj
     username: gdprod
     password: gd123
     oracle-schema=:

web/benchmarking-web-hb/src/main/java/com/gyee/benchmarkingweb/mapper/auto/StatetransitionratesMapper.java

@@ -28,5 +28,5 @@ public interface StatetransitionratesMapper extends BaseMapper<Statetransitionra
             " and recorddate<=to_date("+"#{endDate}" +",'yyyy-MM-dd')"+
             " group by windpwoerid"
     )
-    List<Statetransitionrates> listZdyztzhl(String beginDate, String endDate);
+    List<Statetransitionrates> listZdyztzhl(@Param("beginDate") String beginDate, @Param("endDate") String endDate);
 }

web/benchmarking-web-hb/src/main/java/com/gyee/benchmarkingweb/service/specific/SpecificService.java

@@ -162,6 +162,20 @@ public class SpecificService {
                 dqvo.setYxnssl(0.0);
                 dqvo.setYslssl(0.0);
             }
+        }else{
+            dqvo.setYllfdl(0.0);
+            dqvo.setYsjfdl(0.0);
+            dqvo.setYwhssdl(0.0);
+            dqvo.setYgzssdl(0.0);
+            dqvo.setYxdssdl(0.0);
+            dqvo.setYxnssdl(0.0);
+            dqvo.setYslssdl(0.0);
+            dqvo.setYfnlyl(0.0);
+            dqvo.setYwhssl(0.0);
+            dqvo.setYgzssl(0.0);
+            dqvo.setYxdssl(0.0);
+            dqvo.setYxnssl(0.0);
+            dqvo.setYslssl(0.0);
         }
     }
 
@@ -251,6 +265,20 @@ public class SpecificService {
                 dqvo.setNxnssl(0.0);
                 dqvo.setNslssl(0.0);
             }
+        }else{
+            dqvo.setNllfdl(0.0);
+            dqvo.setNsjfdl(0.0);
+            dqvo.setNwhssdl(0.0);
+            dqvo.setNgzssdl(0.0);
+            dqvo.setNxdssdl(0.0);
+            dqvo.setNxnssdl(0.0);
+            dqvo.setNslssdl(0.0);
+            dqvo.setNfnlyl(0.0);
+            dqvo.setNwhssl(0.0);
+            dqvo.setNgzssl(0.0);
+            dqvo.setNxdssl(0.0);
+            dqvo.setNxnssl(0.0);
+            dqvo.setNslssl(0.0);
         }
     }
 
@@ -327,13 +355,19 @@ public class SpecificService {
         List<Windpowerspecificinfoday> tqList = windpowerspecificinfodayService.list(qw);
         tqList.stream().forEach(i->{
             Optional<SpecificCenterVo> optionMonth = monthresultList.stream().filter(j -> j.getWpid().equals(i.getWindpowerstationid())).findFirst();
+            SpecificCenterVo leftVo = optionMonth.get();
             if (optionMonth.isPresent()){
-                SpecificCenterVo leftVo = optionMonth.get();
                 leftVo.setTqmtbf(i.getFaultcount()!=0?i.getCalendartime()/i.getFaultcount()*100:0);
                 leftVo.setTqmttr(i.getFaultcount()!=0?i.getFaulttime()/i.getFaultcount()*100:0);
                 leftVo.setTqfwjsl(i.getTheoresettimes()!=0?i.getResettimes()/i.getTheoresettimes()*100:0);
                 leftVo.setTqztzhl(i.getTheoconversiontimes()!=0?i.getConversiontimes()/i.getTheoconversiontimes()*100:0);
                 leftVo.setTqxqjsl(i.getTheofaultcount()!=0?i.getRightcount()/i.getTheofaultcount()*100:0);
+            }else{
+                leftVo.setTqmtbf(0.0);
+                leftVo.setTqmttr(0.0);
+                leftVo.setTqfwjsl(0.0);
+                leftVo.setTqztzhl(0.0);
+                leftVo.setTqxqjsl(0.0);
             }
         });
     }

web/benchmarking-web-hb/src/main/resources/application.yml

@@ -9,8 +9,8 @@ spring:
     allow-bean-definition-overriding: true #当遇到同样名字的时候，是否允许覆盖注册
   #redis集群
   redis:
-#    host: 10.83.68.94
-    host: 192.168.2.202
+    host: 10.83.68.94
+#    host: 192.168.2.202
     port: 6379
     timeout: 100000
     #    集群环境打开下面注释，单机不需要打开
@@ -35,8 +35,8 @@ spring:
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: oracle.jdbc.OracleDriver
     #外网
-    url: jdbc:oracle:thin:@192.168.2.215:1521:gdsj
-#    url: jdbc:oracle:thin:@10.83.68.165:1521:gdsj
+#    url: jdbc:oracle:thin:@192.168.2.215:1521:gdsj
+    url: jdbc:oracle:thin:@10.83.68.165:1521:gdsj
     username: gdprod
     password: gd123
     oracle-schema=:

web/benchmarking-web-hb/target/classes/application.yml

@@ -9,8 +9,8 @@ spring:
     allow-bean-definition-overriding: true #当遇到同样名字的时候，是否允许覆盖注册
   #redis集群
   redis:
-#    host: 10.83.68.94
-    host: 192.168.2.202
+    host: 10.83.68.94
+#    host: 192.168.2.202
     port: 6379
     timeout: 100000
     #    集群环境打开下面注释，单机不需要打开
@@ -35,8 +35,8 @@ spring:
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: oracle.jdbc.OracleDriver
     #外网
-    url: jdbc:oracle:thin:@192.168.2.215:1521:gdsj
-#    url: jdbc:oracle:thin:@10.83.68.165:1521:gdsj
+#    url: jdbc:oracle:thin:@192.168.2.215:1521:gdsj
+    url: jdbc:oracle:thin:@10.83.68.165:1521:gdsj
     username: gdprod
     password: gd123
     oracle-schema=:

web/consumer/target/classes/application.yml

@@ -9,8 +9,8 @@ spring:
     allow-bean-definition-overriding: true #当遇到同样名字的时候，是否允许覆盖注册
   #redis集群
   redis:
-#    host: 10.83.68.94
-    host: 192.168.2.202
+    host: 10.83.68.94
+#    host: 192.168.2.202
     port: 6379
     timeout: 100000
     #    集群环境打开下面注释，单机不需要打开
@@ -35,8 +35,8 @@ spring:
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: oracle.jdbc.OracleDriver
     #外网
-    url: jdbc:oracle:thin:@192.168.2.215:1521:gdsj
-#    url: jdbc:oracle:thin:@10.83.68.165:1521:gdsj
+#    url: jdbc:oracle:thin:@192.168.2.215:1521:gdsj
+    url: jdbc:oracle:thin:@10.83.68.165:1521:gdsj
     username: gdprod
     password: gd123
     oracle-schema=: