LamGC/ContentGrabbingJi
1
0
Fork 0
mirror of https://github.com/LamGC/ContentGrabbingJi.git synced 2025-07-01 12:57:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Add] 为Ranking命令增加翻页功能;

Browse Source 
[Change] BotCommandProcess 为`ranking`方法增加`pageIndex`参数, 增加对起始排名的计算, 移除起始排名的固定值, 改按pageIndex计算;
[Fix] CacheStoreCentral 修复`getRankingInfoByCache`方法中潜在的排行榜返回错误的问题;
[Delete] PixivDownload 移除无用的两个方法;
[Change] PixivDownload 调整`@SuppressWarnings`注解的范围;
This commit is contained in:
LamGC
2020-07-15 16:17:52 +08:00
parent bf8de1ac1e
commit 1a3f99685b
3 changed files with 11 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/net/lamgc/cgj/bot/BotCommandProcess.java
View File

@ -143,8 +143,13 @@ public class BotCommandProcess {
@Argument(force = false, name = "date") Date queryTime,
@Argument(force = false, name = "force") boolean force,
@Argument(force = false, name = "mode", defaultValue = "DAILY") String contentMode,
@Argument(force = false, name = "type", defaultValue = "ALL") String contentType
@Argument(force = false, name = "type", defaultValue = "ALL") String contentType,
@Argument(force = false, name = "p", defaultValue = "1") int pageIndex
) throws InterruptedException {
if(pageIndex <= 0) {
return "色图姬找不到指定页数的排行榜!";
}
Date queryDate = queryTime;
if (queryDate == null) {
queryDate = new Date();
@ -212,8 +217,10 @@ public class BotCommandProcess {
log.warn("配置项 {} 的参数值格式有误!", imageLimitPropertyKey);
}
int startsIndex = itemLimit * pageIndex - (itemLimit - 1);
List<JsonObject> rankingInfoList = CacheStoreCentral.getCentral()
.getRankingInfoByCache(type, mode, queryDate, 1, Math.max(0, itemLimit), false);
.getRankingInfoByCache(type, mode, queryDate,
Math.max(1, startsIndex), Math.max(0, itemLimit), false);
if(rankingInfoList.isEmpty()) {
return "无法查询排行榜，可能排行榜尚未更新。";
}