commit

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

@@ -64,15 +64,14 @@ public class ZskkConfig extends JFinalConfig {
 	@Override
 	public void configPlugin(Plugins me) {
 		// 配置数据库连接池插件
-//		DruidPlugin druidPluginConnected = createConnectedDruidPlugin();
-//		me.add(druidPluginConnected);
+		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);

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

@@ -7,7 +7,6 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import com.alibaba.fastjson.JSON;
 import com.jfinal.core.Controller;
 import com.jfinal.kit.PropKit;
@@ -16,7 +15,6 @@ import com.jfinal.plugin.activerecord.Db;
 import com.jfinal.plugin.activerecord.Record;
 import com.jfinal.plugin.activerecord.dialect.SqlServerDialect;
 import com.jfinal.plugin.druid.DruidPlugin;
-
 import okhttp3.FormBody;
 import okhttp3.MediaType;
 import okhttp3.OkHttpClient;

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

@@ -21,14 +21,17 @@ public class DataTask implements ITask {
 	public void run() {
 		// TODO Auto-generated method stub
 		DataService dService = ServiceFactory.getService(DataService.class);
-        JSONArray jsonArray = dService.getExamList(30);	
+        JSONArray jsonArray = dService.getExamList(50);	
         for (Object object : jsonArray) {
+        	try {
+				
+			
 			JSONObject jsonObject = JSON.parseObject(object.toString());
 			Record record = Db.use("connected").findFirst("select * from PACSONLINE_Interface where STUDYUID=?", jsonObject.getString("studyuid"));
 			if (record == null) {
 				continue;
 			}
-			if (record.getStr("IMPRESSION") == null && record.getStr("DESCRIPTION") == null) {
+			if (record.getStr("IMPRESSION").isBlank() && record.getStr("DESCRIPTION").isBlank()) {
 				continue;
 			}
 			Map<String, String> params = new HashMap<>();
@@ -38,11 +41,11 @@ public class DataTask implements ITask {
 			//报告时间
 			params.put("report_datetime", record.getStr("REPORTDATE"));
 			//审核医生姓名
-			params.put("review_doctor_name", record.getStr("REVIEWDOCTOR"));
+			params.put("review_doctor_name", record.getStr("REVIEWDOCTOR")==null?"":record.getStr("REVIEWDOCTOR"));
 			//审核时间
 			params.put("review_datetime", record.getStr("REPORTDATE"));
 			//确认医生姓名
-			params.put("confirm_doctor_name", record.getStr("REVIEWDOCTOR"));
+			params.put("confirm_doctor_name", record.getStr("REVIEWDOCTOR")==null?"":record.getStr("REVIEWDOCTOR"));
 			//确认时间
 			params.put("confirm_datetime", record.getStr("REPORTDATE"));
 			//意见建议
@@ -73,6 +76,10 @@ public class DataTask implements ITask {
 			tService.execute(() -> {
 				dService.saveReport(params);
 			});	
+        	} catch (Exception e) {
+				// TODO: handle exception
+        		continue;
+			}
         }
 	}