From 55f49e493396d14689103f1912cb77fd653461cc Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期二, 22 三月 2022 18:00:21 +0800
Subject: [PATCH] c3m预付款以及ip音柱完善
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java | 34 +++++++++++++++++++---------------
1 files changed, 19 insertions(+), 15 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 08f447a..b98e853 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,7 +14,10 @@
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.*;
+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.mapper.IpVolumeMissionMapper;
import lombok.AllArgsConstructor;
import org.springframework.beans.BeanUtils;
@@ -22,7 +25,6 @@
import java.math.BigInteger;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.HashSet;
import java.util.List;
@@ -353,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("鏈嶅姟鍣ㄦ湭鎵惧埌璇ヤ换鍔�");
@@ -377,8 +379,8 @@
}
-
- byId.setWeeks("0" + Integer.toBinaryString(byId.getWeek()));
+ 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)
@@ -389,31 +391,33 @@
// if(taskFiles.isEmpty()||taskTerminals.isEmpty()){
// throw new BusinessException("");
// }
- if(!taskFiles.isEmpty()){
- taskFiles.forEach(
- fileId->{
+ if (!taskFiles.isEmpty()) {
+ taskFiles.forEach(
+ fileId -> {
// IpVolumeFile volumeFile = ipVolumeFileService.getById(fileId.getFileId());
// if(volumeFile==null){
// throw new BusinessException("浠诲姟鏂囦欢涓嶅瓨鍦�");
// }
- byId.getFileIds().add(fileId.getFileId());
- }
- );
+ task.getFileIds().add(fileId.getFileId());
+// byId.getFileIds().add(fileId.getFileId());
+ }
+ );
}
- if(!taskTerminals.isEmpty()){
+ if (!taskTerminals.isEmpty()) {
taskTerminals.forEach(
- terminalId->{
+ terminalId -> {
// BroadcastTerminalV2Entity v2Entity = ipVolumeService.getById(terminalId.getTerminalId());
// if(v2Entity==null){
// throw new BusinessException("璇ヤ换鍔℃殏鏃犺澶囦娇鐢�");
// }
- byId.getTerminalIds().add(terminalId.getTerminalId());
+ task.getTerminalIds().add(terminalId.getTerminalId());
+// byId.getTerminalIds().add(terminalId.getTerminalId());
}
);
}
- return byId;
+ return task;
}
--
Gitblit v1.9.3