From d9a9d8a2dad1d1e57b184bf8f972a03d654d883a Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 22 七月 2022 15:07:01 +0800
Subject: [PATCH] 优化
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java | 42 ++++++++++++++++++++++++++++++++----------
1 files changed, 32 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 d1c0b33..4837ce6 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
@@ -20,6 +20,7 @@
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;
@@ -365,22 +366,43 @@
}
- public List<IpVolumeMissionBo> missionList(BaseConditionVO baseConditionVO, String keyword, String orderBy) {
- if (orderBy.isEmpty() || orderBy == null) {
- orderBy = "id desc";
- }
+ public List<IpVolumeMissionBo> missionList(BaseConditionVO baseConditionVO, String keyword, Integer order, Integer seq) {
- if ("createTime-1".equals(orderBy)) {
- orderBy = "create_time asc";
- } else if ("createTime-2".equals(orderBy)) {
- orderBy = "create_time desc";
+
+ //鎺掑簭瀛楁
+ String orderByResult = "task_id";
+ //姝ｅ簭銆佸�掑彊
+ String orderBySeq = "ASC";
+ if (order != null) {
+ switch (order) {
+ case 1:
+ orderByResult = OrderByEnums.IP_VOLUME_MISSION_CREATE_TIME.getCode();
+ break;
+ default:
+ }
}
- PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(), orderBy);
+ 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 -> {
--
Gitblit v1.9.3