From 78c7b03e279cad29a6123e83da738edc1f00280c Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期四, 23 六月 2022 16:55:41 +0800
Subject: [PATCH] bug修复
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java | 51 +++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 41 insertions(+), 10 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..3a3e91e 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
@@ -315,7 +316,7 @@
broadcastV2TaskFileService.saveBatch(taskFileEntityList);
}
/**
- * IP闊虫煴浠诲姟淇敼鏃ュ織璁板綍寮�濮�
+ * IP闊虫煴浠诲姟淇敼 鏃ュ織璁板綍寮�濮�
*/
String content = "{浠诲姟ID锛�" + taskId
+ "锛屼换鍔″悕锛�" + taskName
@@ -324,7 +325,7 @@
+ " }";
StoreOperationRecordsUtils.storeOperationData(missionparam.getTerminalIds(), null, "IP闊虫煴浠诲姟淇敼", content);
/**
- * IP闊虫煴浠诲姟淇敼鏃ュ織璁板綍缁撴潫
+ * IP闊虫煴浠诲姟淇敼 鏃ュ織璁板綍缁撴潫
*/
return result;
@@ -350,14 +351,14 @@
}
/**
- * IP闊虫煴浠诲姟鍒犻櫎鏃ュ織璁板綍寮�濮�
+ * IP闊虫煴浠诲姟鍒犻櫎 鏃ュ織璁板綍寮�濮�
*/
String content = "{鍒犻櫎鐨勪换鍔D锛�" + taskId
+ "锛屼换鍔″垹闄ょ粨鏋滐細" + del
+ " }";
StoreOperationRecordsUtils.storeOperationData(null, null, "IP闊虫煴浠诲姟鍒犻櫎", content);
/**
- * IP闊虫煴浠诲姟鍒犻櫎鏃ュ織璁板綍缁撴潫
+ * IP闊虫煴浠诲姟鍒犻櫎 鏃ュ織璁板綍缁撴潫
*/
@@ -365,8 +366,38 @@
}
- 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 = "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);
--
Gitblit v1.9.3