fix:完善

pom.xml

@@ -30,6 +30,12 @@
     </properties>
 
     <dependencies>
+        <!-- scada-->
+        <dependency>
+            <groupId>net.vtstar.scada</groupId>
+            <artifactId>scada-service-starter</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+        </dependency>
         <!-- base -->
         <dependency>
             <groupId>net.vtstar</groupId>

src/main/java/net/vtstar/zhongtong/avi/global/config/CacheConfig.java

 package net.vtstar.zhongtong.avi.global.config;
 
-import org.springframework.cache.Cache;
-import org.springframework.cache.CacheManager;
 import org.springframework.cache.annotation.EnableCaching;
-import org.springframework.cache.concurrent.ConcurrentMapCacheManager;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
 @EnableCaching
 public class CacheConfig {
-
-    @Bean
-    CacheManager cacheManager() {
-        ConcurrentMapCacheManager cacheManager = new ConcurrentMapCacheManager();
-        return cacheManager;
-    }
-
-    @Bean
-    public Cache ovenTemperatureCache(CacheManager cacheManager) {
-        return cacheManager.getCache("ovenTemperatureCache");
-    }
-
 }

src/main/resources/config/application-dev.properties

-spring.profiles.include=datasource,mybatis,quartz,swagger,security
+spring.profiles.include=datasource,mybatis,quartz,swagger,security,mqtt
 
 
 

src/main/resources/config/application-mail.properties

+# mail
+spring.mail.host=smtp.126.com
+spring.mail.port=465
+spring.mail.protocol=smtps
+spring.mail.default-encoding=UTF-8
+spring.mail.test-connection=false
+spring.mail.username=huaying_scada@126.com
+spring.mail.password=HuaYingScada2018
+spring.mail.properties.mail.smtp.auth=true
+spring.mail.properties.mail.smtp.starttls.enable=true
+spring.mail.properties.mail.smtp.starttls.required=true
+spring.mail.properties.mail.debug=true

src/main/resources/config/application-mqtt.properties

+# Mqtt
+mqtt.server-uri=tcp://10.168.1.72:1883
+mqtt.connection-timeout-second=10
+mqtt.username=huaying
+mqtt.password=huaying-2018
+#\u56FA\u5B9AclientId\uFF0Cclean-session=false\uFF0C\u53EF\u63A5\u6536\u79BB\u7EBF\u6D88\u606F\uFF0C\u96C6\u7FA4\u90E8\u7F72\u65F6clientId\u4E0D\u53EF\u91CD\u590D
+#mqtt.clean-session=false
+#mqtt.subscribe.clientId=VTS-huaying
+mqtt.subscribe.completion-timeout=5000
+mqtt.subscribe.qos=2
+mqtt.subscribe.topic-prefix=iot
+mqtt.subscribe.equipment-name=+
+mqtt.subscribe.equipment-number=+
+mqtt.subscribe.data-topic-key=data
+mqtt.subscribe.data-system-topic-suffix=system
+mqtt.subscribe.data-alarm-topic-suffix=alarm
+mqtt.subscribe.data-all-topic-suffix=all
+mqtt.subscribe.topics=\
+  $local/$queue/${mqtt.subscribe.topic-prefix}/${mqtt.subscribe.equipment-name}/${mqtt.subscribe.equipment-number}/${mqtt.subscribe.data-topic-key}/${mqtt.subscribe.data-all-topic-suffix},\
+  iot/testmachine/+/data/result,\
+  iot/testmachine/+/data/key,\
+  iot/testmachine/+/data/alarm

src/main/resources/config/application-quartz.properties

 # scheduler(Quartz)
 spring.quartz.job-store-type=jdbc
-spring.quartz.jdbc.initialize-schema=never
+spring.quartz.jdbc.initialize-schema=always
 spring.quartz.jdbc.comment-prefix=--
 spring.quartz.startupDelay=10s
-spring.quartz.properties.org.quartz.scheduler.instanceName=myScheduler-mes
+spring.quartz.auto-startup=true
+spring.quartz.properties.org.quartz.scheduler.instanceName=myScheduler-scada
 spring.quartz.properties.org.quartz.scheduler.instanceId=AUTO
 spring.quartz.properties.org.quartz.jobStore.isClustered=true
 spring.quartz.properties.org.quartz.jobStore.clusterCheckinInterval=10000

src/main/resources/config/application.properties

@@ -5,6 +5,8 @@ logging.level.root=info
 logging.level.net.vtstar=trace
 spring.aop.auto=true
 
+spring.main.allow-bean-definition-overriding=true
+
 # server
 server.port=8080
 spring.servlet.multipart.max-file-size=1000MB
@@ -18,3 +20,18 @@ spring.messages.basename=net.vtstar.user.i18n.messages,org.springframework.secur
 spring.messages.always-use-message-format=true
 spring.messages.use-code-as-default-message=true
 
+# JOB
+gatherTestDataJob=true
+
+# \u97E9\u56FD\u6D4B\u8BD5\u673A\u8F6F\u91C7\u670D\u52A1\u5668
+soft.gather.korea-tester.ip=172.16.0.253
+soft.gather.korea-tester.port=10001
+
+# \u690D\u7403\u673A\u8F6F\u91C7\u670D\u52A1\u5668
+soft.gather.ball-mounter-program.ip=10.168.1.73
+soft.gather.ball-mounter-program.port=10000
+
+# \u76D1\u542C\u690D\u7403\u673A\u7A0B\u5E8F\u7AEF\u53E3
+soft.gather.ball-mounter-listen-port=9300
+
+# \u690D\u740310000 \u6D4B\u8BD510001 \u6D82\u80F6 10002\u70B9\u710A10003