From f3da8b091957e0e66b8c22a13ef28cff725298b9 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期二, 22 三月 2022 10:45:12 +0800
Subject: [PATCH] bug修复
---
dao/src/main/java/com/sandu/ximon/dao/bo/IpVolumeMissionBo.java | 4 ++
dao/src/main/java/com/sandu/ximon/dao/mapper/IpVolumeMissionMapper.java | 2 +
ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java | 1
ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java | 57 +++++++++++++++++++++++++---
dao/src/main/java/com/sandu/ximon/dao/domain/IpVolumeMission.java | 15 ++++++-
5 files changed, 71 insertions(+), 8 deletions(-)
diff --git a/dao/src/main/java/com/sandu/ximon/dao/bo/IpVolumeMissionBo.java b/dao/src/main/java/com/sandu/ximon/dao/bo/IpVolumeMissionBo.java
index bb007c9..32a4be3 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/bo/IpVolumeMissionBo.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/bo/IpVolumeMissionBo.java
@@ -30,4 +30,8 @@
private List<String> fileNames;
+// private List files;
+//
+// private List IpVolumes;
+
}
diff --git a/dao/src/main/java/com/sandu/ximon/dao/domain/IpVolumeMission.java b/dao/src/main/java/com/sandu/ximon/dao/domain/IpVolumeMission.java
index 10f069d..ef03ec6 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/domain/IpVolumeMission.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/domain/IpVolumeMission.java
@@ -8,6 +8,7 @@
import java.io.Serializable;
import java.math.BigInteger;
import java.time.LocalDateTime;
+import java.util.ArrayList;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -50,6 +51,7 @@
/**
* 鏂囦欢url
*/
+ @JsonIgnore
private String missionFileUrl;
/**
@@ -86,8 +88,17 @@
*/
private Integer missionVolume;
- /*@TableField
- private List<IpVolumeFile> files;*/
+// @TableField(exist = false)
+// private List<IpVolumeFile> files=new ArrayList<>();
+//
+// @TableField(exist = false)
+// private List<BroadcastTerminalV2Entity> BroadcastTerminal=new ArrayList<>();
+
+ @TableField(exist = false)
+ private List<Integer> fileIds=new ArrayList<>();
+
+ @TableField(exist = false)
+ private List<Integer> TerminalIds=new ArrayList<>();
/*@TableField
private List<String> fileNames;*/
diff --git a/dao/src/main/java/com/sandu/ximon/dao/mapper/IpVolumeMissionMapper.java b/dao/src/main/java/com/sandu/ximon/dao/mapper/IpVolumeMissionMapper.java
index 04254ec..2a5e897 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/mapper/IpVolumeMissionMapper.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/mapper/IpVolumeMissionMapper.java
@@ -18,6 +18,8 @@
List<IpVolumeMissionBo> listAllByUserId(Long userId);// todo 浠诲姟褰掑睘
+
+
}
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..08f447a 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
@@ -14,10 +14,7 @@
import com.sandu.ximon.admin.vo.TaskTerminalVO;
import com.sandu.ximon.admin.vo.TaskVO;
import com.sandu.ximon.dao.bo.IpVolumeMissionBo;
-import com.sandu.ximon.dao.domain.BroadcastV2TaskFile;
-import com.sandu.ximon.dao.domain.BroadcastV2TaskTerminal;
-import com.sandu.ximon.dao.domain.IpVolumeFile;
-import com.sandu.ximon.dao.domain.IpVolumeMission;
+import com.sandu.ximon.dao.domain.*;
import com.sandu.ximon.dao.mapper.IpVolumeMissionMapper;
import lombok.AllArgsConstructor;
import org.springframework.beans.BeanUtils;
@@ -39,6 +36,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 +90,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(),
@@ -365,9 +363,56 @@
if (byId == null) {
throw new BusinessException("鏈湴鏈壘鍒拌浠诲姟");
}
+ if (SecurityUtils.getClientId() != null) {
+ if (clientService.findClientId()) {
+ if (byId.getUserId() != SecurityUtils.getUserId()) {
+ throw new BusinessException("浠诲姟褰掑睘閿欒");
+ }
+
+ } else {
+ if (byId.getClientId() != SecurityUtils.getUserId()) {
+ throw new BusinessException("浠诲姟褰掑睘閿欒");
+ }
+ }
+
+
+ }
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->{
+// IpVolumeFile volumeFile = ipVolumeFileService.getById(fileId.getFileId());
+// if(volumeFile==null){
+// throw new BusinessException("浠诲姟鏂囦欢涓嶅瓨鍦�");
+// }
+ byId.getFileIds().add(fileId.getFileId());
+ }
+ );
+
+ }
+ if(!taskTerminals.isEmpty()){
+ taskTerminals.forEach(
+ terminalId->{
+// BroadcastTerminalV2Entity v2Entity = ipVolumeService.getById(terminalId.getTerminalId());
+// if(v2Entity==null){
+// throw new BusinessException("璇ヤ换鍔℃殏鏃犺澶囦娇鐢�");
+// }
+ byId.getTerminalIds().add(terminalId.getTerminalId());
+ }
+ );
+ }
+
return byId;
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java
index 856ea90..cae2ae4 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java
@@ -46,6 +46,7 @@
poleXixunPlayer.setHeight(programPro.getHeight());
poleXixunPlayer.setWidth(programPro.getWidth());
poleXixunPlayer.setTotalSize((float) programPro.getTotalSize() / 1000000 + "MB");
+// poleXixunPlayer.setTotalSize( Long.parseLong(programPro.getTotalSize()) / 1000000 + "MB");
// programPro.setProgramId(poleXixunPlayer.getProgramId());
// System.out.println(poleXixunPlayer.getProgramId());
poleXixunPlayer.setRequestBody(json);
--
Gitblit v1.9.3