简柏林 / thingskit · Commits

Commit 026d25334cac04ef3cf9ef9117a7428cc943506d

Authored by xp.Huang
1 parent e9dfae82

perf: 首页统计统一使用long进行统计

Inline Side-by-side
Showing 4 changed files with 38 additions and 40 deletions
... ... @@ -7,17 +7,17 @@ import lombok.Data;
7 7 public class BaseHomePageTop {
8 8
9 9 @ApiModelProperty(value = "总数")
10   - private Integer sumCount;
  10 + private Long sumCount;
11 11
12 12 @ApiModelProperty(value = "今日新增")
13   - private Integer todayAdd;
  13 + private Long todayAdd;
14 14
15   - public BaseHomePageTop(Integer sumCount, Integer todayAdd) {
  15 + public BaseHomePageTop(Long sumCount, Long todayAdd) {
16 16 this.sumCount = sumCount;
17 17 this.todayAdd = todayAdd;
18 18 }
19 19
20   - public BaseHomePageTop(Integer defaultValue) {
  20 + public BaseHomePageTop(Long defaultValue) {
21 21 this.sumCount = defaultValue;
22 22 this.todayAdd = defaultValue;
23 23 }
... ...
... ... @@ -8,30 +8,30 @@ import java.io.Serializable;
8 8 @Data
9 9 public class HomeDeviceInfoDTO implements Serializable {
10 10 @ApiModelProperty(value = "设备总数")
11   - private Integer sumCount;
  11 + private Long sumCount;
12 12
13 13 @ApiModelProperty(value = "在线设备数量")
14   - private Integer onLine;
  14 + private Long onLine;
15 15
16 16 @ApiModelProperty(value = "离线设备数量")
17   - private Integer offLine;
  17 + private Long offLine;
18 18
19 19 @ApiModelProperty(value = "未激活设备数量")
20   - private Integer inActive;
  20 + private Long inActive;
21 21
22 22 @ApiModelProperty(value = "网关设备数量")
23   - private Integer gateWay;
  23 + private Long gateWay;
24 24
25 25 @ApiModelProperty(value = "直连设备数量")
26   - private Integer directConnection;
  26 + private Long directConnection;
27 27
28 28 @ApiModelProperty(value = "网关子设备数量")
29   - private Integer sensor;
  29 + private Long sensor;
30 30
31 31 @ApiModelProperty(value = "今日新增设备数量")
32   - private Integer todayAdd;
  32 + private Long todayAdd;
33 33
34   - public HomeDeviceInfoDTO(Integer defaultValue) {
  34 + public HomeDeviceInfoDTO(Long defaultValue) {
35 35 this.sumCount = defaultValue;
36 36 this.onLine = defaultValue;
37 37 this.offLine = defaultValue;
... ...
... ... @@ -7,36 +7,36 @@ import lombok.Data;
7 7 public class HomePageTopMessage {
8 8
9 9 @ApiModelProperty(value = "消息总数")
10   - private Integer messageCount;
  10 + private Long messageCount;
11 11
12 12 @ApiModelProperty(value = "数据点总数")
13   - private Integer dataPointsCount;
  13 + private Long dataPointsCount;
14 14
15 15 @ApiModelProperty(value = "今日消息新增")
16   - private Integer todayMessageAdd;
  16 + private Long todayMessageAdd;
17 17
18 18 @ApiModelProperty(value = "今日数据点新增")
19   - private Integer todayDataPointsAdd;
  19 + private Long todayDataPointsAdd;
20 20
21 21 public HomePageTopMessage(
22   - Integer messageCount,
23   - Integer dataPointsCount,
24   - Integer todayMessageAdd,
25   - Integer todayDataPointsAdd) {
  22 + Long messageCount,
  23 + Long dataPointsCount,
  24 + Long todayMessageAdd,
  25 + Long todayDataPointsAdd) {
26 26 this.messageCount = messageCount;
27 27 this.dataPointsCount = dataPointsCount;
28 28 this.todayMessageAdd = todayMessageAdd;
29 29 this.todayDataPointsAdd = todayDataPointsAdd;
30 30 }
31 31
32   - public HomePageTopMessage(Integer messageCount, Integer todayMessageAdd) {
  32 + public HomePageTopMessage(Long messageCount, Long todayMessageAdd) {
33 33 this.messageCount = messageCount;
34 34 this.todayMessageAdd = todayMessageAdd;
35   - this.dataPointsCount = 0;
36   - this.todayDataPointsAdd = 0;
  35 + this.dataPointsCount = 0l;
  36 + this.todayDataPointsAdd = 0l;
37 37 }
38 38
39   - public HomePageTopMessage(Integer defaultValue) {
  39 + public HomePageTopMessage(Long defaultValue) {
40 40 this.messageCount = defaultValue;
41 41 this.dataPointsCount = defaultValue;
42 42 this.todayMessageAdd = defaultValue;
... ...
... ... @@ -90,7 +90,7 @@ public class TkHomePageServiceImpl implements HomePageService {
90 90 LocalDateTime nowTime = LocalDateTime.now();
91 91 LocalDateTime todayBegin = LocalDateTime.of(nowTime.toLocalDate(), LocalTime.MIN);
92 92 LocalDateTime todayEnd = LocalDateTime.of(nowTime.toLocalDate(), LocalTime.MAX);
93   - int zero = FastIotConstants.MagicNumber.ZERO;
  93 + long zero = FastIotConstants.MagicNumber.ZERO;
94 94 HomePageTopMessage messageInfo = new HomePageTopMessage(zero);
95 95 BaseHomePageTop alarm = new BaseHomePageTop(zero);
96 96 BaseHomePageTop product = new BaseHomePageTop(zero);
... ... @@ -162,10 +162,9 @@ public class TkHomePageServiceImpl implements HomePageService {
162 162 tenantId, new CustomerId(UUID.fromString(customerId)), null, null);
163 163 }
164 164 }
165   - int todayAdd = zero;
  165 + long todayAdd = zero;
166 166 if (null != deviceProfileDTOList && !deviceProfileDTOList.isEmpty()) {
167 167 todayAdd =
168   - (int)
169 168 deviceProfileDTOList.stream()
170 169 .filter(
171 170 item ->
... ... @@ -568,11 +567,11 @@ public class TkHomePageServiceImpl implements HomePageService {
568 567 * @param homeDeviceInfoDTO 首页信息
569 568 */
570 569 private void setDeviceInfoData(List<DeviceDTO> deviceList, HomeDeviceInfoDTO homeDeviceInfoDTO) {
571   - homeDeviceInfoDTO.setSumCount(deviceList.size());
572   - int defaultValue = FastIotConstants.MagicNumber.ZERO;
573   - AtomicReference<Integer> gateWay = new AtomicReference<>(defaultValue);
574   - AtomicReference<Integer> directConnection = new AtomicReference<>(defaultValue);
575   - AtomicReference<Integer> sensor = new AtomicReference<>(defaultValue);
  570 + homeDeviceInfoDTO.setSumCount(deviceList.stream().count());
  571 + long defaultValue = FastIotConstants.MagicNumber.ZERO;
  572 + AtomicReference<Long> gateWay = new AtomicReference<>(defaultValue);
  573 + AtomicReference<Long> directConnection = new AtomicReference<>(defaultValue);
  574 + AtomicReference<Long> sensor = new AtomicReference<>(defaultValue);
576 575 deviceList.forEach(
577 576 device -> {
578 577 int basicNum = FastIotConstants.MagicNumber.ONE;
... ... @@ -624,15 +623,14 @@ public class TkHomePageServiceImpl implements HomePageService {
624 623 private void setTenantInfoData(
625 624 HomePageLeftTopDTO homePageLeftTopDTO, LocalDateTime startTime, LocalDateTime endTime) {
626 625 List<TenantDTO> tenants = tenantService.getAllTenant();
627   - int todayAdd =
628   - (int)
  626 + long todayAdd =
629 627 tenants.stream()
630 628 .filter(
631 629 tenant ->
632 630 tenant.getCreateTime().isAfter(startTime)
633 631 && tenant.getCreateTime().isBefore(endTime))
634 632 .count();
635   - int sumCount = tenants.size();
  633 + long sumCount = tenants.size();
636 634 BaseHomePageTop baseHomePageTop = new BaseHomePageTop(sumCount, todayAdd);
637 635 homePageLeftTopDTO.setTenantInfo(baseHomePageTop);
638 636 }
... ... @@ -710,7 +708,7 @@ public class TkHomePageServiceImpl implements HomePageService {
710 708 result.forEach(
711 709 tsKvEntry -> {
712 710 if (tsKvEntry.getLongValue().isPresent()) {
713   - int count = tsKvEntry.getLongValue().get().intValue();
  711 + long count = tsKvEntry.getLongValue().get();
714 712 switch (tsKvEntry.getKey()) {
715 713 case FastIotConstants.Statistics.TRANSPORT_MSG_COUNT:
716 714 messageInfo.setMessageCount(count + messageInfo.getMessageCount());
... ... @@ -719,7 +717,7 @@ public class TkHomePageServiceImpl implements HomePageService {
719 717 messageInfo.setDataPointsCount(count + messageInfo.getDataPointsCount());
720 718 break;
721 719 case FastIotConstants.Statistics.CREATED_ALARMS_COUNT:
722   - alarm.setSumCount(count + alarm.getSumCount());
  720 + alarm.setSumCount( count + alarm.getSumCount());
723 721 break;
724 722 default:
725 723 break;
... ... @@ -887,9 +885,9 @@ public class TkHomePageServiceImpl implements HomePageService {
887 885 private void setCustomerInfoData(
888 886 HomePageLeftTopDTO homePageLeftTopDTO, LocalDateTime startTime, LocalDateTime endTime) {
889 887 List<UserDTO> userList = userMapper.getUserCountByRoleType(RoleEnum.CUSTOMER_USER);
890   - int sumCount = userList != null ? userList.size() : FastIotConstants.MagicNumber.ZERO;
  888 + long sumCount = userList != null ? userList.size() : FastIotConstants.MagicNumber.ZERO;
891 889
892   - int todayAdd = FastIotConstants.MagicNumber.ZERO;
  890 + long todayAdd = FastIotConstants.MagicNumber.ZERO;
893 891 if (userList != null && !userList.isEmpty()) {
894 892 todayAdd +=
895 893 (int) userList.stream()
... ...