diff --git a/gb28181-wvp-proxy-service/src/main/java/cn/skcks/docking/gb28181/wvp/service/gb28181/Gb28181DownloadService.java b/gb28181-wvp-proxy-service/src/main/java/cn/skcks/docking/gb28181/wvp/service/gb28181/Gb28181DownloadService.java index f0bb44d..1f6914c 100644 --- a/gb28181-wvp-proxy-service/src/main/java/cn/skcks/docking/gb28181/wvp/service/gb28181/Gb28181DownloadService.java +++ b/gb28181-wvp-proxy-service/src/main/java/cn/skcks/docking/gb28181/wvp/service/gb28181/Gb28181DownloadService.java @@ -1,6 +1,9 @@ package cn.skcks.docking.gb28181.wvp.service.gb28181; -import cn.hutool.core.date.*; +import cn.hutool.core.date.DatePattern; +import cn.hutool.core.date.DateUnit; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.date.LocalDateTimeUtil; import cn.hutool.core.io.IoUtil; import cn.skcks.docking.gb28181.common.json.JsonException; import cn.skcks.docking.gb28181.common.json.JsonResponse; @@ -186,9 +189,9 @@ public class Gb28181DownloadService { WvpProxyDevice device = deviceByGbDeviceIdAndChannel.get(); WvpProxyDocking docking = deviceByGbDeviceId.get(); - - long start = DateUtil.convertTimeZone(startTime, ZoneId.of(GB28181Constant.TIME_ZONE)).toInstant().getEpochSecond(); - long end = DateUtil.convertTimeZone(endTime, ZoneId.of(GB28181Constant.TIME_ZONE)).toInstant().getEpochSecond(); + ZoneId zoneId = ZoneId.of(GB28181Constant.TIME_ZONE); + long start = LocalDateTimeUtil.of(startTime.toInstant(), zoneId).atZone(zoneId).toEpochSecond(); + long end = LocalDateTimeUtil.of(endTime.toInstant(), zoneId).atZone(zoneId).toEpochSecond(); String streamId = MediaSdpHelper.getStreamId(gbDeviceId, channel, String.valueOf(start), String.valueOf(end)); int streamMode = proxySipConfig.getTransport().equalsIgnoreCase(ListeningPoint.UDP) ? 0 : 1; String ip = zlmMediaConfig.getIp();