wenhongquan 1 rok temu
rodzic
commit
03dbb07d94

+ 1 - 1
ruoyi-modules/ruoyi-khy/src/main/java/org/dromara/util/CamelDataUtil.java

@@ -78,7 +78,7 @@ public class CamelDataUtil {
 
     public void processdata(String body, Exchange exchange) throws UnsupportedEncodingException {
         Map<String,String> o = exchange.getMessage().getHeader("mqheader", Map.class);
-        exchange.getMessage().setHeader("CamelPahoOverrideTopic","/dev/"+o.get("devtype")+"/"+o.get("devcode")+"/");
+        exchange.getMessage().setHeader("CamelPahoOverrideTopic","/dev/"+o.get("devtype")+"/0001/");
         exchange.getMessage().setBody(body.getBytes(Charset.forName("utf8")));
 //        exchange.getMessage().setBody(body);
     }

+ 2 - 2
ruoyi-modules/ruoyi-khy/src/main/java/org/dromara/util/MessageUtils.java

@@ -18,7 +18,7 @@ public class MessageUtils {
             data.put("devtype", "led");
             data.put("devcode", devicecode);
             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 {
             log.error("------------------");
             log.error("devicecode:"+devicecode.toString()+"     message:"+message.toString());
@@ -32,7 +32,7 @@ public class MessageUtils {
             data.put("devtype", "tts");
             data.put("devcode", devicecode);
             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{
             log.error("------------------");
             log.error("devicecode:"+devicecode.toString()+"     message:"+message.toString());