From 161b775f40d5d168cc98240165c57887ee8c8df8 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 27 五月 2022 17:21:55 +0800
Subject: [PATCH] 排序
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeFileService.java | 25 ++++++++++---------------
1 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeFileService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeFileService.java
index 60054af..a9d6988 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeFileService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeFileService.java
@@ -16,10 +16,10 @@
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.dao.domain.IpVolumeFile;
+import com.sandu.ximon.dao.enums.OrderByEnums;
import com.sandu.ximon.dao.mapper.IpVolumeFileMapper;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.multipart.MultipartFile;
import java.util.List;
@@ -40,15 +40,10 @@
public boolean addFile(IpVolumeFileParam fileParam) {
IpVolumeFile file = new IpVolumeFile();
-// if(SecurityUtils.getClientId()!=null){
-// file.setUserName(SecurityUtils.getUsername());
-// }
-//
- if (SecurityUtils.getClientId() != null) {
- file.setUserName(SecurityUtils.getUsername());
- file.setUserId(SecurityUtils.getClientId());
- file.setClientId(clientService.getClientId());
- }
+
+ file.setUserName(SecurityUtils.getUsername());
+ file.setUserId(SecurityUtils.getClientId());
+ file.setClientId(clientService.getClientId());
file.setFileName(fileParam.getFileName());
file.setFileUrl(fileParam.getFileUrl());
@@ -107,13 +102,13 @@
}
//鎺掑簭瀛楁
- String orderByResult = "create_time";
+ String orderByResult = "id";
//姝ｅ簭銆佸�掑彊
- String orderBySeq = "ASC";
+ String orderBySeq = OrderByEnums.ASC.getCode();
if (order != null) {
switch (order) {
case 1:
- orderByResult = "create_time";
+ orderByResult = OrderByEnums.IP_VOLUME_FILE_CREATE_TIME.getCode();
break;
default:
}
@@ -121,10 +116,10 @@
if (seq != null) {
switch (seq) {
case 1:
- orderBySeq = " ASC";
+ orderBySeq = OrderByEnums.ASC.getCode();
break;
case 2:
- orderBySeq = " DESC";
+ orderBySeq = OrderByEnums.DESC.getCode();
break;
default:
break;
--
Gitblit v1.9.3