From db79eca1d06cc0f3cfb5aae710262aedfb95577e Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期二, 22 三月 2022 14:35:22 +0800
Subject: [PATCH] c3m退款实现
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java | 67 ++++++++++++++++++++++++++-------
1 files changed, 52 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 a2f0616..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(),
@@ -141,9 +139,8 @@
mission.setOffDate(missionparam.getOffDate());
mission.setWeek(Integer.parseInt(missionparam.getWeek(), 2));//鏃堕棿鐢变簩杩涘埗瀛楃涓茶浆鎹负鍗佽繘鍒�
mission.setMissionVolume(missionparam.getMissionVolume());
- //mission.setMissionFileUrl(missionparam.getFiles().toString());
mission.setNumberInPlay(missionparam.getTerminals().length);
- /*TaskTerminalVO[] terminals = missionparam.getTerminals();*/
+
System.out.println(save(mission));
System.out.println("----------------------------------------------------------");
@@ -160,18 +157,11 @@
mission.setMissionVolume(missionparam.getMissionVolume());
mission.setMissionFileUrl(missionparam.getFiles().toString());
mission.setNumberInPlay(missionparam.getTerminals().length);
- /* System.out.println(updateById(mission));
- System.out.println("----------------------------------------------------------");*/
}
broadcastV2TaskFileService.deleteByTaskId(taskId);
broadcastV2TaskTerminalService.deleteByTaskId(taskId);
-// broadcastV2TaskTerminalService.deleteByTaskId(taskId);
-// broadcastV2TaskTerminalService.removeById(taskId);
broadcastV2TaskTerminalService.saveTaskTerminal(taskTerminalEntityList);
broadcastV2TaskFileService.saveBatch(taskFileEntityList);
-// broadcastV2TaskTerminalService.saveBatch(taskTerminalEntityList);
-// broadcastV2TaskTerminalService.insertTaskTerminal(taskTerminalEntityList);
-
return true;
} else {
return false;
@@ -373,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;
--
Gitblit v1.9.3