TRX hai 1 ano
pai
achega
4781778654

+ 7 - 5
OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/dao/base/BaseImpl.java

@@ -37,12 +37,14 @@ public abstract class BaseImpl {
             param.setEndTime(times.get(1));
         }
 
-        if (!CommonUtil.longIsEmpty(param.getStartTime())) {
-            param.setStartTime(DateUtils.getDayStartTime(param.getStartTime()));
-        }
+        if (param.getIsTurnTime() != null && param.getIsTurnTime()) {
+            if (!CommonUtil.longIsEmpty(param.getStartTime())) {
+                param.setStartTime(DateUtils.getDayStartTime(param.getStartTime()));
+            }
 
-        if (!CommonUtil.longIsEmpty(param.getEndTime())) {
-            param.setEndTime(DateUtils.getDayEndTime(param.getEndTime()));
+            if (!CommonUtil.longIsEmpty(param.getEndTime())) {
+                param.setEndTime(DateUtils.getDayEndTime(param.getEndTime()));
+            }
         }
 
         if (!CommonUtil.longIsEmpty(param.getStartTime()) && !CommonUtil.longIsEmpty(param.getEndTime())) {

+ 1 - 0
OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/dao/mqtt/extend/OperationMessageDaoExtend.java

@@ -25,4 +25,5 @@ public interface OperationMessageDaoExtend {
     Long count(OperationMessageSearchParam param);
 
     Map<String, Long> statisticsMinuteNumber(OperationMessageSearchParam param);
+
 }

+ 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 = DateUtils.paresTime(startTime, com.zhongshu.card.client.utils.DateUtils.patternyyyyMMddHHmmKey);
-            String xAxi = DateUtils.paresTime(startTime, com.zhongshu.card.client.utils.DateUtils.patternHHmm);
+            String minuteKey = com.zhongshu.card.client.utils.DateUtils.paresTime(startTime,
+                    com.zhongshu.card.client.utils.DateUtils.patternyyyyMMddHHmmKey);
+            String xAxi = com.zhongshu.card.client.utils.DateUtils.paresTime(startTime, com.zhongshu.card.client.utils.DateUtils.patternHHmm);
 
             xAxis.add(xAxi);
             Long number = map.containsKey(minuteKey) ? map.get(minuteKey) : 0L;