From 61bd2dcd6e4ae6a3f2c5b42d1e15712370dda913 Mon Sep 17 00:00:00 2001 From: gsd Date: Mon, 27 Oct 2025 19:52:04 +0300 Subject: [PATCH] fixes after update 2 --- src/main/java/app/controllers/FileController.java | 4 ++-- src/main/java/app/controllers/user/DetailController.java | 4 ++-- src/main/java/app/controllers/user/PublicController.java | 4 ++-- src/main/java/app/entities/SearchFilter.java | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/app/controllers/FileController.java b/src/main/java/app/controllers/FileController.java index 4203fcf..e85c99a 100644 --- a/src/main/java/app/controllers/FileController.java +++ b/src/main/java/app/controllers/FileController.java @@ -128,8 +128,8 @@ public class FileController { steam64_ids.isEmpty(), steam64_ids, searchFilter.getBeginUnixTime(), searchFilter.getEndUnixTime(), - searchFilter.getBeginUnixTime() == 0 ? null : 1L, - searchFilter.getEndUnixTime() == 0 ? null : 1L); + searchFilter.getBeginUnixTime(), + searchFilter.getEndUnixTime()); } private static String encodeFileName(String fileName) throws UnsupportedEncodingException { diff --git a/src/main/java/app/controllers/user/DetailController.java b/src/main/java/app/controllers/user/DetailController.java index ad325e2..d33799f 100644 --- a/src/main/java/app/controllers/user/DetailController.java +++ b/src/main/java/app/controllers/user/DetailController.java @@ -123,8 +123,8 @@ public class DetailController { ids.isEmpty(), ids, searchFilter.getBeginUnixTime(), searchFilter.getEndUnixTime(), - searchFilter.getBeginUnixTime() == 0?null:1L, - searchFilter.getEndUnixTime() == 0?null:1L); + searchFilter.getBeginUnixTime(), + searchFilter.getEndUnixTime()); donates.getContent().forEach((donateStat -> { donateStat.setGametime(gametimeRepository.searchGametimeBySteam2(donateStat.getSteam2())); })); diff --git a/src/main/java/app/controllers/user/PublicController.java b/src/main/java/app/controllers/user/PublicController.java index 50e90ba..9e88c4e 100644 --- a/src/main/java/app/controllers/user/PublicController.java +++ b/src/main/java/app/controllers/user/PublicController.java @@ -89,8 +89,8 @@ public class PublicController { banSearchFilter.getEndUnixTime(), banSearchFilter.getActive(), admin_ids.isEmpty(), admin_ids, banSearchFilter.getReason(), - banSearchFilter.getBeginUnixTime() == 0 ? null : 1L, - banSearchFilter.getEndUnixTime() == 0 ? null : 1L) + banSearchFilter.getBeginUnixTime(), + banSearchFilter.getEndUnixTime()) , HttpStatus.OK); } diff --git a/src/main/java/app/entities/SearchFilter.java b/src/main/java/app/entities/SearchFilter.java index 2ca8cd2..6902f50 100644 --- a/src/main/java/app/entities/SearchFilter.java +++ b/src/main/java/app/entities/SearchFilter.java @@ -81,11 +81,11 @@ public class SearchFilter { } public Long getBeginUnixTime() { - return begin == null ? 0 : (Timestamp.valueOf(begin).getTime()/1000) + utc*60; + return begin == null ? null : (Timestamp.valueOf(begin).getTime()/1000) + utc*60; } public Long getEndUnixTime() { - return end == null ? 0 : (Timestamp.valueOf(end).getTime()/1000) + utc*60; + return end == null ? null : (Timestamp.valueOf(end).getTime()/1000) + utc*60; } public String getServerId() {