lihongjie/coal
1
0
Fork 0
mirror of https://codeup.aliyun.com/64f7d6b8ce01efaafef1e678/coal/coal.git synced 2026-01-25 15:55:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

bufix: 文件上传报错以及皮带秤实时数据的问题

Browse Source
This commit is contained in:
lihongjie0209
2024-12-22 10:54:56 +08:00
parent 6609c02ebf
commit 4603b6003f
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/cn/lihongjie/coal/file/service/FileService.java
View File

@@ -1,5 +1,6 @@
package cn.lihongjie.coal.file.service; package cn.lihongjie.coal.file.service;
import cn.hutool.core.io.IoUtil;
import cn.hutool.http.HttpUtil; import cn.hutool.http.HttpUtil;
import cn.lihongjie.coal.base.dto.CommonQuery; import cn.lihongjie.coal.base.dto.CommonQuery;
import cn.lihongjie.coal.base.dto.IdRequest; import cn.lihongjie.coal.base.dto.IdRequest;
@@ -118,7 +119,7 @@ public class FileService extends BaseService<FileEntity, FileRepository> {
if (file != null) { if (file != null) {
size = file.getSize(); size = file.getSize();
fis = file.getInputStream(); fis = new ByteArrayInputStream(IoUtil.readBytes(file.getInputStream()));
} else if (StringUtils.isNotEmpty(url)) { } else if (StringUtils.isNotEmpty(url)) {
ByteArrayOutputStream out = new ByteArrayOutputStream(); ByteArrayOutputStream out = new ByteArrayOutputStream();
HttpUtil.download(url, out, true); HttpUtil.download(url, out, true);

2
src/main/java/cn/lihongjie/coal/pdcDeviceData/service/PdcDeviceDataService.java
View File

@@ -181,7 +181,7 @@ public class PdcDeviceDataService
with tmp as (select d.device_id, with tmp as (select d.device_id,
time_bucket_gapfill(cast(:bucket as interval), d.time) as tb, 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 from t_pdc_device_data x
where x.time >= :startTime where x.time >= :startTime
AND x.time <= :endTime AND x.time <= :endTime