TRX 1 жил өмнө
parent
commit
ef00fc6c56

+ 2 - 2
OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/device/DeviceOnLineRecordService.java

@@ -94,8 +94,8 @@ public class DeviceOnLineRecordService extends SuperService {
         Long endRecordTime = search.getEndRecordTime();
         // 已分钟一条数据
         while (startRecordTime <= endRecordTime) {
-            String minuteKey = DateUtils.paresTime(System.currentTimeMillis(), DateUtils.patternyyyyMMddHHmmKey);
-            String xAxi = DateUtils.paresTime(System.currentTimeMillis(), DateUtils.patternHHmm);
+            String minuteKey = DateUtils.paresTime(startRecordTime, DateUtils.patternyyyyMMddHHmmKey);
+            String xAxi = DateUtils.paresTime(startRecordTime, DateUtils.patternHHmm);
             xAxis.add(xAxi);
             Long number = map.containsKey(minuteKey) ? map.get(minuteKey) : 0L;
             seriesModel.addSeries(number);

+ 3 - 2
OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/device/DeviceStatisticsService.java

@@ -97,8 +97,9 @@ public class DeviceStatisticsService {
         Long endTime = search.getEndTime();
         // 已分钟一条数据
         while (startTime <= endTime) {
-            String minuteKey = com.zhongshu.card.client.utils.DateUtils.paresTime(System.currentTimeMillis(), com.zhongshu.card.client.utils.DateUtils.patternyyyyMMddHHmmKey);
-            String xAxi = com.zhongshu.card.client.utils.DateUtils.paresTime(System.currentTimeMillis(), com.zhongshu.card.client.utils.DateUtils.patternHHmm);
+            String minuteKey = DateUtils.paresTime(startTime, com.zhongshu.card.client.utils.DateUtils.patternyyyyMMddHHmmKey);
+            String xAxi = DateUtils.paresTime(startTime, com.zhongshu.card.client.utils.DateUtils.patternHHmm);
+
             xAxis.add(xAxi);
             Long number = map.containsKey(minuteKey) ? map.get(minuteKey) : 0L;
             seriesModel.addSeries(number);