commir

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

@@ -252,6 +252,12 @@ public class DataTask implements ITask {
 	 * @date: 2019/12/26 18:26
 	 */
 	public String returnSecondTimestamp(String data) throws ParseException {
+		if (data == null) {
+			Date date = new Date();
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+			return String.valueOf(date.getTime() / 1000);
+
+		}
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
 
 		return String.valueOf(sdf.parse(data).getTime() / 1000);