|
@@ -18,7 +18,7 @@ public class MessageUtils {
|
|
|
data.put("devtype", "led");
|
|
data.put("devtype", "led");
|
|
|
data.put("devcode", devicecode);
|
|
data.put("devcode", devicecode);
|
|
|
final CamelDataUtil camelDataUtil = SpringUtil.getBean("camelDataUtil");
|
|
final CamelDataUtil camelDataUtil = SpringUtil.getBean("camelDataUtil");
|
|
|
- camelDataUtil.SendData("direct:sendMessage", StringUtils.format("{\"val\":\"{}\"}", message).getBytes("GBK"), "mqheader", data);
|
|
|
|
|
|
|
+ camelDataUtil.SendData("direct:sendMessage", StringUtils.format("{\"val\":\"{}\",\"id\":\"{}\"}", message,devicecode), "mqheader", data);
|
|
|
}else {
|
|
}else {
|
|
|
log.error("------------------");
|
|
log.error("------------------");
|
|
|
log.error("devicecode:"+devicecode.toString()+" message:"+message.toString());
|
|
log.error("devicecode:"+devicecode.toString()+" message:"+message.toString());
|
|
@@ -32,7 +32,7 @@ public class MessageUtils {
|
|
|
data.put("devtype", "tts");
|
|
data.put("devtype", "tts");
|
|
|
data.put("devcode", devicecode);
|
|
data.put("devcode", devicecode);
|
|
|
final CamelDataUtil camelDataUtil = SpringUtil.getBean("camelDataUtil");
|
|
final CamelDataUtil camelDataUtil = SpringUtil.getBean("camelDataUtil");
|
|
|
- camelDataUtil.SendData("direct:sendMessage", StringUtils.format("{\"val\":\"{}\",\"vol\":7}", message), "mqheader", data);
|
|
|
|
|
|
|
+ camelDataUtil.SendData("direct:sendMessage", StringUtils.format("{\"val\":\"{}\",\"vol\":7,\"id\":\"{}\"}", message,devicecode), "mqheader", data);
|
|
|
}else{
|
|
}else{
|
|
|
log.error("------------------");
|
|
log.error("------------------");
|
|
|
log.error("devicecode:"+devicecode.toString()+" message:"+message.toString());
|
|
log.error("devicecode:"+devicecode.toString()+" message:"+message.toString());
|