Commit 0fa47c9378d0a95d9c0349dce881d068dac00abc
1 parent
282db3c6
fix(DEFECT-639): 告警配置禁用任然能推送告警信息问题
Showing
1 changed file
with
5 additions
and
6 deletions
| @@ -6,10 +6,7 @@ import org.springframework.stereotype.Service; | @@ -6,10 +6,7 @@ import org.springframework.stereotype.Service; | ||
| 6 | import org.thingsboard.server.common.data.yunteng.dto.AlarmInfoDTO; | 6 | import org.thingsboard.server.common.data.yunteng.dto.AlarmInfoDTO; |
| 7 | import org.thingsboard.server.common.data.yunteng.dto.request.EmailReqDTO; | 7 | import org.thingsboard.server.common.data.yunteng.dto.request.EmailReqDTO; |
| 8 | import org.thingsboard.server.common.data.yunteng.dto.request.SmsReqDTO; | 8 | import org.thingsboard.server.common.data.yunteng.dto.request.SmsReqDTO; |
| 9 | -import org.thingsboard.server.common.data.yunteng.enums.AssetStatusEnum; | ||
| 10 | -import org.thingsboard.server.common.data.yunteng.enums.EmailFormatEnum; | ||
| 11 | -import org.thingsboard.server.common.data.yunteng.enums.MessageTypeEnum; | ||
| 12 | -import org.thingsboard.server.common.data.yunteng.enums.MsgTemplatePurposeEnum; | 9 | +import org.thingsboard.server.common.data.yunteng.enums.*; |
| 13 | import org.thingsboard.server.common.data.yunteng.utils.YtDateTimeUtils; | 10 | import org.thingsboard.server.common.data.yunteng.utils.YtDateTimeUtils; |
| 14 | import org.thingsboard.server.dao.yunteng.entities.*; | 11 | import org.thingsboard.server.dao.yunteng.entities.*; |
| 15 | import org.thingsboard.server.dao.yunteng.mapper.*; | 12 | import org.thingsboard.server.dao.yunteng.mapper.*; |
| @@ -65,8 +62,10 @@ public class YtNoticeServiceImpl implements YtNoticeService { | @@ -65,8 +62,10 @@ public class YtNoticeServiceImpl implements YtNoticeService { | ||
| 65 | .eq(Organization::getId, device.getOrganizationId()); | 62 | .eq(Organization::getId, device.getOrganizationId()); |
| 66 | Organization organization = organizationMapper.selectOne(organizationQueryWrapper); | 63 | Organization organization = organizationMapper.selectOne(organizationQueryWrapper); |
| 67 | 64 | ||
| 68 | - | ||
| 69 | - AlarmProfile alarmProfile = alarmProfileMapper.selectById(profileId); | 65 | + QueryWrapper<AlarmProfile> profileQueryWrapper = new QueryWrapper<AlarmProfile>(); |
| 66 | + profileQueryWrapper.lambda() | ||
| 67 | + .eq(AlarmProfile::getId, profileId).eq(AlarmProfile::getStatus, StatusEnum.ENABLE.ordinal()); | ||
| 68 | + AlarmProfile alarmProfile = alarmProfileMapper.selectOne(profileQueryWrapper); | ||
| 70 | 69 | ||
| 71 | 70 | ||
| 72 | if (alarmProfile == null || alarmProfile.getAlarmContactId().isEmpty() || alarmProfile.getMessageMode().isEmpty()) { | 71 | if (alarmProfile == null || alarmProfile.getAlarmContactId().isEmpty() || alarmProfile.getMessageMode().isEmpty()) { |