From 0f9ee3de2c058b934cb6e495f9120f7764983e1f Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期二, 27 九月 2022 09:23:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeFileService.java | 67 +++++++++++++++++++++++----------
1 files changed, 46 insertions(+), 21 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 198bfc1..84d3989 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
@@ -1,8 +1,10 @@
package com.sandu.ximon.admin.service;
import com.alibaba.fastjson.JSON;
+import com.alipay.service.schema.util.StringUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.PageHelper;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.file.FileUploadDto;
import com.sandu.common.object.BaseConditionVO;
@@ -15,6 +17,7 @@
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;
@@ -38,15 +41,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());
@@ -90,17 +88,8 @@
return removeById(fileId);
}
- public LambdaQueryWrapper<IpVolumeFile> listFile(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";
- }
+ public List<IpVolumeFile> ipVolumeFileList(BaseConditionVO baseConditionVO, String keyword, Integer order, Integer seq) {
LambdaQueryWrapper<IpVolumeFile> wrapper = Wrappers.lambdaQuery(IpVolumeFile.class);
-
//涓嶆槸瓒呯
if (SecurityUtils.getClientId() != null) {
wrapper = wrapper.eq(IpVolumeFile::getClientId, SecurityUtils.getUserId())
@@ -112,10 +101,43 @@
if (keyword != null && !keyword.isEmpty()) {
wrapper.like(IpVolumeFile::getFileName, keyword);
}
- return wrapper;
+
+ //鎺掑簭瀛楁
+ String orderByResult = "id";
+ //姝ｅ簭銆佸�掑彊
+ String orderBySeq = OrderByEnums.ASC.getCode();
+ if (order != null) {
+ switch (order) {
+ case 1:
+ orderByResult = OrderByEnums.IP_VOLUME_FILE_CREATE_TIME.getCode();
+ break;
+ default:
+ }
+ }
+ if (seq != null) {
+ switch (seq) {
+ case 1:
+ orderBySeq = OrderByEnums.ASC.getCode();
+ break;
+ case 2:
+ orderBySeq = OrderByEnums.DESC.getCode();
+ break;
+ default:
+ break;
+ }
+ }
+ //鎺掑簭鏂瑰紡
+ String orderBy = orderByResult + " " + orderBySeq;
+
+ if (baseConditionVO != null) {
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(), orderBy);
+ }
+ List<IpVolumeFile> list = list(wrapper);
+
+ return list;
}
- public List<IpVolumeFile> listFiles() {
+ public List<IpVolumeFile> listFiles(String keyword) {
LambdaQueryWrapper<IpVolumeFile> wrapper = Wrappers.lambdaQuery(IpVolumeFile.class);
//涓嶆槸瓒呯
@@ -125,6 +147,9 @@
file.eq(IpVolumeFile::getUserId, SecurityUtils.getUserId());
});
}
+ if (keyword != null && !StringUtil.isEmpty(keyword)) {
+ wrapper.like(IpVolumeFile::getFileName, keyword);
+ }
return list(wrapper);
}
--
Gitblit v1.9.3