修改代码

ipfcst-console/src/main/java/com/jiayue/ipfcst/console/job/ReceiveDataJob.java

@@ -23,7 +23,7 @@ public class ReceiveDataJob {
   private ReceiveDataService receiveDataService;
 
 
-  @Scheduled(fixedDelay = 60000)
+  @Scheduled(fixedRate = 60000)
   public void receiveData() {
 
     log.info("开始向绿能数据中心请求数据");

ipfcst-console/src/main/java/com/jiayue/ipfcst/console/service/ReceiveDataService.java

@@ -80,13 +80,15 @@ public class ReceiveDataService {
   private static final int CONNECT_TIME_OUT = 3000;
 
 
+
   public void receive() {
     List<ElectricField> electricFieldList = electricFieldService.getAll();
+    long endTime =  DateTimeUtil.getCurrentTimeForMinute().getTime();
+    long startTime = endTime - 60000L;
     //每个场站请求一次
     for (ElectricField electricField : electricFieldList) {
       log.info(electricField.getName() + "开始请求数据");
-      Long startTime = DateTimeUtil.getCurrentTimeForMinute().getTime();
-      Long endTime = startTime + 60000L;
+
       try {
         //通用查询
         if (electricField.getElectricFieldTypeEnum().getCode() == 1) {
@@ -155,6 +157,7 @@ public class ReceiveDataService {
           values = jsonRows.getJSONObject(0);
           //时间戳
           String time = values.getString("timestamp");
+          log.info(electricField.getName()+time);
           //所有数据
           JSONArray jsonValues = (JSONArray) values.get("values");
           long timestamp = Long.parseLong(time);
@@ -206,7 +209,7 @@ public class ReceiveDataService {
               redisUtils.hmset("qxz-" + electricField.getStationCode() + "-" + equipmentId, map);
               WeatherStationStatusData weatherStationStatusData = JSON.parseObject(JSON.toJSONString(map), WeatherStationStatusData.class);
               weatherStationStatusDataRepository.save(weatherStationStatusData);
-              log.info("qxz-" + electricField.getStationCode() + "-" + equipmentId+"已存入");
+              log.info(map.get("time")+"qxz-" + electricField.getStationCode() + "-" + equipmentId+"已存入");
               break;
             case 2:
               //逆变器
@@ -222,7 +225,7 @@ public class ReceiveDataService {
               redisUtils.hmset("nbq-" + electricField.getStationCode() + "-" + equipmentId, map);
               InverterStatusData inverterStatusData = JSON.parseObject(JSON.toJSONString(map), InverterStatusData.class);
               inverterStatusDataRepository.save(inverterStatusData);
-              log.info("nbq-" + electricField.getStationCode() + "-" + equipmentId+"已存入");
+              log.info(map.get("time")+"nbq-" + electricField.getStationCode() + "-" + equipmentId+"已存入");
               break;
             case 3:
               redisUtils.hmset("fj-" + electricField.getStationCode() + "-" + equipmentId, map);
@@ -318,18 +321,4 @@ public class ReceiveDataService {
       e.printStackTrace();
     }
   }
-  public  void stop(){
-    Thread thread = new Thread(() -> {
-      while (Thread.currentThread().isInterrupted()) {
-        log.info("停止请求数据");
-      }
-    });
-    thread.start();
-    try {
-      Thread.sleep(1);
-    } catch (Exception e) {
-      e.printStackTrace();
-    }
-    thread.interrupt();
-  }
 }