From 693a33f660891c98b8b95490d020c428c5da9871 Mon Sep 17 00:00:00 2001 From: 抓蛙师 <770492966@qq.com> Date: 星期一, 19 九月 2022 21:46:32 +0800 Subject: [PATCH] 完善功能:前端可以配置多排序参数支持依次排序 如:{isAsc:"asc",orderByColumn:"id"} {isAsc:"asc",orderByColumn:"id,createTime"} {isAsc:"asc,desc",orderByColumn:"id,createTime"} 共三种配置方式 --- ruoyi-framework/src/main/java/com/ruoyi/framework/satoken/dao/PlusSaTokenDao.java | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/satoken/dao/PlusSaTokenDao.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/satoken/dao/PlusSaTokenDao.java index a08503d..83c3d54 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/satoken/dao/PlusSaTokenDao.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/satoken/dao/PlusSaTokenDao.java @@ -68,7 +68,8 @@ */ @Override public long getTimeout(String key) { - return RedisUtils.getTimeToLive(key) / 1000; + long timeout = RedisUtils.getTimeToLive(key); + return timeout < 0 ? timeout : timeout / 1000; } /** @@ -141,7 +142,8 @@ */ @Override public long getObjectTimeout(String key) { - return RedisUtils.getTimeToLive(key) / 1000; + long timeout = RedisUtils.getTimeToLive(key); + return timeout < 0 ? timeout : timeout / 1000; } /** @@ -168,10 +170,9 @@ * 鎼滅储鏁版嵁 */ @Override - public List<String> searchData(String prefix, String keyword, int start, int size) { + public List<String> searchData(String prefix, String keyword, int start, int size, boolean sortType) { Collection<String> keys = RedisUtils.keys(prefix + "*" + keyword + "*"); List<String> list = new ArrayList<>(keys); - return SaFoxUtil.searchList(list, start, size); + return SaFoxUtil.searchList(list, start, size, sortType); } - } -- Gitblit v1.9.3