|
@@ -188,7 +188,7 @@ public class DeviceMqttConsumerImpl implements DeviceMqttConsumer {
|
|
Map<String, Object> params = MapUtil.newHashMap();
|
|
Map<String, Object> params = MapUtil.newHashMap();
|
|
if (MercAuthUtils.sendMsgToCM(mercCode)) {
|
|
if (MercAuthUtils.sendMsgToCM(mercCode)) {
|
|
//设备编号:{{character_string2.DATA}} 故障类型:{{thing6.DATA}} 报障时间:{{time8.DATA}}
|
|
//设备编号:{{character_string2.DATA}} 故障类型:{{thing6.DATA}} 报障时间:{{time8.DATA}}
|
|
- params.put("character_string2", deviceName);
|
|
|
|
|
|
+ params.put("character_string2", deviceId);
|
|
params.put("thing6", msg);
|
|
params.put("thing6", msg);
|
|
params.put("time8", DateUtil.format(createTime, DatePattern.NORM_DATETIME_PATTERN));
|
|
params.put("time8", DateUtil.format(createTime, DatePattern.NORM_DATETIME_PATTERN));
|
|
} else {
|
|
} else {
|