Browse Source

fixes after update 2

master
gsd 8 months ago
parent
commit
61bd2dcd6e
  1. 4
      src/main/java/app/controllers/FileController.java
  2. 4
      src/main/java/app/controllers/user/DetailController.java
  3. 4
      src/main/java/app/controllers/user/PublicController.java
  4. 4
      src/main/java/app/entities/SearchFilter.java

4
src/main/java/app/controllers/FileController.java

@ -128,8 +128,8 @@ public class FileController {
steam64_ids.isEmpty(), steam64_ids, steam64_ids.isEmpty(), steam64_ids,
searchFilter.getBeginUnixTime(), searchFilter.getBeginUnixTime(),
searchFilter.getEndUnixTime(), searchFilter.getEndUnixTime(),
searchFilter.getBeginUnixTime() == 0 ? null : 1L, searchFilter.getBeginUnixTime(),
searchFilter.getEndUnixTime() == 0 ? null : 1L); searchFilter.getEndUnixTime());
} }
private static String encodeFileName(String fileName) throws UnsupportedEncodingException { private static String encodeFileName(String fileName) throws UnsupportedEncodingException {

4
src/main/java/app/controllers/user/DetailController.java

@ -123,8 +123,8 @@ public class DetailController {
ids.isEmpty(), ids, ids.isEmpty(), ids,
searchFilter.getBeginUnixTime(), searchFilter.getBeginUnixTime(),
searchFilter.getEndUnixTime(), searchFilter.getEndUnixTime(),
searchFilter.getBeginUnixTime() == 0?null:1L, searchFilter.getBeginUnixTime(),
searchFilter.getEndUnixTime() == 0?null:1L); searchFilter.getEndUnixTime());
donates.getContent().forEach((donateStat -> { donates.getContent().forEach((donateStat -> {
donateStat.setGametime(gametimeRepository.searchGametimeBySteam2(donateStat.getSteam2())); donateStat.setGametime(gametimeRepository.searchGametimeBySteam2(donateStat.getSteam2()));
})); }));

4
src/main/java/app/controllers/user/PublicController.java

@ -89,8 +89,8 @@ public class PublicController {
banSearchFilter.getEndUnixTime(), banSearchFilter.getEndUnixTime(),
banSearchFilter.getActive(), banSearchFilter.getActive(),
admin_ids.isEmpty(), admin_ids, banSearchFilter.getReason(), admin_ids.isEmpty(), admin_ids, banSearchFilter.getReason(),
banSearchFilter.getBeginUnixTime() == 0 ? null : 1L, banSearchFilter.getBeginUnixTime(),
banSearchFilter.getEndUnixTime() == 0 ? null : 1L) banSearchFilter.getEndUnixTime())
, HttpStatus.OK); , HttpStatus.OK);
} }

4
src/main/java/app/entities/SearchFilter.java

@ -81,11 +81,11 @@ public class SearchFilter {
} }
public Long getBeginUnixTime() { 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() { 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() { public String getServerId() {

Loading…
Cancel
Save