wenhongquan 1 год назад
Родитель
Сommit
d89915a02f

+ 2 - 2
ruoyi-admin/src/main/resources/router/t.xml

@@ -8,7 +8,7 @@
     <!--同步服务配置-->
 
     <route>
-        <from uri="paho:/dev/gps/#?brokerUrl=tcp://xt.wenhq.top:8581&amp;userName=iot2yun&amp;password=123456&amp;clientId=khy_redclient"></from>
+        <from uri="paho:/dev/gps/#?brokerUrl=tcp://xt.wenhq.top:8581&amp;userName=iot2yun&amp;password=123456&amp;clientId=khy1_redclient"></from>
         <to uri="bean:org.dromara.util.CamelDataUtil?method=ReciveData(${body})"></to>
     </route>
 
@@ -22,7 +22,7 @@
     <route>
         <from uri="direct:sendMessage"/>
         <to uri="bean:org.dromara.util.CamelDataUtil?method=processdata(${body})"></to>
-        <to uri="paho:/dev/?brokerUrl=tcp://xt.wenhq.top:8581&amp;userName=iot2yun&amp;password=123456&amp;clientId=khy_writeclient"/>
+        <to uri="paho:/dev/?brokerUrl=tcp://xt.wenhq.top:8581&amp;userName=iot2yun&amp;password=123456&amp;clientId=khy1_writeclient"/>
     </route>
 
 

+ 6 - 0
ruoyi-modules/ruoyi-khy/src/main/java/org/dromara/system/service/impl/TblCarScheduleServiceImpl.java

@@ -84,6 +84,12 @@ public class TblCarScheduleServiceImpl implements ITblCarScheduleService {
                 try{
                     String start= bo.getParams().get("scheduleDate").toString();
                     String end= bo.getParams().get("scheduleDate").toString();
+                    if(bo.getParams().get("scheduleDate").toString().contains(" ")){
+
+                    }else{
+                        start+=" 00:00:00";
+                        end+=" 23:59:59";
+                    }
                     lqw.gt(bo.getParams().get("scheduleDate")!=null, TblCarSchedule::getScheduleDate, start);
                     lqw.lt(bo.getParams().get("scheduleDate")!=null, TblCarSchedule::getScheduleDate, end);
 

+ 4 - 0
ruoyi-modules/ruoyi-khy/src/main/java/org/dromara/util/CabinetUtil.java

@@ -58,6 +58,10 @@ public class CabinetUtil {
         return key;
     }
 
+//    private static String getQJM(String phone) throws Exception {
+//        String text = SpringUtils.getBean(ISysConfigService.class).selectConfigByKey("sys.cabinet.account");
+//
+//    }
 
     // 获取柜子信息
     public static  String getCabinetInfo(String cabinetCode) throws Exception {