创米-微信公众号推送

device-api-service/src/main/java/com/xy/service/DeviceMqttConsumerImpl.java

@@ -186,9 +186,17 @@ public class DeviceMqttConsumerImpl implements DeviceMqttConsumer {
                             }
                         }
                         Map<String, Object> params = MapUtil.newHashMap();
-                        params.put("keyword1", deviceName);
-                        params.put("keyword2", msg);
-                        params.put("keyword3", DateUtil.format(createTime, DatePattern.NORM_DATETIME_PATTERN));
+                        if (MercAuthUtils.sendMsgToCM(mercCode)) {
+                            //设备编号:{{character_string2.DATA}} 故障类型:{{thing6.DATA}} 报障时间:{{time8.DATA}}
+                            params.put("keyword1", deviceName);
+                            params.put("keyword2", msg);
+                            params.put("keyword3", DateUtil.format(createTime, DatePattern.NORM_DATETIME_PATTERN));
+                        } else {
+                            params.put("keyword1", deviceName);
+                            params.put("keyword2", msg);
+                            params.put("keyword3", DateUtil.format(createTime, DatePattern.NORM_DATETIME_PATTERN));
+
+                        }
 
                         //商户管理员发
                         b.setReceivers(mpOpenIds);