修复网卡信息有变动saas平台未及时更新、脚本策略下发未返回结果bug。

优化mtr探测策略

tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/RmAlarmLog.java

@@ -41,4 +41,11 @@ public class RmAlarmLog extends BaseEntity
     /** 告警内容 */
     @Excel(name = "告警内容")
     private String alarmContent;
+    /** 业务名称 */
+    @Excel(name = "业务名称")
+    private String businessName;
+
+    /** 推送标志(0失败,1成功,3未配置消息推送机制) */
+    @Excel(name = "推送标志", readConverterExp = "0=失败,1=成功,3=未配置消息推送机制")
+    private Long pushFlag;
 }

tongran-rocketmq/src/main/java/com/tongran/rocketmq/handler/MessageHandler.java

@@ -1198,6 +1198,10 @@ public class MessageHandler {
                             rmAlarmLog.setMgmPublicIp(networkInterface.getPublicIp());
                         });
             }
+            // 查询业务名称
+            RmResourceRegistrationRemote query = new RmResourceRegistrationRemote();
+            query.setClientId(clientId);
+            R<RmResourceRegistrationRemote> registrationR = remoteRevenueConfigService.getListByHardwareSn(query, SecurityConstants.INNER);
             rmAlarmLog.setClientId(clientId);
             rmAlarmLog.setAlarmType("1");
         }
@@ -1283,7 +1287,7 @@ public class MessageHandler {
                     if(businessScriptMsgR != null && businessScriptMsgR.getData() != null){
                         EpsBusinessScriptRemote businessScriptMsg = businessScriptMsgR.getData();
                         String failedKeywords = businessScriptMsg.getFailedKeywords();
-                        if(resOut.contains(failedKeywords)){
+                        if(failedKeywords != null && resOut.contains(failedKeywords)){
                             insertData.setResultFlag(0);
                         }else {
                             insertData.setResultFlag(1);