From ef270bd1855b5ce3f398c5df024840a498e33a8f Mon Sep 17 00:00:00 2001
From: MercuryZ <zdmisif@126.com>
Date: 星期四, 31 三月 2022 14:09:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 53 insertions(+), 6 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 0d2cdba..5bf9528 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
@@ -25,7 +25,6 @@
import java.math.BigInteger;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.HashSet;
import java.util.List;
@@ -39,6 +38,7 @@
public class IpVolumeMissionService extends BaseServiceImpl<IpVolumeMissionMapper, IpVolumeMission> {
private final IpVolumeMissionMapper ipVolumeMissionMapper;
private final ClientService clientService;
+ private final IpVolumeService ipVolumeService;
private final IpVolumeFileService ipVolumeFileService;
private final BroadcastV2TaskFileService broadcastV2TaskFileService;
private final BroadcastV2TaskTerminalService broadcastV2TaskTerminalService;
@@ -92,8 +92,8 @@
taskFileEntity.setFileId(fileId);
IpVolumeFile fileEntity = ipVolumeFileService.getById(fileId);
- if(fileEntity==null){
- throw new BusinessException("fileId涓�"+fileId+"鐨勬枃浠朵笉瀛樺湪");
+ if (fileEntity == null) {
+ throw new BusinessException("fileId涓�" + fileId + "鐨勬枃浠朵笉瀛樺湪");
}
// String absolutePath = MinIoConstant.getAbsolutePath(
// MinIoConstant.BROADCAST_FILE.getBucketName() + fileEntity.getUserId(),
@@ -355,7 +355,7 @@
//return new ArrayList<>();
}
- public IpVolumeMission getByTaskId(Integer taskId) {
+ public TaskVO getByTaskId(Integer taskId) {
TaskVO task = TaskAPIUtils.getTask(taskId);
if (task == null) {
throw new BusinessException("鏈嶅姟鍣ㄦ湭鎵惧埌璇ヤ换鍔�");
@@ -365,10 +365,57 @@
if (byId == null) {
throw new BusinessException("鏈湴鏈壘鍒拌浠诲姟");
}
+ if (SecurityUtils.getClientId() != null) {
+ if (clientService.findClientId()) {
+ if (byId.getUserId() != SecurityUtils.getUserId()) {
+ throw new BusinessException("浠诲姟褰掑睘閿欒");
+ }
- byId.setWeeks("0" + Integer.toBinaryString(byId.getWeek()));
+ } else {
+ if (byId.getClientId() != SecurityUtils.getUserId()) {
+ throw new BusinessException("浠诲姟褰掑睘閿欒");
+ }
+ }
- return byId;
+
+ }
+ 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));
+ List<BroadcastV2TaskTerminal> taskTerminals = broadcastV2TaskTerminalService.list(Wrappers.lambdaQuery(BroadcastV2TaskTerminal.class)
+ .eq(BroadcastV2TaskTerminal::getTaskId, taskId));
+
+ if (!taskFiles.isEmpty()) {
+ taskFiles.forEach(
+ fileId -> {
+// IpVolumeFile volumeFile = ipVolumeFileService.getById(fileId.getFileId());
+// if(volumeFile==null){
+// throw new BusinessException("浠诲姟鏂囦欢涓嶅瓨鍦�");
+// }
+ task.getFileIds().add(fileId.getFileId());
+// byId.getFileIds().add(fileId.getFileId());
+ }
+ );
+
+ }
+ if (!taskTerminals.isEmpty()) {
+ taskTerminals.forEach(
+ terminalId -> {
+// BroadcastTerminalV2Entity v2Entity = ipVolumeService.getById(terminalId.getTerminalId());
+// if(v2Entity==null){
+// throw new BusinessException("璇ヤ换鍔℃殏鏃犺澶囦娇鐢�");
+// }
+ task.getTerminalIds().add(terminalId.getTerminalId());
+// byId.getTerminalIds().add(terminalId.getTerminalId());
+ }
+ );
+ }
+
+ return task;
}
--
Gitblit v1.9.3