Explorar o código

实时故障刷新时间,训练模型时前10条数据不显示

chenminghua %!s(int64=2) %!d(string=hai) anos
pai
achega
749bd0031f

+ 2 - 2
gyee-sample-impala/src/main/java/com/gyee/impala/service/custom/diagnose/AlarmService.java

@@ -30,7 +30,7 @@ public class AlarmService {
         cal.setTime(DateUtil.parseStrtoDate(faultTime, DateUtil.YYYY_MM_DD_HH_MM_SS));
         cal.add(Calendar.HOUR, -5);
         String st = DateUtil.format(cal.getTime(), DateUtil.YYYY_MM_DD_HH_MM_SS);
-        cal.add(Calendar.HOUR, 6);
+        cal.add(Calendar.HOUR, 5);
         String et = DateUtil.format(cal.getTime(), DateUtil.YYYY_MM_DD_HH_MM_SS);
 
         JSONObject data = remoteService.sharding().getAlertHistory("windturbine", st, et, station, wtId, 1);
@@ -46,7 +46,7 @@ public class AlarmService {
         cal.setTime(DateUtil.parseStrtoDate(faultTime, DateUtil.YYYY_MM_DD_HH_MM_SS));
         cal.add(Calendar.HOUR, -5);
         String st = DateUtil.format(cal.getTime(), DateUtil.YYYY_MM_DD_HH_MM_SS);
-        cal.add(Calendar.HOUR, 6);
+        cal.add(Calendar.HOUR, 5);
         String et = DateUtil.format(cal.getTime(), DateUtil.YYYY_MM_DD_HH_MM_SS);
 
         JSONObject data = remoteService.sharding().getAlertHistory("windturbine", st, et, station, wtId, 1);

+ 3 - 2
gyee-sample-impala/src/main/java/com/gyee/impala/service/custom/diagnose/DataDiagnoseService.java

@@ -81,12 +81,13 @@ public class DataDiagnoseService {
             if (!uniformCodeInfoMap.containsKey(di.getStationId())) {
                 continue;
             }
-            // 查询一台风机的原始数据
-            if (count == 0){
+            if (sb.toString().split("\n").length < 10){
+                // 查询一台风机的原始数据
                 Map<String, List<PointData>> data = getData(di, true);
                 String s = getDataString(data, di.getTag(), isFirst);
                 sb.append(s);
             }
+            isFirst = false;
 
             /** 评估多少数据量 **/
             count += (Long.valueOf(di.getEndTs()) - Long.valueOf(di.getStartTs())) / 1000;

+ 3 - 2
gyee-sample-impala/src/main/java/com/gyee/impala/service/custom/diagnose/DataPredictService.java

@@ -83,12 +83,13 @@ public class DataPredictService {
             if (!uniformCodeInfoMap.containsKey(di.getStationId())) {
                 continue;
             }
-            // 查询一台风机的原始数据
-            if (count == 0){
+            if (sb.toString().split("\n").length < 10){
+                // 查询一台风机的原始数据
                 Map<String, List<PointData>> data = getData(di, true);
                 String s = getDataString(data, di.getTag(), isFirst,di.getThingId());
                 sb.append(s);
             }
+            isFirst = false;
 
             /** 评估多少数据量 **/
             count += (Long.valueOf(di.getEndTs()) - Long.valueOf(di.getStartTs())) / 1000;

+ 1 - 1
gyee-sample-impala/src/main/java/com/gyee/impala/service/custom/diagnose/FaultRefreshService.java

@@ -53,7 +53,7 @@ public class FaultRefreshService implements ApplicationRunner {
         while (true) {
             try {
                 toRefresh();
-                Thread.sleep(30 * 1000);
+                Thread.sleep( 2000);
             } catch (Exception ex) {
                 ex.printStackTrace();
             }