增加fast

realtime/hologram-streaming/src/main/java/com/zhht/irn/utils/DateUtils.java

@@ -222,10 +222,16 @@ public class DateUtils {
         return time;
     }
 
+    /**
+     * 日期转时间戳
+     *
+     * @param s
+     * @return
+     */
     public static Long dateToStamp(String s){
         try {
             String res;
-            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat(timeFormat);
             Date date = simpleDateFormat.parse(s);
             long ts = date.getTime();
             return ts;
@@ -234,6 +240,17 @@ public class DateUtils {
         }
     }
 
+    /**
+     * 时间戳转日期（yyyy-MM-dd HH:mm:ss）
+     *
+     * @param timestamp
+     * @return
+     */
+    public static String stampToTime(String timestamp){
+        SimpleDateFormat sdf=new SimpleDateFormat(timeFormat);
+        long date_temp = Long.valueOf(timestamp);
+        return sdf.format(new Date(date_temp));
+    }
 
     /**
      * 判断时间是否在当前时间十分钟之类