From 4603b6003f5d18e81b78dfed2c03e87f08dfd6fe Mon Sep 17 00:00:00 2001 From: lihongjie0209 Date: Sun, 22 Dec 2024 10:54:56 +0800 Subject: [PATCH] =?UTF-8?q?bufix:=20=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E4=BB=A5=E5=8F=8A=E7=9A=AE=E5=B8=A6=E7=A7=A4?= =?UTF-8?q?=E5=AE=9E=E6=97=B6=E6=95=B0=E6=8D=AE=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/cn/lihongjie/coal/file/service/FileService.java | 3 ++- .../coal/pdcDeviceData/service/PdcDeviceDataService.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) 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