|
@@ -114,7 +114,32 @@ public class CameraUtil {
|
|
|
for (Map<String, Object> map : maps) {
|
|
|
Object path = map.get("Path");
|
|
|
if (!ObjectUtils.isEmpty(path)) {
|
|
|
- ls.add(mappingUrl + path.toString());
|
|
|
+ String s1 = path.toString();
|
|
|
+ String substring = s1.substring(s1.lastIndexOf("/") - 1, s1.length());
|
|
|
+ String substring1 = substring.substring(0, substring.indexOf("-"));
|
|
|
+ String[] s2 = substring1.split("_");
|
|
|
+ if (!ObjectUtils.isEmpty(s2)) {
|
|
|
+ String s3 = s2[0] + s2[1];
|
|
|
+ String s4 = s2[0] + s2[2];
|
|
|
+ Date sdate = DateUtils.dateTime(DateUtils.YYYYMMDDHHMMSS, s3);
|
|
|
+ Date edate = DateUtils.dateTime(DateUtils.YYYYMMDDHHMMSS, s4);
|
|
|
+ /* s | e | */
|
|
|
+ if (sdate.compareTo(startTm) <= 0 && edate.compareTo(startTm) > 0) {
|
|
|
+ ls.add(mappingUrl + path.toString());
|
|
|
+
|
|
|
+ /* | s e | */
|
|
|
+ } else if (sdate.compareTo(startTm) >= 0 && edate.compareTo(endTm) <= 0) {
|
|
|
+ ls.add(mappingUrl + path.toString());
|
|
|
+
|
|
|
+ /* | s | e */
|
|
|
+ } else if (sdate.compareTo(startTm) >= 0 && edate.compareTo(endTm) >= 0) {
|
|
|
+ ls.add(mappingUrl + path.toString());
|
|
|
+
|
|
|
+ /* s| | e */
|
|
|
+ } else if (sdate.compareTo(startTm) <= 0 && edate.compareTo(endTm) >= 0) {
|
|
|
+ ls.add(mappingUrl + path.toString());
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|