From ce72201c7cd63b8eb02af930b7b8302d5395ae6a Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 27 五月 2022 14:34:19 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java | 7 ++-
dao/src/main/java/com/sandu/ximon/dao/enums/OrderByEnums.java | 43 +++++++++++++++++++++
ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdminService.java | 38 +++++++++++++++++-
ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeFileService.java | 11 +++--
4 files changed, 89 insertions(+), 10 deletions(-)
diff --git a/dao/src/main/java/com/sandu/ximon/dao/enums/OrderByEnums.java b/dao/src/main/java/com/sandu/ximon/dao/enums/OrderByEnums.java
new file mode 100644
index 0000000..90cf2ea
--- /dev/null
+++ b/dao/src/main/java/com/sandu/ximon/dao/enums/OrderByEnums.java
@@ -0,0 +1,43 @@
+package com.sandu.ximon.dao.enums;
+
+/**
+ * @author ZZQ
+ * @date 2022/5/27 14:22
+ */
+public enum OrderByEnums {
+ /**
+ * 绠＄悊鍛樺垪琛�
+ */
+ //ID
+ ADMIN_ID("id"),
+ //鍒涘缓鏃堕棿
+ ADMIN_CREATE_TIME("create_time"),
+ //鐧诲綍鏃堕棿
+ ADMIN_LOGIN_TIME("login_time"),
+
+ /**
+ * 闊虫煴绱犳潗鍒楄〃
+ */
+ //鍒涘缓鏃堕棿
+ IP_VOLUME_FILE_CREATE_TIME("create_time"),
+
+
+ /**
+ * 鎺掑簭鏂瑰紡
+ */
+ //姝ｅ簭
+ ASC("ASC"),
+ //鍊掑簭
+ DESC("DESC"),
+ ;
+
+ private final String code;
+
+ OrderByEnums(String code) {
+ this.code = code;
+ }
+
+ public String getCode() {
+ return code;
+ }
+}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java
index 8b78eca..93993e1 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java
@@ -209,11 +209,14 @@
@Log("鍚庡彴鐢ㄦ埛鍒楄〃")
@GetMapping(value = "/list")
- public ResponseVO<Object> listAdmin(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
+ public ResponseVO<Object> listAdmin(BaseConditionVO baseConditionVO,
+ @RequestParam(value = "keyword", required = false) String keyword,
+ @RequestParam(value = "order", required = false) Integer order,
+ @RequestParam(value = "seq", required = false) Integer seq) {
if (!permissionConfig.check(MenuEnum.ADMIN_LIST.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- return ResponseUtil.successPage(adminService.listAdmin(baseConditionVO, keyword));
+ return ResponseUtil.successPage(adminService.listAdmin(baseConditionVO, keyword, order, seq));
}
@Log("鍚庡彴鐢ㄦ埛娉ㄥ唽")
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdminService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdminService.java
index 62c74b9..a206128 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdminService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdminService.java
@@ -20,6 +20,7 @@
import com.sandu.ximon.dao.domain.Role;
import com.sandu.ximon.dao.domain.RoleMenuRelation;
import com.sandu.ximon.dao.enums.AdministratorEnums;
+import com.sandu.ximon.dao.enums.OrderByEnums;
import com.sandu.ximon.dao.mapper.AdminMapper;
import lombok.AllArgsConstructor;
import org.springframework.security.crypto.password.PasswordEncoder;
@@ -200,10 +201,41 @@
return updateById(one);
}
- public List<AdminBo> listAdmin(BaseConditionVO baseConditionVO, String keyword) {
- if (baseConditionVO != null) {
- PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ public List<AdminBo> listAdmin(BaseConditionVO baseConditionVO, String keyword, Integer order, Integer seq) {
+ //鎺掑簭瀛楁
+ String orderByResult = OrderByEnums.ADMIN_ID.getCode();
+ //姝ｅ簭銆佸�掑彊
+ String orderBySeq = OrderByEnums.ASC.getCode();
+ if (order != null) {
+ switch (order) {
+ case 1:
+ orderByResult = OrderByEnums.ADMIN_ID.getCode();
+ break;
+ case 2:
+ orderByResult = OrderByEnums.ADMIN_CREATE_TIME.getCode();
+ break;
+ case 3:
+ orderByResult = OrderByEnums.ADMIN_LOGIN_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;
+
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(), orderBy);
return adminMapper.listAdmin(keyword);
}
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..dbb5b9b 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,6 +16,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;
@@ -107,13 +108,13 @@
}
//鎺掑簭瀛楁
- String orderByResult = "create_time";
+ String orderByResult = OrderByEnums.IP_VOLUME_FILE_CREATE_TIME.getCode();
//姝ｅ簭銆佸�掑彊
- 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 +122,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