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

# Conflicts:
#	.gitignore
#	DataFusion/.classpath
#	DataFusion/WebRoot/WEB-INF/classes/.gitignore
#	DataFusion/WebRoot/WEB-INF/classes/com/zskk/model/_DataDictionary.txt
#	DataFusion/WebRoot/WEB-INF/classes/config.properties
#	DataFusion/jfinal_demo.log
#	DataFusion/res/config.properties
#	DataFusion/src/com/zskk/config/ZskkConfig.java
#	DataFusion/src/com/zskk/control/ViewController.java
#	DataFusion/src/com/zskk/model/_DataDictionary.txt
#	DataFusion/src/com/zskk/model/_MappingKit.java
#	DataFusion/src/com/zskk/model/base/BaseStudies.java
#	DataFusion/src/com/zskk/service/ServiceFactory.java
#	DataFusion/src/com/zskk/service/ThreadPoolService.java
#	DataFusion/src/com/zskk/task/DataTask.java
#	DataFusion/src/com/zskk/tools/_JFinalDemoGenerator.java

.gitignore

@@ -7,13 +7,12 @@
 # Package Files #
 *.war
 *.ear
+classes/
+**/build
+/.settings/
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
 
 DataFusion/DataFusion.iml
-DataFusion/.idea/misc.xml
-DataFusion/.idea/workspace.xml
-DataFusion/.idea/encodings.xml
-DataFusion/.idea/modules.xml
-DataFusion/.idea/inspectionProfiles/Project_Default.xml
+**/.idea

DataFusion/.classpath

@@ -2,36 +2,29 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="res"/>
-	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/commons-codec-1.9.jar"/>
-	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/commons-io-2.5.jar"/>
-	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/commons-lang3-3.4.jar"/>
-	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/commons-logging-1.2.jar"/>
-	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/commons-pool2-2.3.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="module" value="true"/>
+			<attribute name="owner.project.facets" value="java"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/annotations-13.0.jar"/>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/cron4j-2.2.5.jar"/>
-	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/druid-1.0.29.jar"/>
-	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/fastjson-1.2.31.jar"/>
-	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/fst-2.29.jar"/>
-	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/httpclient-4.5.2.jar"/>
-	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/httpcore-4.4.4.jar"/>
-	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/httpmime-4.5.2.jar"/>
-	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/jackson-core-2.5.3.jar"/>
-	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/javassist-3.19.0-GA.jar"/>
-	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/jedis-2.7.2.jar"/>
-	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/jetty-server-8.1.8.jar"/>
-	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/jfinal-3.4-bin-with-src.jar"/>
-	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/log4j-1.2.16.jar"/>
-	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/mysql-connector-java-5.1.44-bin.jar"/>
-	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/objenesis-2.1.jar"/>
-	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/ojdbc6.jar"/>
-	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/sqljdbc42.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/druid-1.1.21.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/fastjson-1.2.62.jar"/>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/javax.activation-1.2.0.jar"/>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/jaxb-api-2.3.0.jar"/>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/jaxb-core-2.3.0.jar"/>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/jaxb-impl-2.3.0.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
-		<attributes>
-			<attribute name="owner.project.facets" value="java"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/kotlin-stdlib-1.3.50.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/kotlin-stdlib-common-1.3.50.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/log4j-1.2.17.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/mysql-connector-java-8.0.18.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/ojdbc6.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/okhttp-4.2.2.jar" sourcepath="/Users/liutao/.m2/repository/com/squareup/okhttp3/okhttp/4.2.2/okhttp-4.2.2-sources.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/okio-2.2.2.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/sqljdbc42.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/jetty-server-2019.3.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/jfinal-4.8-bin-with-src.jar"/>
 	<classpathentry kind="output" path="WebRoot/WEB-INF/classes"/>
 </classpath>

DataFusion/.settings/org.eclipse.jdt.core.prefs

@@ -3,6 +3,8 @@ org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
 org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
 org.eclipse.jdt.core.compiler.source=11

DataFusion/WebRoot/WEB-INF/classes/log4j.properties

@@ -1,10 +0,0 @@
-log4j.rootLogger=WARN, stdout, file
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%n%-d{yyyy-MM-dd HH:mm:ss}%n[%p]-[Thread: %t]-[%C.%M()]: %m%n
-
-# Output to the File
-log4j.appender.file=org.apache.log4j.FileAppender
-log4j.appender.file.File=./jfinal_demo.log
-log4j.appender.file.layout=org.apache.log4j.PatternLayout
-log4j.appender.file.layout.ConversionPattern=%n%-d{yyyy-MM-dd HH:mm:ss}%n[%p]-[Thread: %t]-[%C.%M()]: %m%n

