|
@@ -186,7 +186,7 @@ public class MqttCallbackHandler extends AbstractHandler {
|
|
|
templateParam.put("level", level.toString());
|
|
templateParam.put("level", level.toString());
|
|
|
templateParam.put("name", device.getName());
|
|
templateParam.put("name", device.getName());
|
|
|
// templateParam.put("value", itemValue);
|
|
// templateParam.put("value", itemValue);
|
|
|
- templateParam.put("value", offset);
|
|
|
|
|
|
|
+ templateParam.put("value", offset+url);
|
|
|
commonService.pushSmsMessage(pushToPhone
|
|
commonService.pushSmsMessage(pushToPhone
|
|
|
, smsTemplateConfig.getDataAlarm().getSmsCode()
|
|
, smsTemplateConfig.getDataAlarm().getSmsCode()
|
|
|
, smsTemplateConfig.getDataAlarm().getSignName()
|
|
, smsTemplateConfig.getDataAlarm().getSignName()
|
|
@@ -216,7 +216,7 @@ public class MqttCallbackHandler extends AbstractHandler {
|
|
|
templateParam.put("time", time);
|
|
templateParam.put("time", time);
|
|
|
templateParam.put("project", vo == null ? null : vo.getProjectName());
|
|
templateParam.put("project", vo == null ? null : vo.getProjectName());
|
|
|
// templateParam.put("value", itemValue);
|
|
// templateParam.put("value", itemValue);
|
|
|
- templateParam.put("value", offset);
|
|
|
|
|
|
|
+ templateParam.put("value", offset+url);
|
|
|
commonService.pushEmailMessage(emailAddress
|
|
commonService.pushEmailMessage(emailAddress
|
|
|
, templateParam);
|
|
, templateParam);
|
|
|
}
|
|
}
|
|
@@ -317,7 +317,7 @@ public class MqttCallbackHandler extends AbstractHandler {
|
|
|
templateParam.put("level", level.toString());
|
|
templateParam.put("level", level.toString());
|
|
|
templateParam.put("name", device.getName());
|
|
templateParam.put("name", device.getName());
|
|
|
// templateParam.put("value", itemValueAndUnit);
|
|
// templateParam.put("value", itemValueAndUnit);
|
|
|
- templateParam.put("value", String.valueOf(offset));
|
|
|
|
|
|
|
+ templateParam.put("value", String.valueOf(offset)+url);
|
|
|
commonService.pushSmsMessage(pushToPhone
|
|
commonService.pushSmsMessage(pushToPhone
|
|
|
, smsTemplateConfig.getDataAlarm().getSmsCode()
|
|
, smsTemplateConfig.getDataAlarm().getSmsCode()
|
|
|
, smsTemplateConfig.getDataAlarm().getSignName()
|
|
, smsTemplateConfig.getDataAlarm().getSignName()
|
|
@@ -347,7 +347,7 @@ public class MqttCallbackHandler extends AbstractHandler {
|
|
|
templateParam.put("time", time);
|
|
templateParam.put("time", time);
|
|
|
templateParam.put("project", vo == null ? null : vo.getProjectName());
|
|
templateParam.put("project", vo == null ? null : vo.getProjectName());
|
|
|
// templateParam.put("value", itemValueAndUnit);
|
|
// templateParam.put("value", itemValueAndUnit);
|
|
|
- templateParam.put("value", String.valueOf(offset));
|
|
|
|
|
|
|
+ templateParam.put("value", String.valueOf(offset)+url);
|
|
|
commonService.pushEmailMessage(emailAddress
|
|
commonService.pushEmailMessage(emailAddress
|
|
|
, templateParam);
|
|
, templateParam);
|
|
|
}
|
|
}
|