刘韬 1 year ago
parent
commit
b448536e87

+ 1 - 0
DataFusion/src/com/zskk/config/ZskkConfig.java

@@ -107,6 +107,7 @@ public class ZskkConfig extends JFinalConfig {
 		usData.addTask("*/2 * * * *", new USInfoTask());
 		usData.addTask("*/2 * * * *", new USInfoTask());
 		me.add(usData);
 		me.add(usData);
 		
 		
+		//传染病上传
 		Cron4jPlugin crData = new Cron4jPlugin();
 		Cron4jPlugin crData = new Cron4jPlugin();
 		crData.addTask("*/5 * * * *", new CrbTask());
 		crData.addTask("*/5 * * * *", new CrbTask());
 		me.add(crData);
 		me.add(crData);

+ 6 - 1
DataFusion/src/com/zskk/service/DataService.java

@@ -67,8 +67,13 @@ public class DataService {
     postWithParameters(UPDATE_PATIENT_URL, map);
     postWithParameters(UPDATE_PATIENT_URL, map);
     }
     }
     
     
+    /**
+     * 获取确认报告
+     * @param map
+     * @return
+     */
     public JSONArray getReport(Map<String, String> map) {
     public JSONArray getReport(Map<String, String> map) {
-    	String content = postWithParameters(UPDATE_PATIENT_URL, map);
+    	String content = postWithParameters(GET_REPORT_URL, map);
     	JSONObject jsonObject = JSON.parseObject(content);
     	JSONObject jsonObject = JSON.parseObject(content);
  	    if (!jsonObject.getString("msg").equals("success")) {
  	    if (!jsonObject.getString("msg").equals("success")) {
  			return null;
  			return null;

+ 1 - 1
DataFusion/src/com/zskk/task/CrbTask.java

@@ -94,7 +94,7 @@ public class CrbTask implements ITask {
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 		Date date = new Date();
 		Date date = new Date();
 		//start
 		//start
-		long dInteger = date.getTime() - 1200000;
+		long dInteger = date.getTime() - 86400000;
 		String daString = sdf.format(new Date(dInteger));
 		String daString = sdf.format(new Date(dInteger));
 		//end
 		//end
 		long eInteger = date.getTime() - 600000;
 		long eInteger = date.getTime() - 600000;