From b486873000ea043f159c8de5c0edb123c0f38a87 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 09 Jun 2026 08:36:34 +0800
Subject: [PATCH] refactor(flyer): 修改飞手表单和实体类中的擅长任务类型字段
---
drone-ops/drone-resource/src/main/java/org/sxkj/resource/feign/AttachClient.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/drone-ops/drone-resource/src/main/java/org/sxkj/resource/feign/AttachClient.java b/drone-ops/drone-resource/src/main/java/org/sxkj/resource/feign/AttachClient.java
index ba086ce..ad70455 100644
--- a/drone-ops/drone-resource/src/main/java/org/sxkj/resource/feign/AttachClient.java
+++ b/drone-ops/drone-resource/src/main/java/org/sxkj/resource/feign/AttachClient.java
@@ -73,9 +73,9 @@
attach.setOrderByCreateTime(true);
attach.setAreaCode(HeaderUtils.getAreaCode());
- List<Integer> integers = Arrays.asList(0, 2, 4, 5);
+ List<String> integers = Arrays.asList("0", "2", "4", "5");
attach.setResultTypes(integers);
- List<Integer> resultTypes = attach.getResultTypes();
+ List<String> resultTypes = attach.getResultTypes();
String wordOrderType = attach.getWordOrderType();
settingResultType(attach, wordOrderType, resultTypes);
@@ -95,7 +95,6 @@
Page<AttachVO> page = new Page<>(1, 2000); // 或者 Integer.MAX_VALUE
List<AttachVO> aiAttachImages = attachService.findAiAttachImages(page, attach);
- AttachVO.settingNickName(aiAttachImages);
return aiAttachImages;
}
@@ -105,7 +104,7 @@
* @param wordOrderType
* @param resultTypes
*/
- private static void settingResultType(AttachVO attach, String wordOrderType, List<Integer> resultTypes) {
+ private static void settingResultType(AttachVO attach, String wordOrderType, List<String> resultTypes) {
if (!StringUtils.isEmpty(wordOrderType) && !CollectionUtils.isEmpty(resultTypes)) {
if ("-1".equals(wordOrderType)) {
attach.setWordOrderType(null);
@@ -129,7 +128,7 @@
}
@Override
- public BladeFile saveAttachFile(MultipartFile file, String fileName, Integer type) throws IOException {
+ public BladeFile saveAttachFile(MultipartFile file, String fileName, List<List<String>> type) throws IOException {
BladeFile bladeFile = ossBuilder.template().putFile(pojo.getBucket(),fileName, file.getInputStream());
Long attachId = buildAttach(fileName, file.getSize(), bladeFile, type);
bladeFile.setAttachId(attachId);
@@ -149,7 +148,7 @@
return bladeFile;
}
- private Long buildAttach(String fileName, Long fileSize, BladeFile bladeFile, Integer type) {
+ private Long buildAttach(String fileName, Long fileSize, BladeFile bladeFile, List<List<String>> type) {
String fileExtension = FileUtil.getFileExtension(fileName);
Attach attach = new Attach();
attach.setDomainUrl(bladeFile.getDomain());
@@ -236,7 +235,7 @@
saveAttachFile(new MockMultipartFile( mediaFile.getName(),
mediaFile.getName(),
"application/octet-stream",
- new FileInputStream(mediaFile)), name, Attach.RESULT_TYPE_VEDIO_SHOW);
+ new FileInputStream(mediaFile)), name, null);
log.info("第{}个视频保存入库完成...", (i + 1));
}
--
Gitblit v1.9.3