DataFusion/res/config.properties

@@ -1,8 +1,6 @@
-#DB-ZhongShiKangKai and connected partners
-jdbcUrl_zskk  = jdbc:mysql://www.pacsonline.cn:3306/pacsonline?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
-user_zskk 	  = pacs
-password_zskk = ZSKK@2017~!@#
-
-jdbcUrl_connected  = jdbc:sqlserver://196.196.100.251:1433;DatabaseName=PACS
-user_connected 	   = sa
-password_connected = dell@2019
+#DB-connected partners
+jdbcUrl_connected  = jdbc:oracle:thin:@192.168.100.4:1521:pacs
+user_connected 	   = jk
+password_connected = jk
+#DATA-Parms
+institution_id     = 47600001

DataFusion/res/log4j.properties

@@ -5,6 +5,6 @@ log4j.appender.stdout.layout.ConversionPattern=%n%-d{yyyy-MM-dd HH:mm:ss}%n[%p]-
 
 # Output to the File
 log4j.appender.file=org.apache.log4j.FileAppender
-log4j.appender.file.File=./jfinal_demo.log
+log4j.appender.file.File=./zskk_df.log
 log4j.appender.file.layout=org.apache.log4j.PatternLayout
 log4j.appender.file.layout.ConversionPattern=%n%-d{yyyy-MM-dd HH:mm:ss}%n[%p]-[Thread: %t]-[%C.%M()]: %m%n

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

@@ -6,16 +6,17 @@ import com.jfinal.config.Interceptors;
 import com.jfinal.config.JFinalConfig;
 import com.jfinal.config.Plugins;
 import com.jfinal.config.Routes;
+import com.jfinal.core.JFinal;
 import com.jfinal.kit.PropKit;
 import com.jfinal.plugin.activerecord.ActiveRecordPlugin;
 import com.jfinal.plugin.activerecord.dialect.MysqlDialect;
+import com.jfinal.plugin.activerecord.dialect.OracleDialect;
 import com.jfinal.plugin.activerecord.dialect.SqlServerDialect;
 import com.jfinal.plugin.cron4j.Cron4jPlugin;
 import com.jfinal.plugin.druid.DruidPlugin;
 import com.jfinal.template.Engine;
-import com.zskk.service.ServiceFactory;
 import com.zskk.control.ViewController;
