commit

DataFusion/res/config.properties

@@ -5,7 +5,7 @@ user_connected 	   = yunpacs
 password_connected = Yun@pacs.163.com
 #DATA-Parms
 institution_id     = 41000009
-jdbcUrl_local  = jdbc:sqlserver://172.17.2.100:1433;DatabaseName=healthone
+jdbcUrl_local  = jdbc:mysql://127.0.0.1:3306/pacsonline_pro?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull
 #jdbcUrl_connected  = jdbc:oracle:thin:@192.168.100.4:1521:pacs
-user_local 	   = yunpacs
-password_local = Yun@pacs.163.com
+user_local 	   = root
+password_local = Zskk_2021

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

@@ -18,6 +18,7 @@ import com.jfinal.template.Engine;
 import com.zskk.control.ViewController;
 import com.zskk.service.ServiceFactory;
 import com.zskk.task.DataTask;
+import com.zskk.task.UpdateTask;
 
 public class ZskkConfig extends JFinalConfig {
 
@@ -85,6 +86,10 @@ public class ZskkConfig extends JFinalConfig {
 		Cron4jPlugin cpData = new Cron4jPlugin();
 		cpData.addTask("*/5 * * * *", new DataTask());
 		me.add(cpData);
+		
+		Cron4jPlugin upData = new Cron4jPlugin();
+		upData.addTask("*/5 * * * *", new UpdateTask());
+		me.add(upData);
 	}
 
 	@Override

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

@@ -80,10 +80,16 @@ public class DataService {
     }
     
     /*
-     * 医院代收
+     * 获取平台报告
      */
-    public void getReport(Map<String, String> map) {
-    	postWithParameters(GET_REPORT_URL, map);
+    public JSONArray getReport(Map<String, String> map) {
+    	String content = postWithParameters(GET_REPORT_URL, map);
+	    JSONObject jsonObject = JSON.parseObject(content);
+	    if (!jsonObject.getString("msg").equals("success")) {
+			return null;
+		}
+		JSONArray jsonArray = JSON.parseArray(jsonObject.getString("data"));		
+		return jsonArray;
     }
     
     public static String postWithParameters(String url, Map<String, String> map) {

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

@@ -1,12 +1,42 @@
 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;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.jfinal.kit.PropKit;
+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.service.ThreadPoolService;
 
 public class UpdateTask implements ITask {
 
 	@Override
 	public void run() {
 		// TODO Auto-generated method stub
+		DataService dService = ServiceFactory.getService(DataService.class);
+		Map<String, String> params = new HashMap<>();
+		//报告状态
+		params.put("report_status", "9");
+		//医疗机构ID
+		params.put("institution_id", PropKit.get("institution_id"));
+		//时间段
+		params.put("time", parseStringToDate());
+
+		JSONArray jsonArray = dService.getReport(params);
+		for (Object object : jsonArray) {
+			JSONObject jsonObject = JSON.parseObject(object.toString());
+			Record record = new Record();
+//			record.
+		}
+		
+	
 
 	}
 
@@ -15,5 +45,21 @@ public class UpdateTask implements ITask {
 		// TODO Auto-generated method stub
 
 	}
+	
+	/**
+	 * 日期字符串格式转换
+	 * @param dateStr
+	 * @return
+	 */
+	private String parseStringToDate() {
+		SimpleDateFormat sdf= new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+	    Date date = new Date();
+	    Long dateBeforeLong = date.getTime()-86400000;
+	    Date dateBefore = new Date(dateBeforeLong);
+	    String timeStringBefore = sdf.format(dateBefore);
+	    String timeString = sdf.format(date);
+		
+        return timeStringBefore + "," + timeString;
+	}
 
 }