Skip to content

Commit 2512963

Browse files
committed
修复 IP 排行查询
1 parent 4d9347f commit 2512963

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

src/main/java/com/ghostchu/peerbanhelper/PeerBanHelperServer.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,10 @@ private void runTestCode() {
201201
return;
202202
}
203203
// run some junky test code here
204+
// ch.qos.logback.classic.Logger root = (ch.qos.logback.classic.Logger) org.slf4j.LoggerFactory
205+
// .getLogger(ch.qos.logback.classic.Logger.ROOT_LOGGER_NAME);
206+
// root.setLevel(ch.qos.logback.classic.Level.TRACE);
207+
204208
}
205209

206210

src/main/java/com/ghostchu/peerbanhelper/database/dao/impl/HistoryDao.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,16 @@ public Page<PeerBanCount> getBannedIps(Pageable pageable, String filter) throws
4444
.selectRaw("ip, COUNT(*) AS count")
4545
.groupBy("ip")
4646
.orderByRaw("count DESC");
47+
String[] args = new String[0];
4748
if (filter != null) {
48-
builder.setWhere(builder.where().like("ip", new SelectArg(filter + "%")));
49+
builder.setWhere(builder.where().like("ip", new SelectArg()));
50+
args = new String[]{filter + "%"};
4951
}
50-
List<PeerBanCount> mapped;
51-
try (GenericRawResults<String[]> banLogs = builder
52+
var queryBuilder = builder
5253
.limit(pageable.getSize())
53-
.offset(pageable.getZeroBasedPage() * pageable.getSize())
54-
// .where().ge("banAt", twoWeeksAgo)
55-
.queryRaw()) {
54+
.offset(pageable.getZeroBasedPage() * pageable.getSize());
55+
List<PeerBanCount> mapped;
56+
try (GenericRawResults<String[]> banLogs = queryRaw(queryBuilder.prepareStatementString(), args)) {
5657
var results = banLogs.getResults();
5758
mapped = results.stream().map(arr -> new PeerBanCount(arr[0], Long.parseLong(arr[1]))).toList();
5859
}

0 commit comments

Comments
 (0)