commit

DataFusion/res/config.properties

@@ -3,6 +3,13 @@ jdbcUrl_connected  = jdbc:sqlserver://188.188.2.1:1433;DatabaseName=PACS
 #jdbcUrl_connected  = jdbc:oracle:thin:@192.168.100.4:1521:pacs
 user_connected 	   = sa
 password_connected = YZPACS
+
+#DB-connected partners
+jdbcUrl_local  = jdbc:mysql://127.0.0.1:3306/pacsonline?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&serverTimezone=Asia/Shanghai
+#jdbcUrl_connected  = jdbc:oracle:thin:@192.168.100.4:1521:pacs
+user_local	   = zskk
+password_local = Zskk_2024
+
 #DATA-Parms
 institution_id     = 73000005
 #OSS

DataFusion/src/com/zskk/config/ZskkConfig.java

@@ -19,6 +19,7 @@ import com.zskk.control.ViewController;
 import com.zskk.service.ServiceFactory;
 import com.zskk.task.DataTask;
 import com.zskk.task.ReviewTask;
+import com.zskk.task.USReportTask;
 import com.zskk.task.UpdateTask;
 
 public class ZskkConfig extends JFinalConfig {
@@ -62,18 +63,30 @@ public class ZskkConfig extends JFinalConfig {
 
 		return new DruidPlugin(PropKit.get("jdbcUrl_connected"), PropKit.get("user_connected"),PropKit.get("password_connected").trim());
 	}
+	
+	public static DruidPlugin createLocalDruidPlugin() {
+
+		return new DruidPlugin(PropKit.get("jdbcUrl_local"), PropKit.get("user_local"),PropKit.get("password_local").trim());
+	}
 
 	@Override
 	public void configPlugin(Plugins me) {
 		// 配置数据库连接池插件
 		DruidPlugin druidPluginConnected = createConnectedDruidPlugin();
 		me.add(druidPluginConnected);
+		
+		DruidPlugin druidPluginLocal = createLocalDruidPlugin();
+		me.add(druidPluginLocal);
 
 		// 配置ActiveRecord插件
 		ActiveRecordPlugin arpConnected = new ActiveRecordPlugin("connected", druidPluginConnected);
 		arpConnected.setDialect(new SqlServerDialect());
 		me.add(arpConnected);
 		
+		ActiveRecordPlugin arpLocal = new ActiveRecordPlugin("local", druidPluginLocal);
+		arpLocal.setDialect(new MysqlDialect());
+		me.add(arpLocal);
+		
 		Cron4jPlugin cpData = new Cron4jPlugin();
 		cpData.addTask("*/5 * * * *", new DataTask());
 		me.add(cpData);
@@ -85,6 +98,10 @@ public class ZskkConfig extends JFinalConfig {
 		Cron4jPlugin reData = new Cron4jPlugin();
 		reData.addTask("*/12 * * * *", new ReviewTask());
 		me.add(reData);
+		
+		Cron4jPlugin usData = new Cron4jPlugin();
+		usData.addTask("*/10 * * * *", new USReportTask());
+		me.add(usData);
 	}
 
 	@Override