|
...
|
...
|
@@ -35,10 +35,9 @@ import org.thingsboard.server.dao.yunteng.service.TkDeviceProfileService; |
|
35
|
35
|
import org.thingsboard.server.dao.yunteng.service.TkTenantService;
|
|
36
|
36
|
import org.thingsboard.server.dao.yunteng.service.TkUserService;
|
|
37
|
37
|
|
|
38
|
|
-import java.time.LocalDate;
|
|
39
|
|
-import java.time.LocalDateTime;
|
|
40
|
|
-import java.time.LocalTime;
|
|
41
|
|
-import java.time.ZoneOffset;
|
|
|
38
|
+import java.time.*;
|
|
|
39
|
+import java.time.format.DateTimeFormatter;
|
|
|
40
|
+import java.time.temporal.TemporalAdjusters;
|
|
42
|
41
|
import java.util.*;
|
|
43
|
42
|
import java.util.concurrent.CompletableFuture;
|
|
44
|
43
|
import java.util.concurrent.ExecutionException;
|
|
...
|
...
|
@@ -388,51 +387,66 @@ public class TkHomePageServiceImpl implements HomePageService { |
|
388
|
387
|
}
|
|
389
|
388
|
|
|
390
|
389
|
@Override
|
|
391
|
|
- public DeferredResult<List<TsValue>> getHomePageLeftBottomInfo(
|
|
|
390
|
+ public DeferredResult<List<TkTsValue>> getHomePageLeftBottomInfo(
|
|
392
|
391
|
String customerId,
|
|
393
|
392
|
long startTs,
|
|
394
|
393
|
long endTs,
|
|
395
|
394
|
long interval,
|
|
396
|
395
|
TrendType trend,
|
|
397
|
396
|
boolean isCustomer) {
|
|
398
|
|
- List<CompletableFuture<TsValue>> futures = new ArrayList<>();
|
|
399
|
|
- interval = interval < 7200000 ? 7200000 : interval;
|
|
|
397
|
+ List<CompletableFuture<TkTsValue>> futures = new ArrayList<>();
|
|
400
|
398
|
long stepTs = startTs;
|
|
|
399
|
+ boolean isYearQuery = false;
|
|
|
400
|
+ if((endTs - startTs)/86400000 >= 365){
|
|
|
401
|
+ isYearQuery =true;
|
|
|
402
|
+ }
|
|
401
|
403
|
while (stepTs < endTs) {
|
|
402
|
|
- long tempStartTs = stepTs;
|
|
403
|
|
- long tempEndTs = stepTs + interval;
|
|
404
|
|
- long ts = tempStartTs + (tempEndTs - tempStartTs) / 2;
|
|
405
|
|
- LocalDateTime startTime =
|
|
406
|
|
- LocalDateTime.ofEpochSecond(tempStartTs / 1000, 0, ZoneOffset.ofHours(8));
|
|
407
|
|
- LocalDateTime endTime =
|
|
408
|
|
- LocalDateTime.ofEpochSecond(tempEndTs / 1000, 0, ZoneOffset.ofHours(8));
|
|
409
|
|
- CompletableFuture<TsValue> tsValueCompletableFuture = null;
|
|
|
404
|
+ Long tempStartTs = stepTs;
|
|
|
405
|
+ Long tempEndTs = stepTs + interval;
|
|
|
406
|
+ LocalDateTime startTime;
|
|
|
407
|
+ LocalDateTime endTime;
|
|
|
408
|
+ if(isYearQuery){
|
|
|
409
|
+ //按月份过滤
|
|
|
410
|
+ Instant instant = Instant.ofEpochMilli(tempStartTs);
|
|
|
411
|
+ LocalDateTime dateTime = LocalDateTime.ofInstant(instant, ZoneId.systemDefault());
|
|
|
412
|
+ startTime = getMonthStartTime(dateTime);
|
|
|
413
|
+ endTime = getNextMonthStartTime(dateTime);
|
|
|
414
|
+ }else{
|
|
|
415
|
+ //按聚合条件过滤
|
|
|
416
|
+ startTime =
|
|
|
417
|
+ LocalDateTime.ofEpochSecond(tempStartTs / 1000, 0, ZoneOffset.ofHours(8));
|
|
|
418
|
+ endTime =
|
|
|
419
|
+ LocalDateTime.ofEpochSecond(tempEndTs / 1000, 0, ZoneOffset.ofHours(8));
|
|
|
420
|
+ }
|
|
|
421
|
+ CompletableFuture<TkTsValue> tsValueCompletableFuture = null;
|
|
410
|
422
|
// 客户查询的是告警统计 消息统计
|
|
411
|
423
|
if (isCustomer) {
|
|
|
424
|
+ String date = getDateByLocalTime(startTime,isYearQuery,true);
|
|
412
|
425
|
if (trend == TrendType.CUSTOMER_ALARM_STATISTICAL) {
|
|
413
|
426
|
tsValueCompletableFuture =
|
|
414
|
427
|
findDeviceInfoByTs(
|
|
415
|
|
- customerId, tempStartTs, tempEndTs, ts, TrendType.CUSTOMER_ALARM_STATISTICAL);
|
|
|
428
|
+ customerId, tempStartTs, tempEndTs, date, TrendType.CUSTOMER_ALARM_STATISTICAL);
|
|
416
|
429
|
}
|
|
417
|
430
|
if (trend == TrendType.CUSTOMER_MESSAGE_STATISTICAL) {
|
|
418
|
431
|
tsValueCompletableFuture =
|
|
419
|
432
|
findDeviceInfoByTs(
|
|
420
|
|
- customerId, tempStartTs, tempEndTs, ts, TrendType.CUSTOMER_MESSAGE_STATISTICAL);
|
|
|
433
|
+ customerId, tempStartTs, tempEndTs, date, TrendType.CUSTOMER_MESSAGE_STATISTICAL);
|
|
421
|
434
|
}
|
|
422
|
435
|
} else {
|
|
|
436
|
+ String date = getDateByLocalTime(startTime,isYearQuery,false);
|
|
423
|
437
|
if (trend == TrendType.TENANT_TREND) {
|
|
424
|
|
- tsValueCompletableFuture = tenantService.findTenantsByTs(startTime, endTime, ts);
|
|
|
438
|
+ tsValueCompletableFuture = tenantService.findTenantsByTs(startTime, endTime, date);
|
|
425
|
439
|
}
|
|
426
|
440
|
if (trend == TrendType.CUSTOMER_TREND) {
|
|
427
|
|
- tsValueCompletableFuture = tkUserService.findUsersAsyncByTs(startTime, endTime, ts);
|
|
|
441
|
+ tsValueCompletableFuture = tkUserService.findUsersAsyncByTs(startTime, endTime, date);
|
|
428
|
442
|
}
|
|
429
|
443
|
}
|
|
430
|
444
|
futures.add(tsValueCompletableFuture);
|
|
431
|
445
|
stepTs = tempEndTs;
|
|
432
|
446
|
}
|
|
433
|
|
- final DeferredResult<List<TsValue>> deferredResult = new DeferredResult<>();
|
|
|
447
|
+ final DeferredResult<List<TkTsValue>> deferredResult = new DeferredResult<>();
|
|
434
|
448
|
if (futures.size() > FastIotConstants.MagicNumber.ZERO) {
|
|
435
|
|
- ListenableFuture<List<TsValue>> listenableFuture =
|
|
|
449
|
+ ListenableFuture<List<TkTsValue>> listenableFuture =
|
|
436
|
450
|
Futures.transform(
|
|
437
|
451
|
setFutures(futures),
|
|
438
|
452
|
tsValues -> {
|
|
...
|
...
|
@@ -765,9 +779,9 @@ public class TkHomePageServiceImpl implements HomePageService { |
|
765
|
779
|
homePageLeftTopDTO.setCustomerInfo(baseHomePageTop);
|
|
766
|
780
|
}
|
|
767
|
781
|
|
|
768
|
|
- private SettableFuture<List<TsValue>> setFutures(List<CompletableFuture<TsValue>> tsFutures) {
|
|
769
|
|
- SettableFuture<List<TsValue>> listenableFuture = SettableFuture.create();
|
|
770
|
|
- CompletableFuture<List<TsValue>> entities =
|
|
|
782
|
+ private SettableFuture<List<TkTsValue>> setFutures(List<CompletableFuture<TkTsValue>> tsFutures) {
|
|
|
783
|
+ SettableFuture<List<TkTsValue>> listenableFuture = SettableFuture.create();
|
|
|
784
|
+ CompletableFuture<List<TkTsValue>> entities =
|
|
771
|
785
|
CompletableFuture.allOf(tsFutures.toArray(new CompletableFuture[tsFutures.size()]))
|
|
772
|
786
|
.thenApply(
|
|
773
|
787
|
v -> tsFutures.stream().map(CompletableFuture::join).collect(Collectors.toList()));
|
|
...
|
...
|
@@ -800,11 +814,11 @@ public class TkHomePageServiceImpl implements HomePageService { |
|
800
|
814
|
return listenableFuture;
|
|
801
|
815
|
}
|
|
802
|
816
|
|
|
803
|
|
- private FutureCallback<List<TsValue>> getTsValueCallback(
|
|
804
|
|
- final DeferredResult<List<TsValue>> response) {
|
|
|
817
|
+ private FutureCallback<List<TkTsValue>> getTsValueCallback(
|
|
|
818
|
+ final DeferredResult<List<TkTsValue>> response) {
|
|
805
|
819
|
return new FutureCallback<>() {
|
|
806
|
820
|
@Override
|
|
807
|
|
- public void onSuccess(@Nullable List<TsValue> tsValues) {
|
|
|
821
|
+ public void onSuccess(@Nullable List<TkTsValue> tsValues) {
|
|
808
|
822
|
response.setResult(tsValues);
|
|
809
|
823
|
}
|
|
810
|
824
|
|
|
...
|
...
|
@@ -852,14 +866,43 @@ public class TkHomePageServiceImpl implements HomePageService { |
|
852
|
866
|
};
|
|
853
|
867
|
}
|
|
854
|
868
|
|
|
855
|
|
- private CompletableFuture<TsValue> findDeviceInfoByTs(
|
|
856
|
|
- String customerId, Long startTs, Long endTs, long ts, TrendType trend) {
|
|
|
869
|
+ private CompletableFuture<TkTsValue> findDeviceInfoByTs(
|
|
|
870
|
+ String customerId, Long startTs, Long endTs, String date, TrendType trend) {
|
|
857
|
871
|
Integer value;
|
|
858
|
872
|
if (trend == TrendType.CUSTOMER_MESSAGE_STATISTICAL) {
|
|
859
|
873
|
value = deviceMapper.findDeviceMessageInfoByTs(customerId, startTs, endTs);
|
|
860
|
874
|
} else {
|
|
861
|
875
|
value = deviceMapper.findDeviceAlarmInfoByCreatedTime(customerId, startTs, endTs);
|
|
862
|
876
|
}
|
|
863
|
|
- return CompletableFuture.supplyAsync(() -> new TsValue(ts, String.valueOf(value)));
|
|
|
877
|
+ return CompletableFuture.supplyAsync(() -> new TkTsValue(date, String.valueOf(value)));
|
|
|
878
|
+ }
|
|
|
879
|
+
|
|
|
880
|
+ /**
|
|
|
881
|
+ * 获取本月的开始时间
|
|
|
882
|
+ * @param dateTime 本月时间
|
|
|
883
|
+ * @return 本月第一天时间
|
|
|
884
|
+ */
|
|
|
885
|
+ public LocalDateTime getMonthStartTime(LocalDateTime dateTime){
|
|
|
886
|
+ // 获取本月的第一天0点的时间戳
|
|
|
887
|
+ return dateTime.with(TemporalAdjusters.firstDayOfMonth()).withHour(0).withMinute(0).withSecond(0).withNano(0);
|
|
|
888
|
+ }
|
|
|
889
|
+
|
|
|
890
|
+ /**
|
|
|
891
|
+ * 获取下个月的开始时间
|
|
|
892
|
+ * @param dateTime 本月时间
|
|
|
893
|
+ * @return 下个月第一天时间
|
|
|
894
|
+ */
|
|
|
895
|
+ public LocalDateTime getNextMonthStartTime(LocalDateTime dateTime){
|
|
|
896
|
+ // 获取下个月的第一天
|
|
|
897
|
+ LocalDateTime firstDayOfNextMonth = dateTime.with(TemporalAdjusters.firstDayOfNextMonth()).with(TemporalAdjusters.firstDayOfMonth());
|
|
|
898
|
+ // 将时间设置为0点
|
|
|
899
|
+ return firstDayOfNextMonth.withHour(0).withMinute(0).withSecond(0).withNano(0);
|
|
|
900
|
+ }
|
|
|
901
|
+
|
|
|
902
|
+ public String getDateByLocalTime(LocalDateTime startTime,boolean isYearQuery,boolean isCustomer){
|
|
|
903
|
+ String format = isYearQuery ?"yyyy-MM":"yyyy-MM-dd";
|
|
|
904
|
+ format = isCustomer?"yyyy-MM-dd HH:mm:ss":format;
|
|
|
905
|
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern(format);
|
|
|
906
|
+ return startTime.format(formatter);
|
|
864
|
907
|
}
|
|
865
|
908
|
} |
...
|
...
|
|
