From 3f65fcaa359cadeffa9cec2c757ab879d0aad739 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期三, 13 四月 2022 10:30:21 +0800
Subject: [PATCH] ip音柱文件上传
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java
index f0b0b3a..c5eb375 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java
@@ -85,7 +85,7 @@
// 灏佽鎾斁鏂囦欢鍒楄〃
List<TaskMediaFileVO> taskMediaFileVOS = new ArrayList<>();
List<BroadcastV2TaskFile> taskFileEntityList = new ArrayList<>();
- int i = 6666;
+ int i = 1;
for (Integer fileId : new HashSet<>(missionparam.getFileIds())) {
TaskMediaFileVO taskMediaFileVO = new TaskMediaFileVO();
BroadcastV2TaskFile taskFileEntity = new BroadcastV2TaskFile();
@@ -224,10 +224,17 @@
taskFileEntity.setFileId(fileId);
IpVolumeFile fileEntity = ipVolumeFileService.getById(fileId);
- String absolutePath = MinIoConstant.getAbsolutePath(
+ String absolutePath;
+ absolutePath = MinIoConstant.getAbsolutePath(
MinIoConstant.BROADCAST_FILE.getBucketName() + fileEntity.getUserId(),
fileEntity.getFileName()
);
+ if (fileEntity.getUserId() == null && fileEntity.getClientId() == null) {
+ absolutePath = MinIoConstant.getAbsolutePath(
+ MinIoConstant.ADMIN_BROADCAST_FILE.getBucketName(),
+ fileEntity.getFileName()
+ );
+ }
taskMediaFileVO.setI(i);
i++;
@@ -242,7 +249,6 @@
missionparam.setFiles(taskMediaFileVOS.toArray(new TaskMediaFileVO[taskMediaFileVOS.size()]));
missionparam.setTerminals(taskTerminalVOList.toArray(new TaskTerminalVO[taskTerminalVOList.size()]));
- System.out.println("---------------------------");
// 鍚慖P闊虫煴鏈嶅姟鍣ㄦ洿鏂颁换鍔�
Integer result = TaskAPIUtils.updateTask(taskId, missionparam);
@@ -389,13 +395,15 @@
}
- task.setWeeks("0" + Integer.toBinaryString(byId.getWeek()));
+ task.setWeeks("0" + Integer.toBinaryString(task.getWeek()));
// byId.setWeeks("0" + Integer.toBinaryString(byId.getWeek()));
List<BroadcastV2TaskFile> taskFiles = broadcastV2TaskFileService.list(Wrappers.lambdaQuery(BroadcastV2TaskFile.class)
.eq(BroadcastV2TaskFile::getTaskId, taskId));
List<BroadcastV2TaskTerminal> taskTerminals = broadcastV2TaskTerminalService.list(Wrappers.lambdaQuery(BroadcastV2TaskTerminal.class)
.eq(BroadcastV2TaskTerminal::getTaskId, taskId));
+
+
if (!taskFiles.isEmpty()) {
taskFiles.forEach(
@@ -423,9 +431,6 @@
);
}
-// Map map=new HashMap();
-// map.put("鏈湴",byId);
-// map.put("鏈嶅姟鍣�",task);
System.out.println(JSON.toJSONString(task));
System.out.println(task);
--
Gitblit v1.9.3