From f2dfd5e6fbbb9c4e96e91c86be0bb6f7a44d87c3 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 18 四月 2022 11:56:21 +0800
Subject: [PATCH] LED屏列表
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java | 81 ++++++++++++++++++++++++++++++++--------
1 files changed, 64 insertions(+), 17 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 76a8f83..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
@@ -7,6 +7,7 @@
import com.sandu.common.execption.BusinessException;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
+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 = 6666;
+ int i = 1;
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);
@@ -214,15 +224,22 @@
taskFileEntity.setFileId(fileId);
IpVolumeFile fileEntity = ipVolumeFileService.getById(fileId);
-// String absolutePath = MinIoConstant.getAbsolutePath(
-// MinIoConstant.BROADCAST_FILE.getBucketName() + fileEntity.getUserId(),
-// fileEntity.getFileName()
-// );
+ 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);
@@ -232,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);
@@ -379,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(
@@ -413,9 +431,6 @@
);
}
-// Map map=new HashMap();
-// map.put("鏈湴",byId);
-// map.put("鏈嶅姟鍣�",task);
System.out.println(JSON.toJSONString(task));
System.out.println(task);
@@ -424,12 +439,44 @@
}
+ /**
+ * 鎺ㄩ��
+ *
+ * @param taskId
+ * @return
+ */
public boolean playTask(Integer taskId) {
return TaskAPIUtils.playTask(taskId);
}
+ /**
+ * 鍋滄
+ *
+ * @param taskId
+ * @return
+ */
public boolean stopTask(Integer taskId) {
return TaskAPIUtils.stopTask(taskId);
}
+
+ /**
+ * 鏆傚仠
+ *
+ * @param taskId
+ * @return
+ */
+ public boolean pauseTask(Integer taskId) {
+ return TaskAPIUtils.pauseTask(taskId);
+ }
+
+ /**
+ * 缁х画
+ *
+ * @param taskId
+ * @return
+ */
+ public boolean continueTask(Integer taskId) {
+ return TaskAPIUtils.continueTask(taskId);
+ }
}
--
Gitblit v1.9.3