告警通知消息记录异常修复

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/impl/BaseAlarmNoticeResultServiceImpl.java

@@ -93,24 +93,26 @@ public class BaseAlarmNoticeResultServiceImpl extends AbstractCrudService<BaseAl
 
                 if (records3.get(0).getNoticeMethod().contains("电话")) {
                     handleVoiceNotice(sysUser, baseAlarmNoticeResult, records.get(0), baseAlarmType, baseAlarm);
+                    saveAlarmResult = baseMapper.insert(baseAlarmNoticeResult);
                 }
 
                 if (records3.get(0).getNoticeMethod().contains("短信")) {
                     handleSmsNotice(sysUser, baseAlarmNoticeResult, templateParam);
+                    saveAlarmResult = baseMapper.insert(baseAlarmNoticeResult);
                 }
 
                 if (records3.get(0).getNoticeMethod().contains("APP")) {
                     handleMceNotice(sysUser, baseAlarmNoticeResult, baseAlarm, baseAlarmType, records2.get(0), "1");
+                    saveAlarmResult = baseMapper.insert(baseAlarmNoticeResult);
                 }
 
                 if (records3.get(0).getNoticeMethod().contains("微信")) {
                     handleMceNotice(sysUser, baseAlarmNoticeResult, baseAlarm, baseAlarmType, records2.get(0), "2");
+                    saveAlarmResult = baseMapper.insert(baseAlarmNoticeResult);
                 }
-
-                saveAlarmResult = baseMapper.insert(baseAlarmNoticeResult);
             }
         } catch (Exception e) {
-            log.error("Error in sending alarm notice", e);
+            log.error("发送报警通知时异常", e);
         }
         return saveAlarmResult;
     }
@@ -149,7 +151,6 @@ public class BaseAlarmNoticeResultServiceImpl extends AbstractCrudService<BaseAl
             baseAlarmNoticeResult.setNoticeResult(response.getCode() != null && "OK".equals(response.getCode()) ? 1 : 2);
         } catch (Exception e) {
             log.error("用户：{}，告警消息电话拨打失败", sysUser.getUserId(), e);
-            baseAlarmNoticeResult.setNoticeResult(2);
         }
     }
 
@@ -198,12 +199,15 @@ public class BaseAlarmNoticeResultServiceImpl extends AbstractCrudService<BaseAl
         mceRequestVO.setInfoType(INFO_TYPE);
         mceRequestVO.setInfoTitle(INFO_TITLE);
         mceRequestVO.setDeviceId(device.getDeviceId());
+        log.info("设备ID：{}", device.getDeviceId());
         mceRequestVO.setInfoContent(baseAlarmType.getTypeName());
         mceRequestVO.setAlarmTime(formatAlarmTime(baseAlarm.getAlarmTime()));
+        log.info("告警时间：{}", baseAlarm.getAlarmTime());
         mceRequestVO.setAlarmSendType(sendType);
         mceRequestVO.setRemark(String.format(REMARK_TEMPLATE, device.getDeviceName()));
         mceRequestVO.setUserIds(Collections.singletonList(sysUser.getUserId()));
         mceRequestVO.setUserName(sysUser.getUserName());
+        mceRequestVO.setId(baseAlarm.getId());
         return mceRequestVO;
     }
 

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/impl/BaseAlarmServiceImpl.java

@@ -115,6 +115,7 @@ public class BaseAlarmServiceImpl extends AbstractCrudService<BaseAlarmMapper, B
                     List<BaseAlarmNotice> records3 = baseAlarmNoticeService.list(lambdaQuery3);
                     if (records3.size()>0){
                         Integer saveAlarmResult = baseAlarmNoticeResultService.send(baseAlarm,records3,alarmId,records,baseAlarmType,records2);
+                        log.info("异步发送告警通知数据: {}", baseAlarm);
                     }
                     return saveResult;
                 }