From fc34005a2bb11d57a9d7eba2ae9f1b7492d570d1 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期三, 09 三月 2022 18:30:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java | 17 +++++++----------
1 files changed, 7 insertions(+), 10 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 2ff1e96..0d2cdba 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
@@ -92,6 +92,9 @@
taskFileEntity.setFileId(fileId);
IpVolumeFile fileEntity = ipVolumeFileService.getById(fileId);
+ if(fileEntity==null){
+ throw new BusinessException("fileId涓�"+fileId+"鐨勬枃浠朵笉瀛樺湪");
+ }
// String absolutePath = MinIoConstant.getAbsolutePath(
// MinIoConstant.BROADCAST_FILE.getBucketName() + fileEntity.getUserId(),
// fileEntity.getFileName()
@@ -138,9 +141,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("----------------------------------------------------------");
@@ -157,17 +159,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.removeById(taskId);
broadcastV2TaskTerminalService.saveTaskTerminal(taskTerminalEntityList);
broadcastV2TaskFileService.saveBatch(taskFileEntityList);
-// broadcastV2TaskTerminalService.saveBatch(taskTerminalEntityList);
-// broadcastV2TaskTerminalService.insertTaskTerminal(taskTerminalEntityList);
-
return true;
} else {
return false;
@@ -309,8 +305,9 @@
return -1;
}
removeById(taskId);
- broadcastV2TaskFileService.removeById(taskId);
- broadcastV2TaskTerminalService.removeById(taskId);
+ broadcastV2TaskFileService.deleteByTaskId(taskId);
+ broadcastV2TaskTerminalService.deleteByTaskId(taskId);
+// broadcastV2TaskTerminalService.removeById(taskId);
return 0;
} else {
return del;
--
Gitblit v1.9.3