From 26d8dda66a3225a74e3ce1cf6517636c81cb007e Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期二, 17 五月 2022 11:46:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java | 65 ++++++++++++++++++++++++--------
1 files changed, 49 insertions(+), 16 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 89a7f60..8b32e4c 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,5 +1,6 @@
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;
@@ -7,18 +8,17 @@
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;
+import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.admin.utils.TaskAPIUtils;
import com.sandu.ximon.admin.vo.TaskMediaFileVO;
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;
@@ -28,6 +28,7 @@
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
+import java.util.stream.Collectors;
/**
* @Author liuhaonan
@@ -45,9 +46,6 @@
private final BroadcastV2TaskTerminalService broadcastV2TaskTerminalService;
- /*public boolean add1() {
- return broadcastV2TaskTerminalService.save();
- }*/
public boolean addMission(IpVolumeMissionParam missionparam) {
String taskName = missionparam.getMissionName();
@@ -128,6 +126,7 @@
Integer taskId = TaskAPIUtils.addTask(missionparam);
// Integer taskId = 1111;
+ boolean flag;
if (null != taskId && taskId != 0) {
IpVolumeMission byId = getById(taskId);
for (BroadcastV2TaskTerminal v2TaskTerminal : taskTerminalEntityList) {
@@ -174,11 +173,25 @@
broadcastV2TaskTerminalService.deleteByTaskId(taskId);
broadcastV2TaskTerminalService.saveTaskTerminal(taskTerminalEntityList);
broadcastV2TaskFileService.saveBatch(taskFileEntityList);
- return true;
+ flag = true;
} else {
- return false;
+ flag = false;
}
+ /**
+ * IP闊虫煴浠诲姟娣诲姞鏃ュ織璁板綍寮�濮�
+ */
+ String content = "{浠诲姟ID锛�" + taskId
+ + "锛屼换鍔″悕锛�" + taskName
+ + "锛岃澶嘔D闆嗗悎锛�" + missionparam.getTerminalIds()
+ + " }";
+ StoreOperationRecordsUtils.storeOperationData(missionparam.getTerminalIds(), null, "IP闊虫煴浠诲姟娣诲姞", content);
+ /**
+ * IP闊虫煴浠诲姟娣诲姞鏃ュ織璁板綍缁撴潫
+ */
+
+
+ return flag;
}
public Integer updateMission(Integer taskId, IpVolumeMissionParam missionparam) {
@@ -300,11 +313,21 @@
broadcastV2TaskTerminalService.deleteByTaskId(taskId);
broadcastV2TaskTerminalService.saveBatch(taskTerminalEntityList);
broadcastV2TaskFileService.saveBatch(taskFileEntityList);
- return 0;
-
- } else {
- return result;
}
+ /**
+ * IP闊虫煴浠诲姟淇敼鏃ュ織璁板綍寮�濮�
+ */
+ String content = "{浠诲姟ID锛�" + taskId
+ + "锛屼换鍔″悕锛�" + taskName
+ + "锛岃澶嘔D闆嗗悎锛�" + missionparam.getTerminalIds()
+ + "锛屼换鍔＄紪杈戠粨鏋滐細" + result
+ + " }";
+ StoreOperationRecordsUtils.storeOperationData(missionparam.getTerminalIds(), null, "IP闊虫煴浠诲姟淇敼", content);
+ /**
+ * IP闊虫煴浠诲姟淇敼鏃ュ織璁板綍缁撴潫
+ */
+ return result;
+
}
/**
@@ -324,11 +347,21 @@
broadcastV2TaskFileService.deleteByTaskId(taskId);
broadcastV2TaskTerminalService.deleteByTaskId(taskId);
// broadcastV2TaskTerminalService.removeById(taskId);
- return 0;
- } else {
- return del;
}
+ /**
+ * IP闊虫煴浠诲姟鍒犻櫎鏃ュ織璁板綍寮�濮�
+ */
+ String content = "{鍒犻櫎鐨勪换鍔D锛�" + taskId
+ + "锛屼换鍔″垹闄ょ粨鏋滐細" + del
+ + " }";
+ StoreOperationRecordsUtils.storeOperationData(null, null, "IP闊虫煴浠诲姟鍒犻櫎", content);
+ /**
+ * IP闊虫煴浠诲姟鍒犻櫎鏃ュ織璁板綍缁撴潫
+ */
+
+
+ return del;
}
--
Gitblit v1.9.3