Commit aaffde8a36056be05c965ce95a6f15bc13a34e07
1 parent
f1541f53
fix:1.普通租户短信登陆bug 2.首页统计bug 3.告警配置只能在开启时选择优化
Showing
3 changed files
with
12 additions
and
5 deletions
| @@ -158,6 +158,7 @@ public class TkAlarmProfileServiceImpl extends AbstractBaseService<AlarmProfileM | @@ -158,6 +158,7 @@ public class TkAlarmProfileServiceImpl extends AbstractBaseService<AlarmProfileM | ||
| 158 | return baseMapper | 158 | return baseMapper |
| 159 | .selectList( | 159 | .selectList( |
| 160 | new LambdaQueryWrapper<TkAlarmProfileEntity>() | 160 | new LambdaQueryWrapper<TkAlarmProfileEntity>() |
| 161 | + .eq(TkAlarmProfileEntity::getStatus,FastIotConstants.MagicNumber.ONE) | ||
| 161 | .eq(TkAlarmProfileEntity::getTenantId, tenantId) | 162 | .eq(TkAlarmProfileEntity::getTenantId, tenantId) |
| 162 | .in(TkAlarmProfileEntity::getOrganizationId, organizationIds)) | 163 | .in(TkAlarmProfileEntity::getOrganizationId, organizationIds)) |
| 163 | .stream() | 164 | .stream() |
| @@ -122,6 +122,12 @@ public class TkHomePageServiceImpl implements HomePageService { | @@ -122,6 +122,12 @@ public class TkHomePageServiceImpl implements HomePageService { | ||
| 122 | orgIds = organizationService.currentUserOrganizationAllIds(currentUserId); | 122 | orgIds = organizationService.currentUserOrganizationAllIds(currentUserId); |
| 123 | queryMap.put("organizationIds",orgIds); | 123 | queryMap.put("organizationIds",orgIds); |
| 124 | alarmList = deviceMapper.findDeviceAlarmInfoByCustomer(startTs, null,orgIds); | 124 | alarmList = deviceMapper.findDeviceAlarmInfoByCustomer(startTs, null,orgIds); |
| 125 | + //查询所有设备 | ||
| 126 | + List<DeviceDTO> devices = deviceMapper.findDevicesByDeviceTypeAndOrganizationId(orgIds,null, | ||
| 127 | + null,null,null); | ||
| 128 | + List<String> finalTbDevices = new ArrayList<>(); | ||
| 129 | + devices.forEach(item -> finalTbDevices.add(item.getTbDeviceId())); | ||
| 130 | + tbDevices = finalTbDevices; | ||
| 125 | }else{ | 131 | }else{ |
| 126 | customerId = userMapper.findCustomerIdByUserId(currentUserId); | 132 | customerId = userMapper.findCustomerIdByUserId(currentUserId); |
| 127 | if (StringUtils.isNotEmpty(customerId)) { | 133 | if (StringUtils.isNotEmpty(customerId)) { |
| @@ -130,10 +136,10 @@ public class TkHomePageServiceImpl implements HomePageService { | @@ -130,10 +136,10 @@ public class TkHomePageServiceImpl implements HomePageService { | ||
| 130 | tbDevices = deviceMapper.findDeviceIdsByCustomerId(customerId); | 136 | tbDevices = deviceMapper.findDeviceIdsByCustomerId(customerId); |
| 131 | } | 137 | } |
| 132 | alarmList = deviceMapper.findDeviceAlarmInfoByCustomer(startTs, customerId,null); | 138 | alarmList = deviceMapper.findDeviceAlarmInfoByCustomer(startTs, customerId,null); |
| 133 | - for (String devId : tbDevices) { | ||
| 134 | - setCustomerMessageInfo( | ||
| 135 | - todayBegin, todayEnd, currentTenantId, DeviceId.fromString(devId), messageInfo); | ||
| 136 | - } | 139 | + } |
| 140 | + for (String devId : tbDevices) { | ||
| 141 | + setCustomerMessageInfo( | ||
| 142 | + todayBegin, todayEnd, currentTenantId, DeviceId.fromString(devId), messageInfo); | ||
| 137 | } | 143 | } |
| 138 | if (alarmList.size() > zero) { | 144 | if (alarmList.size() > zero) { |
| 139 | BaseHomePageTop baseHomePageTop = alarmList.get(0); | 145 | BaseHomePageTop baseHomePageTop = alarmList.get(0); |
| @@ -196,7 +196,7 @@ public class TkMessageServiceImpl implements TkMessageService { | @@ -196,7 +196,7 @@ public class TkMessageServiceImpl implements TkMessageService { | ||
| 196 | .lambda() | 196 | .lambda() |
| 197 | .eq( | 197 | .eq( |
| 198 | TkMessageTemplateEntity::getTenantId, | 198 | TkMessageTemplateEntity::getTenantId, |
| 199 | - entity.getLevel() == 3 ? entity.getTenantId() : EntityId.NULL_UUID.toString()) | 199 | + entity.getLevel() == 3 || entity.getLevel() == 4 ? entity.getTenantId() : EntityId.NULL_UUID.toString()) |
| 200 | .eq(TkMessageTemplateEntity::getStatus, 1) | 200 | .eq(TkMessageTemplateEntity::getStatus, 1) |
| 201 | .eq(TkMessageTemplateEntity::getTemplatePurpose, purpose.name()) | 201 | .eq(TkMessageTemplateEntity::getTemplatePurpose, purpose.name()) |
| 202 | .eq(TkMessageTemplateEntity::getMessageType, MessageTypeEnum.PHONE_MESSAGE.name())); | 202 | .eq(TkMessageTemplateEntity::getMessageType, MessageTypeEnum.PHONE_MESSAGE.name())); |