From aa1c7114578981463e226d4b2d7773bc1b7994da Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期五, 08 四月 2022 16:57:14 +0800
Subject: [PATCH] ip音柱文件上传
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java | 39 +++++++++++++++++++++++++++------------
1 files changed, 27 insertions(+), 12 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 b98e853..492ad03 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
@@ -1,12 +1,13 @@
package com.sandu.ximon.admin.service;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
-import com.sandu.ximon.admin.config.MinIoConstant;
+import com.sandu.ximon.admin.minio.entity.MinIoConstant;
import com.sandu.ximon.admin.param.IpVolumeMissionParam;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.utils.TaskAPIUtils;
@@ -84,7 +85,7 @@
// 灏佽鎾斁鏂囦欢鍒楄〃
List<TaskMediaFileVO> taskMediaFileVOS = new ArrayList<>();
List<BroadcastV2TaskFile> taskFileEntityList = new ArrayList<>();
- int i = 1;
+ int i = 6666;
for (Integer fileId : new HashSet<>(missionparam.getFileIds())) {
TaskMediaFileVO taskMediaFileVO = new TaskMediaFileVO();
BroadcastV2TaskFile taskFileEntity = new BroadcastV2TaskFile();
@@ -95,15 +96,24 @@
if (fileEntity == null) {
throw new BusinessException("fileId涓�" + fileId + "鐨勬枃浠朵笉瀛樺湪");
}
-// String absolutePath = MinIoConstant.getAbsolutePath(
-// MinIoConstant.BROADCAST_FILE.getBucketName() + fileEntity.getUserId(),
-// fileEntity.getFileName()
-// );
-
+ if(fileEntity.getUserId()==null&&fileEntity.getClientId()!=null){
+ fileEntity.setUserId(fileEntity.getClientId());
+ }
+ 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++;
taskMediaFileVO.setT(0);
- taskMediaFileVO.setN(fileEntity.getFileUrl());
+ taskMediaFileVO.setN(absolutePath);
taskMediaFileVO.setS(BigInteger.valueOf(fileEntity.getOriginSize()));
taskMediaFileVOS.add(taskMediaFileVO);
@@ -382,15 +392,11 @@
task.setWeeks("0" + Integer.toBinaryString(byId.getWeek()));
// byId.setWeeks("0" + Integer.toBinaryString(byId.getWeek()));
-// IpVolumeMissionBo bo = new IpVolumeMissionBo();
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()||taskTerminals.isEmpty()){
-// throw new BusinessException("");
-// }
if (!taskFiles.isEmpty()) {
taskFiles.forEach(
fileId -> {
@@ -417,6 +423,12 @@
);
}
+// Map map=new HashMap();
+// map.put("鏈湴",byId);
+// map.put("鏈嶅姟鍣�",task);
+
+ System.out.println(JSON.toJSONString(task));
+ System.out.println(task);
return task;
@@ -427,4 +439,7 @@
}
+ public boolean stopTask(Integer taskId) {
+ return TaskAPIUtils.stopTask(taskId);
+ }
}
--
Gitblit v1.9.3