From 213b612323e60e01381396c7f1b1dbf0d5c52d7f Mon Sep 17 00:00:00 2001 From: gsd Date: Sun, 6 Apr 2025 17:16:24 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=B5=D0=BB=D1=8C=D0=BC=D0=B5=D0=BD?= =?UTF-8?q?=D1=8C=20=D0=B0=D0=BF=D0=B4=D0=B5=D0=B9=D1=82=203.5.7c?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/app/controllers/admin/BanController.java | 2 +- src/main/java/app/entities/SearchFilter.java | 12 +++++++----- src/main/java/app/entities/db/ban/Ban.java | 7 ++++--- .../java/app/entities/db/ban/BanSearchFilter.java | 2 ++ .../app/entities/messages/MessageSearchFilter.java | 2 ++ src/main/java/app/services/db/BanService.java | 2 +- 6 files changed, 17 insertions(+), 10 deletions(-) diff --git a/src/main/java/app/controllers/admin/BanController.java b/src/main/java/app/controllers/admin/BanController.java index f17fa09..3d1353f 100644 --- a/src/main/java/app/controllers/admin/BanController.java +++ b/src/main/java/app/controllers/admin/BanController.java @@ -49,7 +49,7 @@ public class BanController { @RequestParam(value = "ban_reason", required = false, defaultValue = "фурриёб") String ban_reason ){ if (!permitionService.CheckMorePowerfull(SteamIDConverter.getSteamID(admin_steam64), SteamIDConverter.getSteamID(user_steam64))) return new ResponseEntity(HttpStatus.NOT_ACCEPTABLE); - int result = banService.addBan( + Long result = banService.addBan( profileService.GetProfile(user_steam64, List.of("steam_data")), profileService.GetProfile(admin_steam64, List.of("steam_data")), ban_length, ban_reason); diff --git a/src/main/java/app/entities/SearchFilter.java b/src/main/java/app/entities/SearchFilter.java index c47eebb..78f6654 100644 --- a/src/main/java/app/entities/SearchFilter.java +++ b/src/main/java/app/entities/SearchFilter.java @@ -1,29 +1,31 @@ package app.entities; import app.services.ProfileService; +import lombok.Setter; +import org.springframework.format.annotation.DateTimeFormat; import java.sql.Timestamp; import java.time.LocalDateTime; -import java.time.ZoneId; import java.util.List; import java.util.Objects; +@Setter public abstract class SearchFilter { private List accounts = null; + @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private LocalDateTime begin = null; + @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private LocalDateTime end = null; private String serverId = null; public List getAccounts(ProfileService profileService) { if (accounts == null || accounts.isEmpty()) return null; - List filtered = accounts.stream() + return accounts.stream() .map(profileService::GetSteamIDFromAnyData) .filter(Objects::nonNull) - .map(sId -> sId.steam2) - .map(Long::parseLong) + .map(sId -> sId.account_id) .toList(); - return filtered; } public Long getBeginUnixTime() { diff --git a/src/main/java/app/entities/db/ban/Ban.java b/src/main/java/app/entities/db/ban/Ban.java index f125f12..017fc1d 100644 --- a/src/main/java/app/entities/db/ban/Ban.java +++ b/src/main/java/app/entities/db/ban/Ban.java @@ -37,7 +37,7 @@ CREATE TABLE `light_bans` ( public class Ban { @Id @Column(name = "id") - private int id; + private Long id; @Column(name = "steam_id", length = 32) private String steam_id; @Column(name = "account_id") @@ -55,6 +55,7 @@ public class Ban { @Column(name = "banned_by_id") private String banned_by_id; @Column(name = "ip", length = 15) + @JsonIgnore private String ip; @Column(name = "timestamp") private Timestamp timestamp; @@ -76,7 +77,7 @@ public class Ban { AdminInfo unbanned_admin_info; public Ban(Object[] obj) { - id = (int) obj[0]; + id = (long) obj[0]; steam_id = (String) obj[1]; account_id = (Long) obj[2]; player_name = (String) obj[3]; @@ -94,7 +95,7 @@ public class Ban { } public Ban(ResultSet resultSet) throws SQLException { - id = resultSet.getInt("id"); + id = resultSet.getLong("id"); steam_id = resultSet.getString("steam_id"); account_id = resultSet.getLong("account_id"); player_name = resultSet.getString("player_name"); diff --git a/src/main/java/app/entities/db/ban/BanSearchFilter.java b/src/main/java/app/entities/db/ban/BanSearchFilter.java index f3ac78f..14cf98b 100644 --- a/src/main/java/app/entities/db/ban/BanSearchFilter.java +++ b/src/main/java/app/entities/db/ban/BanSearchFilter.java @@ -2,10 +2,12 @@ package app.entities.db.ban; import app.entities.SearchFilter; import app.services.ProfileService; +import lombok.Setter; import java.util.List; import java.util.Objects; +@Setter public class BanSearchFilter extends SearchFilter { private List ban_ids; private Boolean active; diff --git a/src/main/java/app/entities/messages/MessageSearchFilter.java b/src/main/java/app/entities/messages/MessageSearchFilter.java index 937e000..f4729b4 100644 --- a/src/main/java/app/entities/messages/MessageSearchFilter.java +++ b/src/main/java/app/entities/messages/MessageSearchFilter.java @@ -1,7 +1,9 @@ package app.entities.messages; import app.entities.SearchFilter; +import lombok.Setter; +@Setter public class MessageSearchFilter extends SearchFilter { private String message; public MessageSearchFilter() { diff --git a/src/main/java/app/services/db/BanService.java b/src/main/java/app/services/db/BanService.java index 6144f3e..683fed5 100644 --- a/src/main/java/app/services/db/BanService.java +++ b/src/main/java/app/services/db/BanService.java @@ -83,7 +83,7 @@ public class BanService { false, admin.getSteamids().steam2, ban.getId()) > 0; } - public int addBan(PlayerProfile user, PlayerProfile admin, int ban_length, String ban_reason) { + public Long addBan(PlayerProfile user, PlayerProfile admin, int ban_length, String ban_reason) { Ban ban = getBan(user.getSteamids()); if (ban != null) return -1 * ban.getId(); jdbcTemplate.update("INSERT INTO light_bans (steam_id, account_id, ban_length, ban_reason, banned_by_id, active, ip, player_name, banned_by) VALUES (?,?,?,?,?,?,?,?,?)",