|
@@ -186,9 +186,13 @@ public class DeviceMqttConsumerImpl implements DeviceMqttConsumer {
|
|
|
params.put("thing6", msg);
|
|
|
params.put("time8", 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));
|
|
|
+// params.put("keyword1", deviceName);
|
|
|
+// params.put("keyword2", msg);
|
|
|
+// params.put("keyword3", DateUtil.format(createTime, DatePattern.NORM_DATETIME_PATTERN));
|
|
|
+
|
|
|
+ params.put("character_string2", deviceId);
|
|
|
+ params.put("thing6", msg);
|
|
|
+ params.put("time8", DateUtil.format(createTime, DatePattern.NORM_DATETIME_PATTERN));
|
|
|
|
|
|
}
|
|
|
|
|
@@ -364,9 +368,13 @@ public class DeviceMqttConsumerImpl implements DeviceMqttConsumer {
|
|
|
//扩展参数
|
|
|
MsgConfigTestDto.BizExtraParam bizExtraParam = new MsgConfigTestDto.BizExtraParam();
|
|
|
Map<String, Object> params = MapUtil.newHashMap();
|
|
|
- params.put("keyword1", deviceName);
|
|
|
- params.put("keyword2", msg);
|
|
|
- params.put("keyword3", DateUtil.format(createTime, DatePattern.NORM_DATETIME_PATTERN));
|
|
|
+// params.put("keyword1", deviceName);
|
|
|
+// params.put("keyword2", msg);
|
|
|
+// params.put("keyword3", DateUtil.format(createTime, DatePattern.NORM_DATETIME_PATTERN));
|
|
|
+
|
|
|
+ params.put("character_string2", deviceId);
|
|
|
+ params.put("thing6", msg);
|
|
|
+ params.put("time8", DateUtil.format(createTime, DatePattern.NORM_DATETIME_PATTERN));
|
|
|
|
|
|
//商户管理员发
|
|
|
b.setReceivers(mpIds);
|