相机回放视频过滤排序

hazard-admin/src/main/java/com/ozs/web/core/util/CameraUtil.java

@@ -52,6 +52,13 @@ public class CameraUtil {
         return "/profile" + ph;
     }
 
+    /**
+     * 实时播放的拼接流
+     *
+     * @param cameraCode 相机编码
+     * @param channel    相机通道
+     * @return
+     */
     public static String getPlayFlv(String cameraCode, String channel) {
         return historyUrl + "/hdl/" + channel + "/" + cameraCode + ".flv";
     }
@@ -104,19 +111,23 @@ public class CameraUtil {
                         String s4 = s2[0] + s2[2];
                         Date sdate = DateUtils.dateTime(DateUtils.YYYYMMDDHHMMSS, s3);
                         Date edate = DateUtils.dateTime(DateUtils.YYYYMMDDHHMMSS, s4);
-                        /*     s | e     | */
-                        if (startTm.compareTo(sdate) <= 0 && endTm.compareTo(edate) > 0) {
+                        /*     sdate  |startTm|  edate     |endTm| */
+                        if (startTm.compareTo(sdate) >= 0
+                                && startTm.compareTo(edate) <= 0
+                                && endTm.compareTo(edate) >= 0) {
                             m.put(sdate, mappingUrl + path.toString());
-                            /*  |   s    e    | */
-                        } else if (startTm.compareTo(sdate) >= 0 && endTm.compareTo(edate) <= 0) {
+                            /*  |startTm|   sdate    edate   |endTm| */
+                        } else if (startTm.compareTo(sdate) <= 0 && endTm.compareTo(edate) >= 0) {
                             m.put(sdate, mappingUrl + path.toString());
 
-                            /*  |   s     |  e  */
-                        } else if (startTm.compareTo(sdate) >= 0 && endTm.compareTo(edate) >= 0) {
+                            /*  |startTm|   sdate     |endTm|  edate  */
+                        } else if (startTm.compareTo(sdate) <= 0
+                                && endTm.compareTo(sdate) >= 0
+                                && endTm.compareTo(edate) <= 0) {
                             m.put(sdate, mappingUrl + path.toString());
 
-                            /*  s|      | e  */
-                        } else if (startTm.compareTo(sdate) <= 0 && endTm.compareTo(edate) >= 0) {
+                            /*  sdate |startTm|      |endTm| edate  */
+                        } else if (startTm.compareTo(sdate) >= 0 && endTm.compareTo(edate) <= 0) {
                             m.put(sdate, mappingUrl + path.toString());
                         }
                     }