From 8a74d51dafd928a038dfeae9872b513ce8f62ad6 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 27 五月 2022 13:36:59 +0800
Subject: [PATCH] 排序
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java | 72 ++++++++++++++++++++++++++++-------
1 files changed, 57 insertions(+), 15 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 af2b08a..d1c0b33 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
@@ -10,6 +10,7 @@
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;
@@ -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,16 +347,35 @@
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;
}
- public List<IpVolumeMissionBo> missionList(BaseConditionVO baseConditionVO, String keyword) {
- PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ public List<IpVolumeMissionBo> missionList(BaseConditionVO baseConditionVO, String keyword, String orderBy) {
+ if (orderBy.isEmpty() || orderBy == null) {
+ orderBy = "id desc";
+ }
+
+ if ("createTime-1".equals(orderBy)) {
+ orderBy = "create_time asc";
+ } else if ("createTime-2".equals(orderBy)) {
+ orderBy = "create_time desc";
+ }
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(), orderBy);
List<IpVolumeMissionBo> ipVolumeMissionBos = new ArrayList<>();
LambdaQueryWrapper<IpVolumeMission> eq = Wrappers.lambdaQuery(IpVolumeMission.class);
@@ -345,7 +387,7 @@
w.eq(IpVolumeMission::getClientId, SecurityUtils.getUserId());
});
}
- if (!keyword.isEmpty()) {
+ if (keyword != null && !keyword.isEmpty()) {
eq.like(IpVolumeMission::getMissionName, keyword);
}
List<IpVolumeMission> list = list(eq);
--
Gitblit v1.9.3