-import com.zskk.model._MappingKit;
+import com.zskk.service.ServiceFactory;
 import com.zskk.task.DataTask;
 
 public class ZskkConfig extends JFinalConfig {
@@ -26,10 +27,25 @@ public class ZskkConfig extends JFinalConfig {
 		ServiceFactory.init();
 	}
 
-	@Override
+	// 本地开发模式
+	private boolean isLocalDev = false;
+	/**
+	 * 如果生产环境配置文件存在，则优先加载该配置，否则加载开发环境配置文件
+	 * 
+	 * @param pro 生产环境配置文件
+	 * @param dev 开发环境配置文件
+	 */
+	public void loadProp(String pro, String dev) {
+		try {
+			PropKit.use(pro);
+		} catch (Exception e) {
+			PropKit.use(dev);
+			isLocalDev = true;
+		}
+	}
+
 	public void configConstant(Constants me) {
-		// 加载少量必要配置，随后可用PropKit.get(...)获取值
-		PropKit.use("config.properties");
+		loadProp("config.properties", "a_little_config.txt");
 		me.setDevMode(PropKit.getBoolean("devMode", false));
 	}
 
@@ -45,11 +61,6 @@ public class ZskkConfig extends JFinalConfig {
 
 	}
 
-	public static DruidPlugin createZskkDruidPlugin() {
-
-		return new DruidPlugin(PropKit.get("jdbcUrl_zskk"), PropKit.get("user_zskk"),PropKit.get("password_zskk").trim());
-	}
-
 	public static DruidPlugin createConnectedDruidPlugin() {
 
 		return new DruidPlugin(PropKit.get("jdbcUrl_connected"), PropKit.get("user_connected"),PropKit.get("password_connected").trim());
@@ -58,33 +69,18 @@ public class ZskkConfig extends JFinalConfig {
 	@Override
 	public void configPlugin(Plugins me) {
 		// 配置数据库连接池插件
-		DruidPlugin druidPluginZskk = createZskkDruidPlugin();
-		me.add(druidPluginZskk);
-
-		// 配置ActiveRecord插件
-		ActiveRecordPlugin arpZskk = new ActiveRecordPlugin("zskk", druidPluginZskk);
-		arpZskk.setDialect(new MysqlDialect());
-
-		 //所有映射在 MappingKit 中自动化搞定
-		_MappingKit.mapping(arpZskk);
-		me.add(arpZskk);
-
-		// 配置数据库连接池插件
-		DruidPlugin druidPluginConnected = createConnectedDruidPlugin();
-		me.add(druidPluginConnected);
-
-		// 配置ActiveRecord插件
-		ActiveRecordPlugin arpConnected = new ActiveRecordPlugin("connected", druidPluginConnected);
-		arpConnected.setDialect(new SqlServerDialect());
-		me.add(arpConnected);
-
+//		DruidPlugin druidPluginConnected = createConnectedDruidPlugin();
+//		me.add(druidPluginConnected);
+//
+//		// 配置ActiveRecord插件
+//		ActiveRecordPlugin arpConnected = new ActiveRecordPlugin("connected", druidPluginConnected);
+//		arpConnected.setDialect(new OracleDialect());
+//		me.add(arpConnected);
+
+		
 		Cron4jPlugin cpData = new Cron4jPlugin();
 		cpData.addTask("*/5 * * * *", new DataTask());
 		me.add(cpData);
-
-//		Cron4jPlugin cp2 = new Cron4jPlugin();
-//		cp2.addTask("*/3 * * * *", new SyncTask2());
-//	me.add(cp2);
 	}
 
 	@Override
@@ -98,5 +94,16 @@ public class ZskkConfig extends JFinalConfig {
 		// TODO Auto-generated method stub
 
 	}
+	
+	@Override
+	public void onStart() {
+		// TODO Auto-generated method stub
+		super.onStart();
+		ServiceFactory.init();
+	}
+	
+	public static void main(String[] args) {
+		JFinal.start("WebRoot", 10002, "/", 5);
+	}
 
 }

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

@@ -1,11 +1,13 @@
 package com.zskk.control;
 
+import java.io.IOException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
-import java.util.UUID;
+import java.util.Map;
+import com.alibaba.fastjson.JSON;
 import com.jfinal.core.Controller;
 import com.jfinal.kit.PropKit;
 import com.jfinal.plugin.activerecord.ActiveRecordPlugin;
@@ -19,116 +21,68 @@ import com.zskk.model.PatientInfos;
 import com.zskk.model.Report;
 import com.zskk.model.Studies;
 import com.zskk.model._MappingKit;
+import okhttp3.FormBody;
+import okhttp3.MediaType;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import okhttp3.Response;
 
 public class ViewController extends Controller {
 
+	private static final MediaType JSON_CODE = MediaType.get("application/json; charset=utf-8");
+
+	private static final OkHttpClient OKHTTP_CLIENT = new OkHttpClient();
+
 	/**
 	 * 在被连接数据库执行sql语句
 	 */
 	public void executeSql() {
-		try {
-			List<Record>  d =  Db.use("connected").find("select top 5 * from reportinfo");
-			this.renderJson(d);
-		} catch (Exception e) {
-			// TODO: handle exception
-			
-			this.renderText(e.toString());
-		}
-	}
-	
-	public void executeSql2() {
-		try {
-			String sqlString = this.getPara("str");
-			List<Record>  d =  Db.use("connected").find(sqlString);
-			this.renderJson(d);
-		} catch (Exception e) {
-			// TODO: handle exception
-			this.renderText(e.toString());
-		}
+		List<Record> d = Db.use("connected").find(this.getPara("sqlstr"));
+		this.renderJson(d);
 	}
-	
-	public void executeSql3() {
-		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());
+	/**
+	 * post请求
+	 * @param url-请求地址
+	 * @param map-参数集合
+	 * @return
+	 */
+	private static String doPost(String url, Map<String, String> map) {
+		FormBody.Builder builder = new FormBody.Builder();
+		for (String key : map.keySet()) {
+			builder.add(key, map.get(key));
 		}
-	}
-	public static DruidPlugin createConnectedDruidPlugin() {
 
-		return new DruidPlugin(PropKit.get("jdbcUrl_connected"), PropKit.get("user_connected"),PropKit.get("password_connected").trim());
-	}
-	public void testTask() {
-		try {
-			//List<Record>  d =  Db.use("connected").find(this.getPara("sqlStr"));
-			List<Exams> exams = Exams.dao.use("zskk").find("SELECT * FROM pacsonline.exams where exam_status=3 and institution_id=73090001 order by createdAt desc limit 50");
-			List<Record> examds = new ArrayList<>();
-			for (Exams exams2 : exams) {
-				Studies studies = Studies.dao.use("zskk").findById(exams2.getStudyId());
-				Record record = Db.use("connected").findFirst("select * from caller where STUDYUID=?",studies.getStudyuid());
-				if (record == null) {
-					continue;
-				}
-				examds.add(record);
-				Report report = new Report().use("zskk");
-				report.setId(creatId());
-				report.setReportDatetime(aaa(record.getStr("REPORTDATE")));
-				report.setImpression(record.getStr("IMPRESSION"));
-				report.setDescription(record.getStr("DESCRIPTION"));
-				report.setExamId(exams2.getId());
-				report.setCreatedAt(new Date());
-				if (record.getStr("FITEM_RESULT_CODE") != null) {
-					//report.setReportResult(record.getStr("FITEM_RESULT_CODE").contains("阴")?"1":"2");
-				}
-				report.setReportDoctorId(getDoctorIdByName(record.getStr("REPORTDOCTOR")));
-				report.setReviewDoctorId(getDoctorIdByName(record.getStr("REVIEWDOCTOR")));
-				report.setReviewDatetime(aaa(record.getStr("REPORTDATE")));
-				report.setConfirmDoctorId(getDoctorIdByName(record.getStr("REVIEWDOCTOR")));
-				report.setConfirmDatetime(aaa(record.getStr("REPORTDATE")));
-//				report.save();
-				PatientInfos patientInfos = PatientInfos.dao.use("zskk").findById(exams2.getPatientId());
-				patientInfos.setName(record.getStr("PATIENTNAME"));
-//				patientInfos.update();
-			}
-			this.renderJson(examds);
-		} catch (Exception e) {
-			// TODO: handle exception
-			this.renderText(e.toString());
-		}
-	}
-	
-	private String creatId() {
-		UUID id = UUID.randomUUID();
-        String[] idd= id.toString().split("-");
-		return idd[0]+idd[1]+idd[2];
-	}
-	
-	private String getDoctorIdByName(String name) {
-		if (name == null) {
-			return "1";
-		}
-		Doctors doctors = Doctors.dao.use("zskk").findFirst("SELECT * FROM doctors where instr(?,realname) and institution_id=73090001",name);
-		if (doctors == null) {
-			return "1";
+		RequestBody formBody = builder.build();
+
+		Request request = new Request.Builder().url(url).post(formBody).build();
+		
+		try (Response response = OKHTTP_CLIENT.newCall(request).execute()) {
+			if (!response.isSuccessful()) throw new IOException("Unexpected code " + response);
+			String content = response.body().string();
+			return content;
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+			return null;
 		}
-		return doctors.getId();
 	}
 	
-	private Date aaa(String timestr) {
-		if (timestr == null) {
+
+	/**
+	 * 日期字符串格式转换
+	 * @param dateStr
+	 * @return
+	 */
+	private Date parseStringToDate(String dateStr) {
+		if (dateStr == null) {
 			return new Date();
 		}
 		SimpleDateFormat sdf= new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 	    Date date = null;
 		try {
-			date = sdf.parse(timestr);
+			date = sdf.parse(dateStr);
 		} catch (ParseException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
@@ -136,4 +90,12 @@ public class ViewController extends Controller {
         return date;
 	}
 
+	public static void main(String[] args) {
+        Map<String,String> paramsMap=new HashMap<String,String>();
+        paramsMap.put("institution_id", "44100001");
+
+		String contentString = doPost("https://risserver3.pacsonline.cn/butt/getExam/butt/getExam", paramsMap);
+		System.out.println(contentString);
+
+	}
 }

DataFusion/src/com/zskk/model/Studies.java

@@ -1,11 +0,0 @@
-package com.zskk.model;
-
-import com.zskk.model.base.BaseStudies;
-
-/**
- * Generated by JFinal.
- */
-@SuppressWarnings("serial")
-public class Studies extends BaseStudies<Studies> {
-	public static final Studies dao = new Studies().dao();
-}

DataFusion/src/com/zskk/service/DataService.java

@@ -0,0 +1,91 @@
+package com.zskk.service;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.jfinal.kit.PropKit;
+
+import okhttp3.FormBody;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import okhttp3.Response;
+
+public class DataService {
+	
+    private static String GET_EXAM_URL = "https://risserver3.pacsonline.cn/butt/getExam/butt/getExam";
+    
+    private static String SAVE_REPORT_URL = "https://risserver3.pacsonline.cn/butt/saveReport";
+	
+    private static final OkHttpClient OKHTTP_CLIENT = new OkHttpClient();
+    
+    /**
+     * 获取未出报告的检查列表
+     * @param instutionId
+     * @param number
+     */
+    public JSONArray getExamList(Integer number) {
+    	Map <String,String> map = new HashMap<String,String>();
+    	map.put("institution_id", PropKit.get("institution_id"));
+    	map.put("num", number.toString());
+		String content = postWithParameters(GET_EXAM_URL, map);
+	    JSONObject jsonObject = JSON.parseObject(content);
+	    if (!jsonObject.getString("msg").equals("success")) {
+			return null;
+		}
+		JSONArray jsonArray = JSON.parseArray(jsonObject.getString("data"));		
+	      System.out.println(jsonArray);
+
+		return jsonArray;
+		
+	}
+    
+    /**
+     * 写入报告
+     * @param instutionId
+     * @param number
+     */
+    public void saveReport(String instutionId, Integer number) {
+    	Map <String,String> map = new HashMap<String,String>();
+		postWithParameters(SAVE_REPORT_URL, map);
+		
+	}
+    
+    public static String postWithParameters(String url, Map<String, String> map) {
+    	
+    	FormBody.Builder formbody = new FormBody.Builder();
+    	
+    	for (Map.Entry<String, String> entry : map.entrySet()) {
+    		formbody.add(entry.getKey(), entry.getValue());
+		}
+		RequestBody requestBody = formbody.build();
+		
+		Request request = new Request.Builder()
+		        .url(url)
+		        .post(requestBody)
+		        .build();
+
+		    try (Response response = OKHTTP_CLIENT.newCall(request).execute()) {
+		      if (!response.isSuccessful()) throw new IOException("Unexpected code " + response);
+		      String content = response.body().string();
+		      System.out.println(content);
+		      return content;
+		    } catch (IOException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+				return null;
+			}	
+	}
+    
+    public static void main(String[] args) {
+    	Map <String,String> map = new HashMap<String,String>();
+    	map.put("institution_id", "47600001");
+    	map.put("num", "10");
+		postWithParameters(GET_EXAM_URL, map);
+	}
+
+}

DataFusion/src/com/zskk/service/ServiceFactory.java

@@ -18,7 +18,8 @@ public class ServiceFactory {
 	 */
 	public static void init(){
 		CLASS_MAP.put(ThreadPoolService.class, 	        Duang.duang(ThreadPoolService.class));
-		CLASS_MAP.put(WeixinService.class, 	            Duang.duang(WeixinService .class));
+		CLASS_MAP.put(DataService.class, 	            Duang.duang(DataService .class));
+
 	}
 	
 	@SuppressWarnings("unchecked")

DataFusion/src/com/zskk/service/ThreadPoolService.java

@@ -6,7 +6,6 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
-//import com.pacs.tools.LogUtil;
 
 /**
  * 线程池服务

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

@@ -8,19 +8,15 @@ import java.util.UUID;
 import com.jfinal.plugin.activerecord.Db;
 import com.jfinal.plugin.activerecord.Record;
 import com.jfinal.plugin.cron4j.ITask;
+import com.zskk.service.DataService;
 import com.zskk.service.ServiceFactory;
-import com.zskk.model.Doctors;
-import com.zskk.model.Exams;
-import com.zskk.model.PatientInfos;
-import com.zskk.model.Report;
-import com.zskk.model.Studies;
-import com.zskk.service.WeixinService;
 
 public class DataTask implements ITask {
 
 	@Override
 	public void run() {
 		// TODO Auto-generated method stub
+<<<<<<< HEAD
 		try {
 			List<Exams> exams = Exams.dao.use("zskk").find("SELECT * FROM pacsonline.exams where exam_status=3 and institution_id=47300001 order by createdAt desc limit 30");
 			for (Exams exams2 : exams) {
@@ -59,6 +55,10 @@ public class DataTask implements ITask {
 			// TODO: handle exception
 		}
 		
+=======
+		DataService dService = ServiceFactory.getService(DataService.class);
+		dService.getExamList(30);
+>>>>>>> origin/master
 	}
 
 

DataFusion/src/com/zskk/tools/JettyServer.java

@@ -1,13 +0,0 @@
-package com.zskk.tools;
-
-
-import com.jfinal.core.JFinal;
-
-
-public class JettyServer {
-
-	public static void main(String[] args) {
-		JFinal.start("WebRoot", 10000, "/", 5);
-	}
-
-}