From 52eb3f0befcb397d2fdd645c8d7471d6ee477f87 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 09 五月 2022 16:36:38 +0800
Subject: [PATCH] 权限
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java | 84 +++++++++++++++++++++++++++--------------
1 files changed, 55 insertions(+), 29 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 492ad03..89a7f60 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
@@ -85,7 +85,7 @@
// 灏佽鎾斁鏂囦欢鍒楄〃
List<TaskMediaFileVO> taskMediaFileVOS = new ArrayList<>();
List<BroadcastV2TaskFile> taskFileEntityList = new ArrayList<>();
- int i = 6666;
+ int i = 1;
for (Integer fileId : new HashSet<>(missionparam.getFileIds())) {
TaskMediaFileVO taskMediaFileVO = new TaskMediaFileVO();
BroadcastV2TaskFile taskFileEntity = new BroadcastV2TaskFile();
@@ -96,7 +96,7 @@
if (fileEntity == null) {
throw new BusinessException("fileId涓�" + fileId + "鐨勬枃浠朵笉瀛樺湪");
}
- if(fileEntity.getUserId()==null&&fileEntity.getClientId()!=null){
+ if (fileEntity.getUserId() == null && fileEntity.getClientId() != null) {
fileEntity.setUserId(fileEntity.getClientId());
}
String absolutePath;
@@ -104,7 +104,7 @@
MinIoConstant.BROADCAST_FILE.getBucketName() + fileEntity.getUserId(),
fileEntity.getFileName()
);
- if(fileEntity.getUserId()==null&&fileEntity.getClientId()==null){
+ if (fileEntity.getUserId() == null && fileEntity.getClientId() == null) {
absolutePath = MinIoConstant.getAbsolutePath(
MinIoConstant.ADMIN_BROADCAST_FILE.getBucketName(),
fileEntity.getFileName()
@@ -224,10 +224,17 @@
taskFileEntity.setFileId(fileId);
IpVolumeFile fileEntity = ipVolumeFileService.getById(fileId);
- String absolutePath = MinIoConstant.getAbsolutePath(
+ String absolutePath;
+ absolutePath = MinIoConstant.getAbsolutePath(
MinIoConstant.BROADCAST_FILE.getBucketName() + fileEntity.getUserId(),
fileEntity.getFileName()
);
+ if (fileEntity.getUserId() == null && fileEntity.getClientId() == null) {
+ absolutePath = MinIoConstant.getAbsolutePath(
+ MinIoConstant.ADMIN_BROADCAST_FILE.getBucketName(),
+ fileEntity.getFileName()
+ );
+ }
taskMediaFileVO.setI(i);
i++;
@@ -242,7 +249,6 @@
missionparam.setFiles(taskMediaFileVOS.toArray(new TaskMediaFileVO[taskMediaFileVOS.size()]));
missionparam.setTerminals(taskTerminalVOList.toArray(new TaskTerminalVO[taskTerminalVOList.size()]));
- System.out.println("---------------------------");
// 鍚慖P闊虫煴鏈嶅姟鍣ㄦ洿鏂颁换鍔�
Integer result = TaskAPIUtils.updateTask(taskId, missionparam);
@@ -327,25 +333,22 @@
public List<IpVolumeMissionBo> missionList(BaseConditionVO baseConditionVO, String keyword) {
- // PageHelper.startPage(baseConditionVO.getPageNo(),baseConditionVO.getPageSize());
- boolean r = clientService.findClientId(); //ture浠ｈ〃鏈変笂绾у鎴� 鏌ヨ閫氳繃userID
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
List<IpVolumeMissionBo> ipVolumeMissionBos = new ArrayList<>();
- LambdaQueryWrapper<IpVolumeMission> eq = new LambdaQueryWrapper<>();
+ LambdaQueryWrapper<IpVolumeMission> eq = Wrappers.lambdaQuery(IpVolumeMission.class);
PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
- if (r) {
- eq = Wrappers.lambdaQuery(IpVolumeMission.class).eq(IpVolumeMission::getUserId, SecurityUtils.getUserId());
- } else {
- eq = Wrappers.lambdaQuery(IpVolumeMission.class).eq(IpVolumeMission::getClientId, SecurityUtils.getUserId());
+ //涓嶆槸瓒呯
+ if (SecurityUtils.getClientId() != null) {
+ eq = eq.eq(IpVolumeMission::getUserId, SecurityUtils.getUserId()).or(w -> {
+ w.eq(IpVolumeMission::getClientId, SecurityUtils.getUserId());
+ });
}
- if (!keyword.isEmpty()) {
+ if (keyword != null && !keyword.isEmpty()) {
eq.like(IpVolumeMission::getMissionName, keyword);
}
List<IpVolumeMission> list = list(eq);
-
-
- // ipVolumeMissionBos = ipVolumeMissionMapper.listAllByClientId();
for (IpVolumeMission mission : list) {
List<String> fileName = broadcastV2TaskFileService.findByTaskid(mission.getTaskId());
@@ -353,16 +356,9 @@
BeanUtils.copyProperties(mission, bo);
bo.setFileNames(fileName);
ipVolumeMissionBos.add(bo);
-
}
-// for (IpVolumeMissionBo missionBo: ipVolumeMissionBos) {
-// missionBo.setFileNames(broadcastV2TaskFileService.findByTaskid(missionBo.getTaskId()));
-//
-// }
-
return ipVolumeMissionBos;
- //return new ArrayList<>();
}
public TaskVO getByTaskId(Integer taskId) {
@@ -377,25 +373,26 @@
}
if (SecurityUtils.getClientId() != null) {
if (clientService.findClientId()) {
- if (byId.getUserId() != SecurityUtils.getUserId()) {
+ if (byId.getUserId().equals(SecurityUtils.getUserId())) {
throw new BusinessException("浠诲姟褰掑睘閿欒");
}
} else {
- if (byId.getClientId() != SecurityUtils.getUserId()) {
+ if (byId.getClientId().equals(SecurityUtils.getUserId())) {
throw new BusinessException("浠诲姟褰掑睘閿欒");
}
}
}
- task.setWeeks("0" + Integer.toBinaryString(byId.getWeek()));
+ task.setWeeks("0" + Integer.toBinaryString(task.getWeek()));
// byId.setWeeks("0" + Integer.toBinaryString(byId.getWeek()));
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()) {
taskFiles.forEach(
@@ -423,9 +420,6 @@
);
}
-// Map map=new HashMap();
-// map.put("鏈湴",byId);
-// map.put("鏈嶅姟鍣�",task);
System.out.println(JSON.toJSONString(task));
System.out.println(task);
@@ -434,12 +428,44 @@
}
+ /**
+ * 鎺ㄩ��
+ *
+ * @param taskId
+ * @return
+ */
public boolean playTask(Integer taskId) {
return TaskAPIUtils.playTask(taskId);
}
+ /**
+ * 鍋滄
+ *
+ * @param taskId
+ * @return
+ */
public boolean stopTask(Integer taskId) {
return TaskAPIUtils.stopTask(taskId);
}
+
+ /**
+ * 鏆傚仠
+ *
+ * @param taskId
+ * @return
+ */
+ public boolean pauseTask(Integer taskId) {
+ return TaskAPIUtils.pauseTask(taskId);
+ }
+
+ /**
+ * 缁х画
+ *
+ * @param taskId
+ * @return
+ */
+ public boolean continueTask(Integer taskId) {
+ return TaskAPIUtils.continueTask(taskId);
+ }
}
--
Gitblit v1.9.3