From b95c910f14377d4f15cc4c05fa0b7bf8df759e91 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期四, 07 四月 2022 17:57:24 +0800
Subject: [PATCH] ip音柱文件上传
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 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 5bf9528..76a8f83 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,12 @@
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.param.IpVolumeMissionParam;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.utils.TaskAPIUtils;
@@ -84,7 +84,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();
@@ -214,15 +214,15 @@
taskFileEntity.setFileId(fileId);
IpVolumeFile fileEntity = ipVolumeFileService.getById(fileId);
- String absolutePath = MinIoConstant.getAbsolutePath(
- MinIoConstant.BROADCAST_FILE.getBucketName() + fileEntity.getUserId(),
- fileEntity.getFileName()
- );
+// String absolutePath = MinIoConstant.getAbsolutePath(
+// MinIoConstant.BROADCAST_FILE.getBucketName() + fileEntity.getUserId(),
+// fileEntity.getFileName()
+// );
taskMediaFileVO.setI(i);
i++;
taskMediaFileVO.setT(0);
- taskMediaFileVO.setN(absolutePath);
+ taskMediaFileVO.setN(fileEntity.getFileUrl());
taskMediaFileVO.setS(BigInteger.valueOf(fileEntity.getOriginSize()));
taskMediaFileVOS.add(taskMediaFileVO);
@@ -381,8 +381,6 @@
}
task.setWeeks("0" + Integer.toBinaryString(byId.getWeek()));
// byId.setWeeks("0" + Integer.toBinaryString(byId.getWeek()));
- task.setBdate(byId.getOnDate());
- task.setEdate(byId.getOffDate());
List<BroadcastV2TaskFile> taskFiles = broadcastV2TaskFileService.list(Wrappers.lambdaQuery(BroadcastV2TaskFile.class)
.eq(BroadcastV2TaskFile::getTaskId, taskId));
@@ -415,6 +413,12 @@
);
}
+// Map map=new HashMap();
+// map.put("鏈湴",byId);
+// map.put("鏈嶅姟鍣�",task);
+
+ System.out.println(JSON.toJSONString(task));
+ System.out.println(task);
return task;
@@ -425,4 +429,7 @@
}
+ public boolean stopTask(Integer taskId) {
+ return TaskAPIUtils.stopTask(taskId);
+ }
}
--
Gitblit v1.9.3