From a84c0acca7e350614ebd3a4855d754c6d6600946 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期二, 08 三月 2022 14:47:04 +0800
Subject: [PATCH] 功能完善
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java | 30 ++++++++++--------------------
1 files changed, 10 insertions(+), 20 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 299dc9c..fa033a7 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,15 +92,15 @@
taskFileEntity.setFileId(fileId);
IpVolumeFile fileEntity = ipVolumeFileService.getById(fileId);
- String absolutePath = MinIoConstant.getAbsolutePath(
- MinIoConstant.BROADCAST_FILE.getBucketName() + fileEntity.getUserId(),
- fileEntity.getFileName()
- );
+// String absolutePath = MinIoConstant.getAbsolutePath(
+// MinIoConstant.BROADCAST_FILE.getBucketName() + fileEntity.getUserId(),
+// fileEntity.getFileName()
+// );
taskMediaFileVO.setI(i);
i++;
taskMediaFileVO.setT(0);
- taskMediaFileVO.setN(absolutePath);
+ taskMediaFileVO.setN(fileEntity.getFileUrl());
taskMediaFileVO.setS(BigInteger.valueOf(fileEntity.getOriginSize()));
taskMediaFileVOS.add(taskMediaFileVO);
@@ -113,7 +113,7 @@
System.out.println("---------------------------");
// 鍚慖P闊虫煴鏈嶅姟鍣ㄦ坊鍔犱换鍔�
Integer taskId = TaskAPIUtils.addTask(missionparam);
- // Integer taskId = 1111;
+// Integer taskId = 1111;
if (null != taskId && taskId != 0) {
IpVolumeMission byId = getById(taskId);
@@ -157,8 +157,8 @@
mission.setMissionVolume(missionparam.getMissionVolume());
mission.setMissionFileUrl(missionparam.getFiles().toString());
mission.setNumberInPlay(missionparam.getTerminals().length);
- System.out.println(updateById(mission));
- System.out.println("----------------------------------------------------------");
+ /* System.out.println(updateById(mission));
+ System.out.println("----------------------------------------------------------");*/
}
broadcastV2TaskFileService.deleteByTaskId(taskId);
broadcastV2TaskTerminalService.deleteByTaskId(taskId);
@@ -318,25 +318,15 @@
}
-// public List<IpVolumeMission> listMission(ReceiveParam receiveParam) {
-//
-// LambdaQueryWrapper<IpVolumeMission> wrapper = Wrappers.lambdaQuery(IpVolumeMission.class).eq(IpVolumeMission::getClientId, SecurityUtils.getUserId()).like(IpVolumeMission::getMissionName, receiveParam.getKeyWord());
-//
-// return list(wrapper);
-// }
public List<IpVolumeMissionBo> missionList(BaseConditionVO baseConditionVO,String keyword) {
- PageHelper.startPage(baseConditionVO.getPageNo(),baseConditionVO.getPageSize());
+ // PageHelper.startPage(baseConditionVO.getPageNo(),baseConditionVO.getPageSize());
boolean r = clientService.findClientId(); //ture浠ｈ〃鏈変笂绾у鎴� 鏌ヨ閫氳繃userID
List<IpVolumeMissionBo> ipVolumeMissionBos = new ArrayList<>();
LambdaQueryWrapper<IpVolumeMission> eq=new LambdaQueryWrapper<>();
-// if(r.equals(-1L)){
-// ipVolumeMissionBos = ipVolumeMissionMapper.listAllByClientId(r);
-// }else {
-// ipVolumeMissionBos = ipVolumeMissionMapper.listAllByUserId(SecurityUtils.getUserId());
-// }
+ PageHelper.startPage(baseConditionVO.getPageNo(),baseConditionVO.getPageSize());
if(r){
eq = Wrappers.lambdaQuery(IpVolumeMission.class).eq(IpVolumeMission::getUserId, SecurityUtils.getUserId());
}else {
--
Gitblit v1.9.3