Merge remote-tracking branch 'origin/master' into i_02800001

# Conflicts:
#	DataFusion/res/config.properties
#	DataFusion/src/com/zskk/control/ViewController.java
#	DataFusion/src/com/zskk/task/DataTask.java

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

@@ -65,8 +65,8 @@ public class ZskkConfig extends JFinalConfig {
 		// 配置数据库连接池插件
 		DruidPlugin druidPluginConnected = createConnectedDruidPlugin();
 		me.add(druidPluginConnected);
-//
-//		// 配置ActiveRecord插件
+
+		// 配置ActiveRecord插件
 		ActiveRecordPlugin arpConnected = new ActiveRecordPlugin("connected", druidPluginConnected);
 		arpConnected.setDialect(new SqlServerDialect());
 		me.add(arpConnected);

DataFusion/src/com/zskk/control/ViewController.java

@@ -21,11 +21,11 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.jfinal.core.Controller;
 import com.jfinal.kit.PropKit;
+import com.jfinal.plugin.activerecord.ActiveRecordPlugin;
 import com.jfinal.plugin.activerecord.Db;
 import com.jfinal.plugin.activerecord.Record;
-import com.zskk.service.DataService;
-import com.zskk.service.ServiceFactory;
-import com.zskk.service.ThreadPoolService;
+import com.jfinal.plugin.activerecord.dialect.SqlServerDialect;
+import com.jfinal.plugin.druid.DruidPlugin;
 import okhttp3.FormBody;
 import okhttp3.MediaType;
 import okhttp3.OkHttpClient;
@@ -80,6 +80,26 @@ public class ViewController extends Controller {
 		}
 		}
 
+	public void testConn() {
+		try {
+			DruidPlugin druidPluginConnected = createConnectedDruidPlugin();
+            druidPluginConnected.start();
+			// 配置ActiveRecord插件
+			ActiveRecordPlugin arpConnected = new ActiveRecordPlugin("connected", druidPluginConnected);
+			arpConnected.setDialect(new SqlServerDialect());
+			arpConnected.start();
+
+		} catch (Exception e) {
+			// TODO: handle exception
+			this.renderText(e.toString());
+		}
+	}
+	
+	public static DruidPlugin createConnectedDruidPlugin() {
+
+		return new DruidPlugin(PropKit.get("jdbcUrl_connected"), PropKit.get("user_connected"),PropKit.get("password_connected").trim());
+	}
+	
 	/**
 	 * post请求
 	 * @param url-请求地址

DataFusion/src/com/zskk/task/DataTask.java

@@ -1,5 +1,8 @@
 package com.zskk.task;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 import com.alibaba.fastjson.JSON;
@@ -62,7 +65,10 @@ public class DataTask implements ITask {
 			params.put("phone", record.getStr("phone"));
 			//患者身份证号
 			params.put("card_num", record.getStr("idcard"));
+			//检查结果1阴2阳
 			params.put("report_result", "0");
+			//门诊号住院号
+//			params.put("hopitalized_no", record.getStr("patientNumber"));
 			ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
 			tService.execute(() -> {
 				dService.saveReport(params);
@@ -77,4 +83,28 @@ public class DataTask implements ITask {
 		
 	}
 	
+	/**
+	 * 日期字符串格式转换
+	 * @param dateStr
+	 * @return
+	 */
+	private String parseStringToDate(String dateStr) {
+		if (dateStr == null) {
+			return "";
+		}
+		SimpleDateFormat sdf= new SimpleDateFormat("yyyy.MM.dd HH:mm:ss");
+	    Date date = null;
+	    String timeString = null;
+		try {
+			date = sdf.parse(dateStr);
+			SimpleDateFormat sdf2= new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+			timeString = sdf2.format(date);
+		} catch (ParseException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+        return timeString;
+	}
+
 }