Bladeren bron

项目初始化

oyq28 1 jaar geleden
bovenliggende
commit
7a6751b7c0

+ 5 - 5
src/main/java/com/imcs/admin/common/collection/DeviceCollectionTaskJob.java

@@ -57,7 +57,7 @@ public class DeviceCollectionTaskJob {
      * 设备采集任务FANUC
      * FANUC
      */
-   @Scheduled(cron = "0/10 * * * * *")
+   //@Scheduled(cron = "0/10 * * * * *")
     void deviceCollectionTaskFanuc() throws Exception {
        try{
            Object fanucObj = this.redisGet("FANUC_COLLECTION");
@@ -73,7 +73,7 @@ public class DeviceCollectionTaskJob {
      * 设备采集任务Opcua
      * 西门子
      */
-    //@Scheduled(cron = "0/10 * * * * *")
+    ////@Scheduled(cron = "0/10 * * * * *")
     void deviceCollectionTaskOpcua() throws Exception {
         try{
             Object opcuaObj = this.redisGet("OPCUA_COLLECTION");
@@ -89,7 +89,7 @@ public class DeviceCollectionTaskJob {
      * 设备采集任务Heidenhain
      * 海德汉
      */
-    //@Scheduled(cron = "0/10 * * * * *")
+    ////@Scheduled(cron = "0/10 * * * * *")
     void deviceCollectionTaskHeidenhain() throws Exception {
         try{
             Object heidenhainObj = this.redisGet("HEIDENHAIN_COLLECTION");
@@ -105,7 +105,7 @@ public class DeviceCollectionTaskJob {
      * 设备采集任务Mitsubishi
      * 三菱
      */
-    //@Scheduled(cron = "0/10 * * * * *")
+    ////@Scheduled(cron = "0/10 * * * * *")
     void deviceCollectionTaskMitsubishi() throws Exception {
         try{
             Object mitsubishiObj = this.redisGet("MITSUBISHI_COLLECTION");
@@ -121,7 +121,7 @@ public class DeviceCollectionTaskJob {
      * 设备采集任务MtConnect
      * 赫克
      */
-    /*//@Scheduled(cron = "0/10 * * * * *")
+    /*////@Scheduled(cron = "0/10 * * * * *")
     void deviceCollectionTaskMtConnect() throws Exception {
         try{
             Object mtConnectObj = this.redisGet("MTCONNECT_COLLECTION");

+ 1 - 1
src/main/resources/application-dev.properties

@@ -1,4 +1,4 @@
-spring.datasource.url=jdbc:mysql://localhost:3306/imcs_platform?serverTimezone=GMT%2B8&useSSL=false
+spring.datasource.url=jdbc:mysql://localhost:3306/zh_wms_platform?serverTimezone=GMT%2B8&useSSL=false
 spring.datasource.username=root
 spring.datasource.password=123456
 #spring.datasource.driver-class-name=com.mysql.jdbc.Driver