From da64eeb2f6ca73388087b3a26b022f95e442229d Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期五, 17 一月 2025 16:07:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-infra/iailab-module-infra-biz/src/main/java/com/iailab/module/infra/framework/file/core/client/s3/S3FileClient.java | 2 +-
/dev/null | 0
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/controller/admin/ApiDataController.java | 5 ++---
iailab-module-infra/iailab-module-infra-biz/src/main/resources/file/common.jpg | 0
iailab-module-infra/iailab-module-infra-biz/src/main/java/com/iailab/module/infra/service/file/FileConfigServiceImpl.java | 2 +-
5 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/controller/admin/ApiDataController.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/controller/admin/ApiDataController.java
index 7c3537c..13e4146 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/controller/admin/ApiDataController.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/controller/admin/ApiDataController.java
@@ -3,7 +3,6 @@
import com.iailab.framework.common.pojo.CommonResult;
import com.iailab.framework.common.pojo.PageResult;
import com.iailab.framework.common.util.date.DateUtils;
-import com.iailab.framework.common.util.object.BeanUtils;
import com.iailab.framework.common.util.object.ConvertUtils;
import com.iailab.framework.excel.core.util.ExcelUtils;
import com.iailab.module.data.api.dto.DeviceValueDTO;
@@ -321,9 +320,9 @@
}
@PermitAll
- @GetMapping("/query-ind/history-value")
+ @PostMapping("/query-ind/history-value")
@Operation(summary = "查询指标历史值")
- public CommonResult<List<ApiIndItemValueDTO>> queryIndItemHistoryValue(@RequestParam ApiIndItemQueryDTO dto) {
+ public CommonResult<List<ApiIndItemValueDTO>> queryIndItemHistoryValue(@RequestBody ApiIndItemQueryDTO dto) {
List<IndItemValueVO> list = indItemCollector.queryValue(dto.getItemNo(), dto.getStart(), dto.getEnd());
return success(ConvertUtils.sourceToTarget(list, ApiIndItemValueDTO.class));
}
diff --git a/iailab-module-infra/iailab-module-infra-biz/src/main/java/com/iailab/module/infra/framework/file/core/client/s3/S3FileClient.java b/iailab-module-infra/iailab-module-infra-biz/src/main/java/com/iailab/module/infra/framework/file/core/client/s3/S3FileClient.java
index d0fed92..ffb680f 100644
--- a/iailab-module-infra/iailab-module-infra-biz/src/main/java/com/iailab/module/infra/framework/file/core/client/s3/S3FileClient.java
+++ b/iailab-module-infra/iailab-module-infra-biz/src/main/java/com/iailab/module/infra/framework/file/core/client/s3/S3FileClient.java
@@ -109,7 +109,7 @@
.stream(new ByteArrayInputStream(content), content.length, -1) // 文件内容
.build());
// 拼接返回路径
- return config.getDomain() + "/" + path;
+ return config.getDomain() + "/" + config.getBucket() + "/" + path;
}
@Override
diff --git a/iailab-module-infra/iailab-module-infra-biz/src/main/java/com/iailab/module/infra/service/file/FileConfigServiceImpl.java b/iailab-module-infra/iailab-module-infra-biz/src/main/java/com/iailab/module/infra/service/file/FileConfigServiceImpl.java
index 76926c2..4e75b46 100644
--- a/iailab-module-infra/iailab-module-infra-biz/src/main/java/com/iailab/module/infra/service/file/FileConfigServiceImpl.java
+++ b/iailab-module-infra/iailab-module-infra-biz/src/main/java/com/iailab/module/infra/service/file/FileConfigServiceImpl.java
@@ -172,7 +172,7 @@
// 校验存在
validateFileConfigExists(id);
// 上传文件
- byte[] content = ResourceUtil.readBytes("file/erweima.jpg");
+ byte[] content = ResourceUtil.readBytes("file/common.jpg");
return getFileClient(id).upload(content, IdUtil.fastSimpleUUID() + ".jpg", "image/jpeg");
}
diff --git a/iailab-module-infra/iailab-module-infra-biz/src/main/resources/file/common.jpg b/iailab-module-infra/iailab-module-infra-biz/src/main/resources/file/common.jpg
new file mode 100644
index 0000000..77a5fbb
--- /dev/null
+++ b/iailab-module-infra/iailab-module-infra-biz/src/main/resources/file/common.jpg
Binary files differ
diff --git a/iailab-module-infra/iailab-module-infra-biz/src/main/resources/file/erweima.jpg b/iailab-module-infra/iailab-module-infra-biz/src/main/resources/file/erweima.jpg
deleted file mode 100644
index 1447283..0000000
--- a/iailab-module-infra/iailab-module-infra-biz/src/main/resources/file/erweima.jpg
+++ /dev/null
Binary files differ
--
Gitblit v1.9.3