fix:1.普通租户短信登陆bug 2.首页统计bug 3.告警配置只能在开启时选择优化

@@ -158,6 +158,7 @@ public class TkAlarmProfileServiceImpl extends AbstractBaseService<AlarmProfileM
         return baseMapper
                 .selectList(
                         new LambdaQueryWrapper<TkAlarmProfileEntity>()
+                                .eq(TkAlarmProfileEntity::getStatus,FastIotConstants.MagicNumber.ONE)
                                 .eq(TkAlarmProfileEntity::getTenantId, tenantId)
                                 .in(TkAlarmProfileEntity::getOrganizationId, organizationIds))
                 .stream()

@@ -122,6 +122,12 @@ public class TkHomePageServiceImpl implements HomePageService {
           orgIds = organizationService.currentUserOrganizationAllIds(currentUserId);
           queryMap.put("organizationIds",orgIds);
           alarmList = deviceMapper.findDeviceAlarmInfoByCustomer(startTs, null,orgIds);
+          //查询所有设备
+          List<DeviceDTO> devices = deviceMapper.findDevicesByDeviceTypeAndOrganizationId(orgIds,null,
+                  null,null,null);
+          List<String> finalTbDevices = new ArrayList<>();
+          devices.forEach(item -> finalTbDevices.add(item.getTbDeviceId()));
+          tbDevices = finalTbDevices;
         }else{
           customerId = userMapper.findCustomerIdByUserId(currentUserId);
           if (StringUtils.isNotEmpty(customerId)) {
@@ -130,10 +136,10 @@ public class TkHomePageServiceImpl implements HomePageService {
             tbDevices = deviceMapper.findDeviceIdsByCustomerId(customerId);
           }
           alarmList = deviceMapper.findDeviceAlarmInfoByCustomer(startTs, customerId,null);
-          for (String devId : tbDevices) {
-            setCustomerMessageInfo(
-                    todayBegin, todayEnd, currentTenantId, DeviceId.fromString(devId), messageInfo);
-          }
+        }
+        for (String devId : tbDevices) {
+          setCustomerMessageInfo(
+                  todayBegin, todayEnd, currentTenantId, DeviceId.fromString(devId), messageInfo);
         }
         if (alarmList.size() > zero) {
           BaseHomePageTop baseHomePageTop = alarmList.get(0);

@@ -196,7 +196,7 @@ public class TkMessageServiceImpl implements TkMessageService {
                             .lambda()
                             .eq(
                                     TkMessageTemplateEntity::getTenantId,
-                                    entity.getLevel() == 3 ? entity.getTenantId() : EntityId.NULL_UUID.toString())
+                                    entity.getLevel() == 3 || entity.getLevel() == 4 ? entity.getTenantId() : EntityId.NULL_UUID.toString())
                             .eq(TkMessageTemplateEntity::getStatus, 1)
                             .eq(TkMessageTemplateEntity::getTemplatePurpose, purpose.name())
                             .eq(TkMessageTemplateEntity::getMessageType, MessageTypeEnum.PHONE_MESSAGE.name()));