`设备数据发送`

ruoyi-admin/src/main/java/org/dromara/DromaraApplication.java

@@ -3,6 +3,7 @@ package org.dromara;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.metrics.buffering.BufferingApplicationStartup;
+import org.springframework.context.annotation.ComponentScan;
 
 /**
  * 启动程序
@@ -10,6 +11,7 @@ import org.springframework.boot.context.metrics.buffering.BufferingApplicationSt
  * @author Lion Li
  */
 
+//@ComponentScan(basePackages={"cn.hutool.extra.spring"})
 @SpringBootApplication
 public class DromaraApplication {
 

ruoyi-modules/ruoyi-khy/src/main/java/org/dromara/system/service/impl/TblCarInfoServiceImpl.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import org.dromara.util.CamelDataUtil;
+import org.dromara.util.MessageUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.dromara.system.domain.bo.TblCarInfoBo;
@@ -35,20 +36,14 @@ public class TblCarInfoServiceImpl implements ITblCarInfoService {
     private final TblCarInfoMapper baseMapper;
 
 
-    @Autowired
-    public CamelDataUtil camelDataUtil;
-
     /**
      * 查询车辆信息
      */
     @Override
     public TblCarInfoVo queryById(Long id){
+        MessageUtils.sendLed("0001", "hello");
 
-        Map<String,String> data = new HashMap<>();
-        data.put("devtype","led");
-        data.put("devcode","0001");
-        camelDataUtil.SendData("direct:sendMessage", "{\"val\":\"hello\"}", "mqheader", data);
-
+        MessageUtils.sendTTs("0001", "hello");
         return baseMapper.selectVoById(id);
     }
 

ruoyi-modules/ruoyi-khy/src/main/java/org/dromara/system/service/impl/TblCarPathServiceImpl.java

@@ -63,7 +63,6 @@ public class TblCarPathServiceImpl implements ITblCarPathService {
         LambdaQueryWrapper<TblCarPath> lqw = Wrappers.lambdaQuery();
         lqw.like(StringUtils.isNotBlank(bo.getName()), TblCarPath::getName, bo.getName());
         lqw.eq(StringUtils.isNotBlank(bo.getStationList()), TblCarPath::getStationList, bo.getStationList());
-        lqw.eq(bo.getCarId() != null, TblCarPath::getCarId, bo.getCarId());
         lqw.eq(bo.getDriverInfo() != null, TblCarPath::getDriverInfo, bo.getDriverInfo());
         lqw.eq(bo.getAttendantInfo() != null, TblCarPath::getAttendantInfo, bo.getAttendantInfo());
         lqw.eq(StringUtils.isNotBlank(bo.getExt1()), TblCarPath::getExt1, bo.getExt1());

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

@@ -27,7 +27,7 @@ import java.util.List;
 import java.util.Map;
 
 @Slf4j
-@Component
+@Component("camelDataUtil")
 public class CamelDataUtil {
     @Autowired
     private CamelContext camelContext;

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

@@ -0,0 +1,28 @@
+package org.dromara.util;
+
+import cn.hutool.extra.spring.SpringUtil;
+import org.dromara.common.core.utils.StringUtils;
+import org.springframework.context.annotation.Import;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Import(cn.hutool.extra.spring.SpringUtil.class)
+public class MessageUtils {
+    public static void sendLed(String devicecode,String message){
+
+        Map<String,String> data = new HashMap<>();
+        data.put("devtype","led");
+        data.put("devcode",devicecode);
+        final  CamelDataUtil camelDataUtil = SpringUtil.getBean("camelDataUtil");
+        camelDataUtil.SendData("direct:sendMessage", StringUtils.format("{\"val\":\"{}\"}",message), "mqheader", data);
+    }
+    public static void sendTTs(String devicecode,String message){
+
+        Map<String,String> data = new HashMap<>();
+        data.put("devtype","tts");
+        data.put("devcode",devicecode);
+        final  CamelDataUtil camelDataUtil = SpringUtil.getBean("camelDataUtil");
+        camelDataUtil.SendData("direct:sendMessage", StringUtils.format("{\"val\":\"{}\"}",message), "mqheader", data);
+    }
+}