|
|
@@ -700,7 +700,7 @@ public class MqttSubHandle {
|
|
|
if (TopicConstants.TOPIC_LAS_ALARM_EVENT.equals(topic)) {
|
|
|
JSONObject obj = JSONObject.parseObject(payload);
|
|
|
String eventType = obj.getString("event_type");
|
|
|
-
|
|
|
+ String msg = obj.getString("msg");
|
|
|
// 1.1 判断 消息类型是否符合 起夜异常 or 异常滞留
|
|
|
if (AlarmEventType.isTargetEvent(eventType)) {
|
|
|
String clientId = obj.getString("dev_id");
|
|
|
@@ -748,7 +748,7 @@ public class MqttSubHandle {
|
|
|
log.info("发送微信公众号信息:devName=" + devName + ", phoneNo=" + user.getPhone() + "fwhOpenId=" + fwhOpenId);
|
|
|
|
|
|
// 1.7 发送微信公告号消息
|
|
|
- wxOfficeAccountClient.sendMsg(devId, devName, user.getPhone(), fwhOpenId, "设备检测到事件,请前往小程序查看详细信息");
|
|
|
+ wxOfficeAccountClient.sendMsg(devId, devName, user.getPhone(), fwhOpenId, msg);
|
|
|
log.info("发送微信公众号消息发完了");
|
|
|
return;
|
|
|
}
|
|
|
@@ -786,7 +786,7 @@ public class MqttSubHandle {
|
|
|
log.info("发送微信公众号信息:devName=" + devName.toString() + ", phoneNo=" + user.getPhone() + "fwhOpenId=" + fwhOpenId);
|
|
|
// 发送微信公告号消息
|
|
|
if (StringUtils.contains(devName.toString(), "卫生间")) {
|
|
|
- wxOfficeAccountClient.sendMsg(devId, devName.toString(), user.getPhone(), fwhOpenId, "设备检测到异常滞留,请前往小程序查看详细信息");
|
|
|
+ wxOfficeAccountClient.sendMsg(devId, devName.toString(), user.getPhone(), fwhOpenId, "设备检测到,请前往小程序查看详细信息");
|
|
|
log.info("发送微信公众号消息发完了");
|
|
|
}
|
|
|
}
|