Commit f7276954f4b4a0a0476177c8aa264025e03535fa

Authored by 黄 x
1 parent 596962f1

fix: new customer homepage statistics

... ... @@ -84,9 +84,10 @@ public class TkHomePageServiceImpl implements HomePageService {
84 84 LocalDateTime nowTime = LocalDateTime.now();
85 85 LocalDateTime startTime = LocalDateTime.of(nowTime.toLocalDate(), LocalTime.MIN);
86 86 LocalDateTime endTime = LocalDateTime.of(nowTime.toLocalDate(), LocalTime.MAX);
87   - HomePageTopMessage messageInfo = new HomePageTopMessage(FastIotConstants.MagicNumber.ZERO);
88   - BaseHomePageTop alarm = new BaseHomePageTop(FastIotConstants.MagicNumber.ZERO);
89   - BaseHomePageTop product = new BaseHomePageTop(FastIotConstants.MagicNumber.ZERO);
  87 + int zero = FastIotConstants.MagicNumber.ZERO;
  88 + HomePageTopMessage messageInfo = new HomePageTopMessage(zero);
  89 + BaseHomePageTop alarm = new BaseHomePageTop(zero);
  90 + BaseHomePageTop product = new BaseHomePageTop(zero);
90 91 Map<String, Object> queryMap = new HashMap<>();
91 92 String customerId = null;
92 93 List<DeviceDTO> deviceList;
... ... @@ -105,20 +106,22 @@ public class TkHomePageServiceImpl implements HomePageService {
105 106 long startTs = startTime.toInstant(ZoneOffset.of("+8")).toEpochMilli();
106 107 List<BaseHomePageTop> baseHomePageTopList =
107 108 deviceMapper.findDeviceMessageInfo(startTs, customerId);
108   - if (baseHomePageTopList.size() > FastIotConstants.MagicNumber.ZERO) {
109   - messageInfo.setMessageCount(baseHomePageTopList.get(0).getSumCount());
110   - messageInfo.setTodayMessageAdd(baseHomePageTopList.get(0).getTodayAdd());
  109 + if (baseHomePageTopList.size() > zero) {
  110 + BaseHomePageTop baseHomePageTop = baseHomePageTopList.get(0);
  111 + messageInfo.setMessageCount(baseHomePageTop.getSumCount());
  112 + messageInfo.setTodayMessageAdd(baseHomePageTop.getTodayAdd() ==null ? zero:baseHomePageTop.getTodayAdd());
111 113 }
112 114 List<BaseHomePageTop> alarmList =
113 115 deviceMapper.findDeviceAlarmInfoByCustomer(startTs, customerId);
114   - if (alarmList.size() > FastIotConstants.MagicNumber.ZERO) {
115   - alarm.setSumCount(alarmList.get(0).getSumCount());
116   - alarm.setTodayAdd(alarmList.get(0).getTodayAdd());
  116 + if (alarmList.size() > zero) {
  117 + BaseHomePageTop baseHomePageTop = alarmList.get(0);
  118 + alarm.setSumCount(baseHomePageTop.getSumCount());
  119 + alarm.setTodayAdd(baseHomePageTop.getTodayAdd() == null ? zero :baseHomePageTop.getTodayAdd());
117 120 }
118 121 }
119 122 }
120 123 deviceList = deviceMapper.findDevices(queryMap);
121   - homeDeviceInfo = new HomeDeviceInfoDTO(FastIotConstants.MagicNumber.ZERO);
  124 + homeDeviceInfo = new HomeDeviceInfoDTO(zero);
122 125 if (null != deviceList) {
123 126 setDeviceInfoData(deviceList, homeDeviceInfo);
124 127 }
... ... @@ -134,8 +137,8 @@ public class TkHomePageServiceImpl implements HomePageService {
134 137 tenantId, new CustomerId(UUID.fromString(customerId)), null);
135 138 }
136 139 }
137   - int todayAdd = 0;
138   - if (!deviceProfileDTOList.isEmpty()) {
  140 + int todayAdd = zero;
  141 + if (null !=deviceProfileDTOList && !deviceProfileDTOList.isEmpty()) {
139 142 todayAdd =
140 143 (int)
141 144 deviceProfileDTOList.stream()
... ... @@ -145,7 +148,7 @@ public class TkHomePageServiceImpl implements HomePageService {
145 148 && item.getCreateTime().isBefore(endTime))
146 149 .count();
147 150 }
148   - product.setSumCount(deviceProfileDTOList.size());
  151 + product.setSumCount(null !=deviceProfileDTOList?deviceProfileDTOList.size():zero);
149 152 product.setTodayAdd(todayAdd);
150 153 homePageLeftTopDTO.setProductInfo(product);
151 154 }
... ...