Selaa lähdekoodia

根据上下班时间来给盒子发送是否开启/关闭算法

tjf 1 viikko sitten
vanhempi
commit
24133de3d3

+ 4 - 0
ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java

@@ -3,12 +3,16 @@ package com.ruoyi;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 /**
  * 启动程序
  * 
  * @author ruoyi
  */
+@EnableAsync
+@EnableScheduling
 @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
 public class RuoYiApplication
 {

+ 18 - 1
ruoyi-admin/src/main/resources/application-druid.yml

@@ -113,4 +113,21 @@ spring:
                     merge-sql: true
                 wall:
                     config:
-                        multi-statement-allow: true
+                        multi-statement-allow: true
+# MQTT配置
+mqtt:
+    #  server-uri: tcp://13.229.167.76:1883
+    server-uri: tcp://60.171.161.56:20009
+    #  server-uri: tcp://127.0.0.1:1883
+    #  server-uri: tcp://192.168.101.147:1883
+    #  server-uri: tcp://127.0.0.1:1883
+    client-id: JavaClientBoManDev
+    username:
+    password:
+    default-topic: toServer_leaveStat,toServer_playStat,toServer_picPos,toServer_workStat
+    default-qos: 1
+    timeout: 30
+    keep-alive: 60
+    clean-session: true
+    auto-reconnect: true
+    command-timeout: 10

+ 17 - 0
ruoyi-admin/src/main/resources/application-prod.yml

@@ -114,3 +114,20 @@ spring:
                 wall:
                     config:
                         multi-statement-allow: true
+# MQTT配置
+mqtt:
+    #  server-uri: tcp://13.229.167.76:1883
+    server-uri: tcp://60.171.161.56:20009
+    #  server-uri: tcp://127.0.0.1:1883
+    #  server-uri: tcp://192.168.101.147:1883
+    #  server-uri: tcp://127.0.0.1:1883
+    client-id: JavaClientBoMan
+    username:
+    password:
+    default-topic: toServer_leaveStat,toServer_playStat,toServer_picPos,toServer_workStat
+    default-qos: 1
+    timeout: 30
+    keep-alive: 60
+    clean-session: true
+    auto-reconnect: true
+    command-timeout: 10

+ 0 - 18
ruoyi-admin/src/main/resources/application.yml

@@ -73,21 +73,3 @@ xss:
   excludes: /system/notice,/new/news,/new/news/put
   # 匹配链接
   urlPatterns: /system/*,/monitor/*,/tool/*
-
-# MQTT配置
-mqtt:
-#  server-uri: tcp://13.229.167.76:1883
-  server-uri: tcp://60.171.161.56:20009
-#  server-uri: tcp://127.0.0.1:1883
-#  server-uri: tcp://192.168.101.147:1883
-#  server-uri: tcp://127.0.0.1:1883
-  client-id: JavaClientBoMan
-  username:
-  password:
-  default-topic: toServer_leaveStat,toServer_playStat,toServer_picPos,toServer_workStat
-  default-qos: 1
-  timeout: 30
-  keep-alive: 60
-  clean-session: true
-  auto-reconnect: true
-  command-timeout: 10

+ 1 - 0
ruoyi-system/src/main/java/com/ruoyi/system/service/Task.java

@@ -34,6 +34,7 @@ public class Task {
      * 查询是否是节假日
      */
     @Async
+    //@Scheduled(cron = "0 16 18 * * ? ")
     @Scheduled(cron = "0 1 0 * * ? ")
     public void thirdNucleicAcid() {
         String data = DateUtils.getDate();