Merge remote-tracking branch 'origin/master'

gyee-sample-impala/src/main/java/com/gyee/impala/common/feign/IAdapterService.java

@@ -61,6 +61,7 @@ public interface IAdapterService {
      * @param thingId 风机（或其他）ID
      * @return 历史数据列表
      */
-    @RequestLine("GET /ts/history/snap?uniformCode={uniformCode}&startTs={startTs}&endTs={endTs}&thingType=windturbine&thingId={thingId}&interval=1")
-    List<PointData> getHistoryByUniformCode(@Param(value = "uniformCode") String uniformCode, @Param("startTs") String startTs, @Param("endTs") String endTs, @Param("thingId") String thingId);
+    @RequestLine("GET /ts/history/snap?uniformCode={uniformCode}&startTs={startTs}&endTs={endTs}&thingType=windturbine&thingId={thingId}&interval={interval}")
+    List<PointData> getHistoryByUniformCode(@Param(value = "uniformCode") String uniformCode, @Param("startTs") String startTs,
+                                            @Param("endTs") String endTs, @Param("thingId") String thingId, @Param("interval") int interval);
 }

gyee-sample-impala/src/main/java/com/gyee/impala/schdule/TaskStatistic.java

@@ -20,7 +20,7 @@ public class TaskStatistic {
     /**
      * 统计算法准确率
      */
-    @Scheduled(initialDelay = 20 * 1000, fixedRate = 1 * 60 * 60 * 1000)
+    @Scheduled(initialDelay = 50 * 1000, fixedRate = 1 * 60 * 60 * 1000)
     public void accuracyStatisticTask() {
         if (0 == InitialRunner.historyList.size())
             return;

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

@@ -146,7 +146,7 @@ public class DataDiagnoseService {
                 continue;
             }
             try {
-                List<PointData> pds = dataAdapterBuilder.adapter().getHistoryByUniformCode(ci.getUniformcode(), di.getStartTs(), di.getEndTs(), di.getThingId());
+                List<PointData> pds = dataAdapterBuilder.adapter().getHistoryByUniformCode(ci.getUniformcode(), di.getStartTs(), di.getEndTs(), di.getThingId(), 10);
                 pairs.put(key, pds);
             } catch (Exception e) {
                 e.printStackTrace();

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

@@ -149,7 +149,7 @@ public class DataPredictService {
                 continue;
             }
             try {
-                List<PointData> pds = dataAdapterBuilder.adapter().getHistoryByUniformCode(ci.getUniformcode(), di.getStartTs(), di.getEndTs(), di.getThingId());
+                List<PointData> pds = dataAdapterBuilder.adapter().getHistoryByUniformCode(ci.getUniformcode(), di.getStartTs(), di.getEndTs(), di.getThingId(), 10);
                 pairs.put(key, pds);
             } catch (Exception e) {
                 e.printStackTrace();

gyee-sample-impala/src/main/java/com/gyee/impala/service/custom/diagnose/DataService.java

@@ -160,7 +160,7 @@ public class DataService {
                 continue;
             }
             try {
-                List<PointData> pds = dataAdapterBuilder.adapter().getHistoryByUniformCode(ci.getCode(), di.getStartTs(), di.getEndTs(), di.getThingId());
+                List<PointData> pds = dataAdapterBuilder.adapter().getHistoryByUniformCode(ci.getCode(), di.getStartTs(), di.getEndTs(), di.getThingId(), 1);
                 pairs.put(ci.getName(), pds);
             } catch (Exception e) {
                 e.printStackTrace();