Browse Source

定时任务,启动bug

CX 2 years ago
parent
commit
d063aed646

+ 1 - 4
src/main/java/com/zhaxd/common/init/QuartzInit.java

@@ -14,10 +14,7 @@ public class QuartzInit {
14 14
 
15 15
         System.out.println("****** 启动转换任务调度 ******");
16 16
         //用户id 1
17
-        //先停用所有,在启动所有。反正服务停了,其实都是停用状态
18
-        transService.stopAll(null, null, 1);
19
-        System.out.println("****** 转换任务调度全部停用完成 ******");
20
-        transService.startAll(null, null, 1);
17
+        transService.reStartActiveAll(null, null, 1);
21 18
         System.out.println("****** 转换任务调度全部启动完成 ******");
22 19
     }
23 20
 

+ 21 - 0
src/main/java/com/zhaxd/web/service/TransService.java

@@ -436,6 +436,27 @@ public class TransService {
436 436
         kTransMonitorDao.updateTemplateById(templateOne);
437 437
     }
438 438
 
439
+    /**
440
+     * 重新启动所有,运行中调度任务
441
+     */
442
+    public void reStartActiveAll(Integer CategoryId, String transName, Integer uId) {
443
+        //在启动所有未删除的服务
444
+        KTrans template = new KTrans();
445
+        template.setAddUser(uId);
446
+        template.setDelFlag(1);
447
+        template.setTransStatus(1);
448
+        if (CategoryId != null) {
449
+            template.setCategoryId(CategoryId);
450
+        }
451
+        if (StringUtils.isNotEmpty(transName)) {
452
+            template.setTransName(transName);
453
+        }
454
+        List<KTrans> jobList = kTransDao.queryByCondition(template);
455
+        for (KTrans KTrans : jobList) {
456
+            start(KTrans.getTransId());
457
+        }
458
+    }
459
+
439 460
     public void startAll(Integer CategoryId, String transName, Integer uId) {
440 461
         KTrans template = new KTrans();
441 462
         template.setAddUser(uId);

+ 9 - 10
src/main/resources/resource/db-DEV.properties

@@ -1,15 +1,14 @@
1 1
 #\u672C\u5730\u6570\u636E\u6E90\u914D\u7F6E(MySql)
2
+#datasource.type=mysql
3
+#beetl.db.style=org.beetl.sql.core.db.MySqlStyle
4
+#jdbc.driver=com.mysql.jdbc.Driver
5
+#jdbc.url=jdbc:mysql://192.168.3.110:3306/kettle-bug?autoReconnect=true&serverTimezone=UTC&characterEncoding=utf8&useUnicode=true&useSSL=false
6
+#jdbc.username=root
7
+#jdbc.password=100100
8
+
2 9
 datasource.type=mysql
3 10
 beetl.db.style=org.beetl.sql.core.db.MySqlStyle
4 11
 jdbc.driver=com.mysql.jdbc.Driver
5
-jdbc.url=jdbc:mysql://192.168.3.110:3306/kettle-bug?autoReconnect=true&serverTimezone=UTC&characterEncoding=utf8&useUnicode=true&useSSL=false
12
+jdbc.url=jdbc:mysql://172.16.7.92:3306/kettle?autoReconnect=true&serverTimezone=UTC&characterEncoding=utf8&useUnicode=true&useSSL=false
6 13
 jdbc.username=root
7
-jdbc.password=100100
8
-
9
-#\u672C\u5730\u6570\u636E\u6E90\u914D\u7F6E(Oracle)
10
-#datasource.type=oracle
11
-#beetl.db.style=org.beetl.sql.core.db.OracleStyle
12
-#jdbc.driver=oracle.jdbc.OracleDriver
13
-#jdbc.url=jdbc:oracle:thin:@10.10.10.62:1521:zhcs
14
-#jdbc.username=testuser
15
-#jdbc.password=123456
14
+jdbc.password=DStech@123

+ 2 - 10
src/main/resources/resource/db-PROD.properties

@@ -2,14 +2,6 @@
2 2
 datasource.type=mysql
3 3
 beetl.db.style=org.beetl.sql.core.db.MySqlStyle
4 4
 jdbc.driver=com.mysql.jdbc.Driver
5
-jdbc.url=jdbc:mysql://192.168.3.109:3306/kettle?autoReconnect=true&serverTimezone=UTC&characterEncoding=utf8&useUnicode=true&useSSL=false
5
+jdbc.url=jdbc:mysql://172.16.7.92:3306/kettle?autoReconnect=true&serverTimezone=UTC&characterEncoding=utf8&useUnicode=true&useSSL=false
6 6
 jdbc.username=root
7
-jdbc.password=100100
8
-
9
-#\u672C\u5730\u6570\u636E\u6E90\u914D\u7F6E(Oracle)
10
-#datasource.type=oracle
11
-#beetl.db.style=org.beetl.sql.core.db.OracleStyle
12
-#jdbc.driver=oracle.jdbc.OracleDriver
13
-#jdbc.url=jdbc:oracle:thin:@10.10.10.62:1521:zhcs
14
-#jdbc.username=testuser
15
-#jdbc.password=123456
7
+jdbc.password=DStech@123