Skip to content

黄嘉阳 / iot-platform-server

Go to a project
Commit f6a09814 by 汪志阳
Options

fix:bug fix

parent 18987427
Inline Side-by-side
Showing with 10 additions and 10 deletions
server-service/src/main/java/com/makeit/service/platform/alarm/impl/PlatAlarmRecordServiceImpl.java
...@@ -422,11 +422,11 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe ...@@ -422,11 +422,11 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
*/ */
private void noticeByChannel(PlatAlarmConfig alarmConfig, PlatAlarmRecord alarmRecord, Set<String> phoneSet,Set<String> emailSet, private void noticeByChannel(PlatAlarmConfig alarmConfig, PlatAlarmRecord alarmRecord, Set<String> phoneSet,Set<String> emailSet,
List<SendTypeEnum> notifyChannelList, List<MsgSendDTO.ReceiverInfo> receiverInfos) { List<SendTypeEnum> notifyChannelList, List<MsgSendDTO.ReceiverInfo> receiverInfos) {
log.info("开始短信通知:{},老人：{}", JSON.toJSONString(alarmConfig), alarmRecord.getElderName()); String elderName = alarmRecord.getElderName();
if (StrUtil.isNotBlank(alarmRecord.getElderIds()) && StrUtil.isBlank(alarmRecord.getElderName())) { log.info("开始短信通知:{},老人：{}", JSON.toJSONString(alarmConfig), elderName);
if (StrUtil.isNotBlank(alarmRecord.getElderIds()) && StrUtil.isBlank(elderName)) {
List<PlatElder> platElders = platElderService.listByIds(Arrays.asList(alarmRecord.getElderIds().split(","))); List<PlatElder> platElders = platElderService.listByIds(Arrays.asList(alarmRecord.getElderIds().split(",")));
String elderName = platElders.stream().map(PlatElder::getName).collect(Collectors.joining(",")); elderName = platElders.stream().map(PlatElder::getName).collect(Collectors.joining(","));
alarmRecord.setElderName(elderName);
log.info("开始短信通知--通知老人：{}", elderName); log.info("开始短信通知--通知老人：{}", elderName);
} }
String notifyChannel = alarmConfig.getNotifyChannel(); String notifyChannel = alarmConfig.getNotifyChannel();
...@@ -464,24 +464,24 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe ...@@ -464,24 +464,24 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
msgSendDTO.setEmailSet(emailSet); msgSendDTO.setEmailSet(emailSet);
msgSendDTO.setOriContent(alarmRecord.getContent()); msgSendDTO.setOriContent(alarmRecord.getContent());
msgSendDTO.setSubject(alarmRecord.getContent()); msgSendDTO.setSubject(alarmRecord.getContent());
msgSendDTO.setParam(alarmRecord.getElderName()); msgSendDTO.setParam(elderName);
msgSendDTO.setReceiverInfos(receiverInfos); msgSendDTO.setReceiverInfos(receiverInfos);
String alarmType = alarmConfig.getAlarmType(); String alarmType = alarmConfig.getAlarmType();
//告警类型 数据字典 1 长者跌倒 2 呼吸异常 3 心率异常 4 行为异常 5 离床异常 //告警类型 数据字典 1 长者跌倒 2 呼吸异常 3 心率异常 4 行为异常 5 离床异常
if (StringUtils.equals(alarmType, "1")) { if (StringUtils.equals(alarmType, "1")) {
msgSendDTO.setParam(alarmRecord.getElderName(),alarmRecord.getRegionName()); msgSendDTO.setParam(elderName,alarmRecord.getRegionName());
} }
if (StringUtils.equals(alarmType, "2")) { if (StringUtils.equals(alarmType, "2")) {
msgSendDTO.setParam(alarmRecord.getElderName(),alarmRecord.getRemark()); msgSendDTO.setParam(elderName,alarmRecord.getRemark());
} }
if (StringUtils.equals(alarmType, "3")) { if (StringUtils.equals(alarmType, "3")) {
msgSendDTO.setParam(alarmRecord.getElderName(),alarmRecord.getRemark()); msgSendDTO.setParam(elderName,alarmRecord.getRemark());
} }
if (StringUtils.equals(alarmType, "4")) { if (StringUtils.equals(alarmType, "4")) {
msgSendDTO.setParam(alarmRecord.getElderName(),alarmRecord.getRegionName()); msgSendDTO.setParam(elderName,alarmRecord.getRegionName());
} }
if (StringUtils.equals(alarmType, "5")) { if (StringUtils.equals(alarmType, "5")) {
msgSendDTO.setParam(alarmRecord.getElderName(), ""); msgSendDTO.setParam(elderName, "");
} }
msgSendDTO.setAlarmType(alarmConfig.getAlarmType()); msgSendDTO.setAlarmType(alarmConfig.getAlarmType());
//todo 小程序消息 //todo 小程序消息
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment