当阳数据实时数据将1分钟以下的数据做1分钟对齐

dc3-gateway/src/main/java/io/github/pnoker/gateway/bizmgr/KprDangyangWaterBizFun.java

@@ -212,8 +212,8 @@ public class KprDangyangWaterBizFun {
         Calendar nextRun = (Calendar) now.clone();
 
         // 设置为明天的0点
-        nextRun.set(Calendar.HOUR_OF_DAY, 1);
-        nextRun.set(Calendar.MINUTE, 0);
+        nextRun.set(Calendar.HOUR_OF_DAY, 15);
+        nextRun.set(Calendar.MINUTE, 28);
         nextRun.set(Calendar.SECOND, 0);
         nextRun.set(Calendar.MILLISECOND, 0);
 

dc3-gateway/src/main/java/io/github/pnoker/gateway/comtool/ScheduleTaskMgr.java

@@ -171,15 +171,15 @@ public class ScheduleTaskMgr {
 //        },5000);
 //    }
 
-//    @PostConstruct
-//    public void initReal(){
-//        new Timer().schedule(new TimerTask() {
-//            @Override
-//            public void run() {
-//                KprDangyangWaterBizFun.checkRealtimeData();
-//            }
-//        },10000);
-//    }
+    @PostConstruct
+    public void initReal(){
+        new Timer().schedule(new TimerTask() {
+            @Override
+            public void run() {
+                KprDangyangWaterBizFun.checkRealtimeData();
+            }
+        },10000);
+    }
     @PostConstruct
     public void initHistory(){
         new Timer().schedule(new TimerTask() {

dc3-gateway/src/main/java/io/github/pnoker/gateway/comtool/ThreadPoolTaskTool.java

@@ -15,6 +15,7 @@ import java.util.concurrent.*;
  **/
 public class ThreadPoolTaskTool {
     public static Map<String, ScheduledFuture<?>> scheduledTasks = new ConcurrentHashMap<>();//全局唯一
+    public static Map<String, ScheduledFuture<?>> scheduledHistoryTasks = new ConcurrentHashMap<>();//全局唯一
 
 
     //TODO 创建任务池
@@ -34,6 +35,28 @@ public class ThreadPoolTaskTool {
     }
     public static void scheduleHistroyTask(ScheduledExecutorService scheduler,String taskId,ThreadHistoryTask threadTask,Long initialDelay,Integer collectionFrequency) {
         ScheduledFuture<?> future = scheduler.scheduleAtFixedRate(threadTask, initialDelay, collectionFrequency, TimeUnit.SECONDS);
-        scheduledTasks.put(taskId, future);
+        scheduledHistoryTasks.put(taskId, future);
+    }
+
+    public static void cancelTask() {
+        for(String taskIdKey :scheduledTasks.keySet()){
+            ScheduledFuture<?> future = scheduledTasks.get(taskIdKey);
+            if (future != null) {
+                future.cancel(true);
+                scheduledTasks.remove(taskIdKey);
+                System.out.println("Task " + taskIdKey + " cancelled.");
+            }
+        }
+    }
+
+    public static void cancelHistoryTask() {
+        for(String taskIdKey :scheduledHistoryTasks.keySet()){
+            ScheduledFuture<?> future = scheduledHistoryTasks.get(taskIdKey);
+            if (future != null) {
+                future.cancel(true);
+                scheduledHistoryTasks.remove(taskIdKey);
+                System.out.println("Task " + taskIdKey + " cancelled.");
+            }
+        }
     }
 }

dc3-gateway/src/main/java/io/github/pnoker/gateway/comtool/ThreadTask.java

@@ -75,7 +75,7 @@ public class ThreadTask implements Runnable{
                         //TODO 查询数据不为空,插入infulxdb
                         JSONObject deviceRealtimeData = devicerealtimeDataTotal.getJSONObject("data")
                                 .getJSONArray("list").getJSONObject(0);
-                        adjustTime(deviceRealtimeData, collectionFrequency);//时间间隔round处理
+                        adjustTime(deviceRealtimeData, collectionFrequency<60?60:collectionFrequency);//时间间隔round处理
                         deviceRealtimeDataList.add(deviceRealtimeData);
                     } else {
                         log.error("任务线程" + taskId + " 执行设备"

dc3-gateway/src/main/java/io/github/pnoker/gateway/utils/HttpUtil.java

@@ -40,8 +40,8 @@ public class HttpUtil {
         URL url = new URL(urlString+paramStr);
         HttpURLConnection conn = (HttpURLConnection) url.openConnection();
         conn.setRequestMethod("GET");
-        conn.setConnectTimeout(5000);
-        conn.setReadTimeout(5000);
+        conn.setConnectTimeout(1800000);
+        conn.setReadTimeout(1800000);
 
         // 设置请求头
         if (headers != null) {