From 350608105f300c6c629d743dc9896feca2f22e8d Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期二, 25 十月 2022 16:11:49 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java | 71 ++++++++++++++++++++++++++++-------
1 files changed, 57 insertions(+), 14 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 8b32e4c..3ba73ec 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
@@ -1,6 +1,5 @@
package com.sandu.ximon.admin.service;
-import cn.hutool.core.collection.CollectionUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -8,7 +7,6 @@
import com.sandu.common.execption.BusinessException;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
-import com.sandu.common.util.SpringContextHolder;
import com.sandu.ximon.admin.minio.entity.MinIoConstant;
import com.sandu.ximon.admin.param.IpVolumeMissionParam;
import com.sandu.ximon.admin.security.SecurityUtils;
@@ -18,7 +16,11 @@
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.enums.OrderByEnums;
import com.sandu.ximon.dao.mapper.IpVolumeMissionMapper;
import lombok.AllArgsConstructor;
import org.springframework.beans.BeanUtils;
@@ -28,7 +30,6 @@
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
-import java.util.stream.Collectors;
/**
* @Author liuhaonan
@@ -47,6 +48,18 @@
public boolean addMission(IpVolumeMissionParam missionparam) {
+
+ List<Integer> fileIds = missionparam.getFileIds();
+ List<IpVolumeFile> ipVolumeFiles = ipVolumeFileService.listByIds(fileIds);
+ ipVolumeFiles.forEach(file -> {
+ if (SecurityUtils.getClientId() != null) {
+ //闈炶秴绠＄敤鎴�
+ if (!SecurityUtils.getUserId().equals(file.getClientId()) && !SecurityUtils.getUserId().equals(file.getUserId())) {
+ //鐢ㄦ埛id鍜屽鎴穒d閮戒笉鍖归厤
+ throw new BusinessException("鏂囦欢褰掑睘寮傚父,鍒涘缓浠诲姟澶辫触");
+ }
+ }
+ });
String taskName = missionparam.getMissionName();
@@ -102,7 +115,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()
@@ -315,7 +328,7 @@
broadcastV2TaskFileService.saveBatch(taskFileEntityList);
}
/**
- * IP闊虫煴浠诲姟淇敼鏃ュ織璁板綍寮�濮�
+ * IP闊虫煴浠诲姟淇敼 鏃ュ織璁板綍寮�濮�
*/
String content = "{浠诲姟ID锛�" + taskId
+ "锛屼换鍔″悕锛�" + taskName
@@ -324,7 +337,7 @@
+ " }";
StoreOperationRecordsUtils.storeOperationData(missionparam.getTerminalIds(), null, "IP闊虫煴浠诲姟淇敼", content);
/**
- * IP闊虫煴浠诲姟淇敼鏃ュ織璁板綍缁撴潫
+ * IP闊虫煴浠诲姟淇敼 鏃ュ織璁板綍缁撴潫
*/
return result;
@@ -350,14 +363,14 @@
}
/**
- * IP闊虫煴浠诲姟鍒犻櫎鏃ュ織璁板綍寮�濮�
+ * IP闊虫煴浠诲姟鍒犻櫎 鏃ュ織璁板綍寮�濮�
*/
String content = "{鍒犻櫎鐨勪换鍔D锛�" + taskId
+ "锛屼换鍔″垹闄ょ粨鏋滐細" + del
+ " }";
StoreOperationRecordsUtils.storeOperationData(null, null, "IP闊虫煴浠诲姟鍒犻櫎", content);
/**
- * IP闊虫煴浠诲姟鍒犻櫎鏃ュ織璁板綍缁撴潫
+ * IP闊虫煴浠诲姟鍒犻櫎 鏃ュ織璁板綍缁撴潫
*/
@@ -365,13 +378,43 @@
}
- public List<IpVolumeMissionBo> missionList(BaseConditionVO baseConditionVO, String keyword) {
- PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ public List<IpVolumeMissionBo> missionList(BaseConditionVO baseConditionVO, String keyword, Integer order, Integer seq) {
+
+
+ //鎺掑簭瀛楁
+ String orderByResult = "task_id";
+ //姝ｅ簭銆佸�掑彊
+ String orderBySeq = "ASC";
+ if (order != null) {
+ switch (order) {
+ case 1:
+ orderByResult = OrderByEnums.IP_VOLUME_MISSION_CREATE_TIME.getCode();
+ break;
+ default:
+ }
+ }
+ if (seq != null) {
+ switch (seq) {
+ case 1:
+ orderBySeq = " ASC";
+ break;
+ case 2:
+ orderBySeq = " DESC";
+ break;
+ default:
+ break;
+ }
+ }
+ //鎺掑簭鏂瑰紡
+ String orderBy = orderByResult + " " + orderBySeq;
+ if (baseConditionVO != null) {
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(), orderBy);
+ }
List<IpVolumeMissionBo> ipVolumeMissionBos = new ArrayList<>();
LambdaQueryWrapper<IpVolumeMission> eq = Wrappers.lambdaQuery(IpVolumeMission.class);
- PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+
//涓嶆槸瓒呯
if (SecurityUtils.getClientId() != null) {
eq = eq.eq(IpVolumeMission::getUserId, SecurityUtils.getUserId()).or(w -> {
@@ -406,12 +449,12 @@
}
if (SecurityUtils.getClientId() != null) {
if (clientService.findClientId()) {
- if (byId.getUserId().equals(SecurityUtils.getUserId())) {
+ if (!byId.getUserId().equals(SecurityUtils.getUserId())) {
throw new BusinessException("浠诲姟褰掑睘閿欒");
}
} else {
- if (byId.getClientId().equals(SecurityUtils.getUserId())) {
+ if (!byId.getClientId().equals(SecurityUtils.getUserId()) && !byId.getUserId().equals(SecurityUtils.getUserId())) {
throw new BusinessException("浠诲姟褰掑睘閿欒");
}
}
--
Gitblit v1.9.3