commit

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

@@ -22,7 +22,7 @@ public class CrbTask implements ITask {
 		// TODO Auto-generated method stub
 		DataService dService = ServiceFactory.getService(DataService.class);
 		Map<String, String> dateparams = new HashMap<>();
-		dateparams.put("datetime", "2023-05-01 00:00:00,2023-09-02 00:00:00");
+		dateparams.put("datetime", parseStringToDate());
         JSONArray jsonArray = dService.getReport(dateparams);	
         for (Object object : jsonArray) {
         	try {
@@ -90,23 +90,17 @@ public class CrbTask 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;
+	private String parseStringToDate() {
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		Date date = new Date();
+		//start
+		long dInteger = date.getTime() - 1200000;
+		String daString = sdf.format(new Date(dInteger));
+		//end
+		long eInteger = date.getTime() - 600000;
+		String endString = sdf.format(new Date(eInteger));
+		
+        return daString+","+endString;
 	}
 
 }