diff --git a/src/main/java/cn/lihongjie/coal/file/service/FileService.java b/src/main/java/cn/lihongjie/coal/file/service/FileService.java index 8269d552..b0a6ccea 100644 --- a/src/main/java/cn/lihongjie/coal/file/service/FileService.java +++ b/src/main/java/cn/lihongjie/coal/file/service/FileService.java @@ -1,5 +1,6 @@ package cn.lihongjie.coal.file.service; +import cn.hutool.core.io.IoUtil; import cn.hutool.http.HttpUtil; import cn.lihongjie.coal.base.dto.CommonQuery; import cn.lihongjie.coal.base.dto.IdRequest; @@ -118,7 +119,7 @@ public class FileService extends BaseService { if (file != null) { size = file.getSize(); - fis = file.getInputStream(); + fis = new ByteArrayInputStream(IoUtil.readBytes(file.getInputStream())); } else if (StringUtils.isNotEmpty(url)) { ByteArrayOutputStream out = new ByteArrayOutputStream(); HttpUtil.download(url, out, true); diff --git a/src/main/java/cn/lihongjie/coal/pdcDeviceData/service/PdcDeviceDataService.java b/src/main/java/cn/lihongjie/coal/pdcDeviceData/service/PdcDeviceDataService.java index c2146cb4..fe4dfb26 100644 --- a/src/main/java/cn/lihongjie/coal/pdcDeviceData/service/PdcDeviceDataService.java +++ b/src/main/java/cn/lihongjie/coal/pdcDeviceData/service/PdcDeviceDataService.java @@ -181,7 +181,7 @@ public class PdcDeviceDataService with tmp as (select d.device_id, time_bucket_gapfill(cast(:bucket as interval), d.time) as tb, - interpolate(max(d.total_data), (select ('2024-12-18 00:00:00'::timestamp, (select total_data + interpolate(max(d.total_data), (select (cast(:startTime as timestamp), (select total_data from t_pdc_device_data x where x.time >= :startTime AND x.time <= :endTime