Merge branch 'dev/abl支持' into 重构/1078

# Conflicts:
#	src/main/resources/application.yml

src/main/java/com/genersoft/iot/vmp/utils/DateUtil.java

@@ -147,6 +147,18 @@ public class DateUtil {
         return formatter.format(LocalDateTime.ofInstant(instant, ZoneId.of(zoneStr)));
     }
 
+    /**
+     * yyyy_MM_dd_HH_mm_ss 转时间戳（毫秒）
+     *
+     * @param formatTime
+     * @return
+     */
+    public static long urlToTimestampMs(String formatTime) {
+        TemporalAccessor temporalAccessor = urlFormatter.parse(formatTime);
+        Instant instant = Instant.from(temporalAccessor);
+        return instant.toEpochMilli();
+    }
+
     /**
      * 时间戳 转 yyyy_MM_dd
      */