From 95cc9f0e21604cdd0990711a25204af538c14383 Mon Sep 17 00:00:00 2001 From: Azalea <22280294+hykilpikonna@users.noreply.github.com> Date: Sat, 16 Mar 2024 21:41:17 -0400 Subject: [PATCH] [M] Rename --- .../ApiMaimai2PlayerDataController.java | 28 +++---- .../icu/samnyan/aqua/net/CardController.kt | 4 +- .../icu/samnyan/aqua/net/games/Maimai2.kt | 12 +-- .../handler/impl/CMGetSellingCardHandler.java | 6 +- .../handler/impl/CMGetUserPreviewHandler.java | 6 +- .../handler/impl/GetGameChargeHandler.java | 6 +- .../handler/impl/GetGameEventHandler.java | 6 +- .../handler/impl/GetUserChargeHandler.java | 6 +- .../handler/impl/GetUserCourseHandler.java | 6 +- .../handler/impl/GetUserDataHandler.java | 6 +- .../handler/impl/GetUserExtendHandler.java | 6 +- .../handler/impl/GetUserFavoriteHandler.java | 6 +- .../impl/GetUserFavoriteItemHandler.java | 6 +- .../GetUserFriendSeasonRankingHandler.java | 6 +- .../handler/impl/GetUserItemHandler.java | 6 +- .../impl/GetUserLoginBonusHandler.java | 6 +- .../handler/impl/GetUserMapHandler.java | 6 +- .../handler/impl/GetUserMusicHandler.java | 6 +- .../handler/impl/GetUserOptionHandler.java | 6 +- .../handler/impl/GetUserPreviewHandler.java | 10 +-- .../handler/impl/GetUserRatingHandler.java | 16 ++-- .../handler/impl/GetUserRivalDataHandler.java | 6 +- .../impl/GetUserRivalMusicHandler.java | 6 +- .../handler/impl/UploadUserPlaylogHandler.kt | 8 +- .../handler/impl/UpsertUserAllHandler.java | 26 +++--- .../handler/impl/UpsertUserPrintHandler.java | 10 +-- .../samnyan/aqua/sega/maimai2/model/Repos.kt | 81 +++++++++---------- 27 files changed, 151 insertions(+), 152 deletions(-) diff --git a/src/main/java/icu/samnyan/aqua/api/controller/sega/game/maimai2/ApiMaimai2PlayerDataController.java b/src/main/java/icu/samnyan/aqua/api/controller/sega/game/maimai2/ApiMaimai2PlayerDataController.java index fdf5218d..aaa134d4 100644 --- a/src/main/java/icu/samnyan/aqua/api/controller/sega/game/maimai2/ApiMaimai2PlayerDataController.java +++ b/src/main/java/icu/samnyan/aqua/api/controller/sega/game/maimai2/ApiMaimai2PlayerDataController.java @@ -45,21 +45,21 @@ public class ApiMaimai2PlayerDataController { private final Mai2UserActRepo userActRepository; private final Mai2UserCharacterRepo userCharacterRepository; - private final UserDataRepository userDataRepository; - private final UserItemRepository userItemRepository; - private final UserLoginBonusRepository userLoginBonusRepository; - private final UserMusicDetailRepository userMusicDetailRepository; - private final UserOptionRepository userOptionRepository; - private final UserPlaylogRepository userPlaylogRepository; - private final UserGeneralDataRepository userGeneralDataRepository; + private final Mai2UserDataRepo userDataRepository; + private final Mai2UserItemRepo userItemRepository; + private final Mai2UserLoginBonusRepo userLoginBonusRepository; + private final Mai2UserMusicDetailRepo userMusicDetailRepository; + private final Mai2UserOptionRepo userOptionRepository; + private final Mai2UserPlaylogRepo userPlaylogRepository; + private final Mai2UserGeneralDataRepo userGeneralDataRepository; private final Mai2MapEncountNpcRepo mapEncountNpcRepository; - private final UserChargeRepository userChargeRepository; - private final UserCourseRepository userCourseRepository; - private final UserExtendRepository userExtendRepository; - private final UserFavoriteRepository userFavoriteRepository; - private final UserFriendSeasonRankingRepository userFriendSeasonRankingRepository; - private final UserMapRepository userMapRepository; - private final UserUdemaeRepository userUdemaeRepository; + private final Mai2UserChargeRepo userChargeRepository; + private final Mai2UserCourseRepo userCourseRepository; + private final Mai2UserExtendRepo userExtendRepository; + private final Mai2UserFavoriteRepo userFavoriteRepository; + private final Mai2UserFriendSeasonRankingRepo userFriendSeasonRankingRepository; + private final Mai2UserMapRepo userMapRepository; + private final Mai2UserUdemaeRepo userUdemaeRepository; @GetMapping("config/userPhoto/divMaxLength") public long getConfigUserPhotoDivMaxLength(@Value("${game.maimai2.userPhoto.divMaxLength:32}") long divMaxLength) { diff --git a/src/main/java/icu/samnyan/aqua/net/CardController.kt b/src/main/java/icu/samnyan/aqua/net/CardController.kt index 6f289f8a..5271aa6b 100644 --- a/src/main/java/icu/samnyan/aqua/net/CardController.kt +++ b/src/main/java/icu/samnyan/aqua/net/CardController.kt @@ -10,7 +10,7 @@ import icu.samnyan.aqua.net.utils.SUCCESS import icu.samnyan.aqua.sega.general.dao.CardRepository import icu.samnyan.aqua.sega.general.model.Card import icu.samnyan.aqua.sega.general.service.CardService -import icu.samnyan.aqua.sega.maimai2.model.UserDataRepository +import icu.samnyan.aqua.sega.maimai2.model.Mai2UserDataRepo import org.springframework.stereotype.Service import org.springframework.web.bind.annotation.RestController import kotlin.jvm.optionals.getOrNull @@ -143,7 +143,7 @@ suspend fun getSummaryFor(repo: GenericUserDataRepo<*>, card: Card): Map = us.cardByName(username) { card -> diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/CMGetSellingCardHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/CMGetSellingCardHandler.java index b1ef832b..11ae00cb 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/CMGetSellingCardHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/CMGetSellingCardHandler.java @@ -2,7 +2,7 @@ package icu.samnyan.aqua.sega.maimai2.handler.impl; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.maimai2.model.GameSellingCardRepository; +import icu.samnyan.aqua.sega.maimai2.model.Mai2GameSellingCardRepo; import icu.samnyan.aqua.sega.maimai2.handler.BaseHandler; import icu.samnyan.aqua.sega.maimai2.model.gamedata.GameSellingCard; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; @@ -22,11 +22,11 @@ import java.util.Map; public class CMGetSellingCardHandler implements BaseHandler { private static final Logger logger = LoggerFactory.getLogger(CMGetSellingCardHandler.class); - private final GameSellingCardRepository gameSellingCardRepository; + private final Mai2GameSellingCardRepo gameSellingCardRepository; private final BasicMapper mapper; @Autowired - public CMGetSellingCardHandler(GameSellingCardRepository gameSellingCardRepository, BasicMapper mapper) { + public CMGetSellingCardHandler(Mai2GameSellingCardRepo gameSellingCardRepository, BasicMapper mapper) { this.gameSellingCardRepository = gameSellingCardRepository; this.mapper = mapper; } diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/CMGetUserPreviewHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/CMGetUserPreviewHandler.java index a7c77f4a..364cc386 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/CMGetUserPreviewHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/CMGetUserPreviewHandler.java @@ -3,7 +3,7 @@ package icu.samnyan.aqua.sega.maimai2.handler.impl; import com.fasterxml.jackson.core.JsonProcessingException; import icu.samnyan.aqua.sega.maimai2.handler.BaseHandler; import icu.samnyan.aqua.sega.maimai2.model.userdata.UserDetail; -import icu.samnyan.aqua.sega.maimai2.model.UserDataRepository; +import icu.samnyan.aqua.sega.maimai2.model.Mai2UserDataRepo; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -24,10 +24,10 @@ public class CMGetUserPreviewHandler implements BaseHandler { private final BasicMapper mapper; - private final UserDataRepository userDataRepository; + private final Mai2UserDataRepo userDataRepository; @Autowired - public CMGetUserPreviewHandler(BasicMapper mapper, UserDataRepository userDataRepository) { + public CMGetUserPreviewHandler(BasicMapper mapper, Mai2UserDataRepo userDataRepository) { this.mapper = mapper; this.userDataRepository = userDataRepository; } diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetGameChargeHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetGameChargeHandler.java index 1679fc82..29544814 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetGameChargeHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetGameChargeHandler.java @@ -1,7 +1,7 @@ package icu.samnyan.aqua.sega.maimai2.handler.impl; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.maimai2.model.GameChargeRepository; +import icu.samnyan.aqua.sega.maimai2.model.Mai2GameChargeRepo; import icu.samnyan.aqua.sega.maimai2.handler.BaseHandler; import icu.samnyan.aqua.sega.maimai2.model.gamedata.GameCharge; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; @@ -21,11 +21,11 @@ import java.util.Map; public class GetGameChargeHandler implements BaseHandler { private static final Logger logger = LoggerFactory.getLogger(GetGameChargeHandler.class); - private final GameChargeRepository gameChargeRepository; + private final Mai2GameChargeRepo gameChargeRepository; private final BasicMapper mapper; @Autowired - public GetGameChargeHandler(GameChargeRepository gameChargeRepository, BasicMapper mapper) { + public GetGameChargeHandler(Mai2GameChargeRepo gameChargeRepository, BasicMapper mapper) { this.gameChargeRepository = gameChargeRepository; this.mapper = mapper; } diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetGameEventHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetGameEventHandler.java index d10324cf..95eac8cd 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetGameEventHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetGameEventHandler.java @@ -2,7 +2,7 @@ package icu.samnyan.aqua.sega.maimai2.handler.impl; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.maimai2.model.GameEventRepository; +import icu.samnyan.aqua.sega.maimai2.model.Mai2GameEventRepo; import icu.samnyan.aqua.sega.maimai2.handler.BaseHandler; import icu.samnyan.aqua.sega.maimai2.model.gamedata.GameEvent; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; @@ -22,11 +22,11 @@ public class GetGameEventHandler implements BaseHandler { private static final Logger logger = LoggerFactory.getLogger(GetGameEventHandler.class); - private final GameEventRepository gameEventRepository; + private final Mai2GameEventRepo gameEventRepository; private final BasicMapper mapper; - public GetGameEventHandler(GameEventRepository gameEventRepository, BasicMapper mapper) { + public GetGameEventHandler(Mai2GameEventRepo gameEventRepository, BasicMapper mapper) { this.gameEventRepository = gameEventRepository; this.mapper = mapper; } diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserChargeHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserChargeHandler.java index d57b1348..78dd095b 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserChargeHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserChargeHandler.java @@ -1,7 +1,7 @@ package icu.samnyan.aqua.sega.maimai2.handler.impl; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.maimai2.model.UserChargeRepository; +import icu.samnyan.aqua.sega.maimai2.model.Mai2UserChargeRepo; import icu.samnyan.aqua.sega.maimai2.handler.BaseHandler; import icu.samnyan.aqua.sega.maimai2.model.userdata.UserCharge; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; @@ -23,9 +23,9 @@ public class GetUserChargeHandler implements BaseHandler { private final BasicMapper mapper; - private final UserChargeRepository UserChargeRepository; + private final Mai2UserChargeRepo UserChargeRepository; - public GetUserChargeHandler(BasicMapper mapper, UserChargeRepository UserChargeRepository) { + public GetUserChargeHandler(BasicMapper mapper, Mai2UserChargeRepo UserChargeRepository) { this.mapper = mapper; this.UserChargeRepository = UserChargeRepository; } diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserCourseHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserCourseHandler.java index 8c9b192a..134f0e60 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserCourseHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserCourseHandler.java @@ -1,7 +1,7 @@ package icu.samnyan.aqua.sega.maimai2.handler.impl; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.maimai2.model.UserCourseRepository; +import icu.samnyan.aqua.sega.maimai2.model.Mai2UserCourseRepo; import icu.samnyan.aqua.sega.maimai2.handler.BaseHandler; import icu.samnyan.aqua.sega.maimai2.model.userdata.UserCourse; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; @@ -24,9 +24,9 @@ public class GetUserCourseHandler implements BaseHandler { private final BasicMapper mapper; - private final UserCourseRepository userCourseRepository; + private final Mai2UserCourseRepo userCourseRepository; - public GetUserCourseHandler(BasicMapper mapper, UserCourseRepository userCourseRepository) { + public GetUserCourseHandler(BasicMapper mapper, Mai2UserCourseRepo userCourseRepository) { this.mapper = mapper; this.userCourseRepository = userCourseRepository; } diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserDataHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserDataHandler.java index b8c8339d..fffae641 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserDataHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserDataHandler.java @@ -1,7 +1,7 @@ package icu.samnyan.aqua.sega.maimai2.handler.impl; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.maimai2.model.UserDataRepository; +import icu.samnyan.aqua.sega.maimai2.model.Mai2UserDataRepo; import icu.samnyan.aqua.sega.maimai2.handler.BaseHandler; import icu.samnyan.aqua.sega.maimai2.model.userdata.UserDetail; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; @@ -22,9 +22,9 @@ public class GetUserDataHandler implements BaseHandler { private final BasicMapper mapper; - private final UserDataRepository userDataRepository; + private final Mai2UserDataRepo userDataRepository; - public GetUserDataHandler(BasicMapper mapper, UserDataRepository userDataRepository) { + public GetUserDataHandler(BasicMapper mapper, Mai2UserDataRepo userDataRepository) { this.mapper = mapper; this.userDataRepository = userDataRepository; } diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserExtendHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserExtendHandler.java index 9ebc5907..7b129463 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserExtendHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserExtendHandler.java @@ -1,7 +1,7 @@ package icu.samnyan.aqua.sega.maimai2.handler.impl; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.maimai2.model.UserExtendRepository; +import icu.samnyan.aqua.sega.maimai2.model.Mai2UserExtendRepo; import icu.samnyan.aqua.sega.maimai2.handler.BaseHandler; import icu.samnyan.aqua.sega.maimai2.model.userdata.UserExtend; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; @@ -22,9 +22,9 @@ public class GetUserExtendHandler implements BaseHandler { private final BasicMapper mapper; - private final UserExtendRepository userExtendRepository; + private final Mai2UserExtendRepo userExtendRepository; - public GetUserExtendHandler(BasicMapper mapper, UserExtendRepository userExtendRepository) { + public GetUserExtendHandler(BasicMapper mapper, Mai2UserExtendRepo userExtendRepository) { this.mapper = mapper; this.userExtendRepository = userExtendRepository; } diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserFavoriteHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserFavoriteHandler.java index 0e7b9a00..b3abd502 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserFavoriteHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserFavoriteHandler.java @@ -1,7 +1,7 @@ package icu.samnyan.aqua.sega.maimai2.handler.impl; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.maimai2.model.UserFavoriteRepository; +import icu.samnyan.aqua.sega.maimai2.model.Mai2UserFavoriteRepo; import icu.samnyan.aqua.sega.maimai2.handler.BaseHandler; import icu.samnyan.aqua.sega.maimai2.model.userdata.UserFavorite; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; @@ -23,9 +23,9 @@ public class GetUserFavoriteHandler implements BaseHandler { private final BasicMapper mapper; - private final UserFavoriteRepository userFavoriteRepository; + private final Mai2UserFavoriteRepo userFavoriteRepository; - public GetUserFavoriteHandler(BasicMapper mapper, UserFavoriteRepository userFavoriteRepository) { + public GetUserFavoriteHandler(BasicMapper mapper, Mai2UserFavoriteRepo userFavoriteRepository) { this.mapper = mapper; this.userFavoriteRepository = userFavoriteRepository; } diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserFavoriteItemHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserFavoriteItemHandler.java index 5f136cff..d2435a01 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserFavoriteItemHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserFavoriteItemHandler.java @@ -3,7 +3,7 @@ package icu.samnyan.aqua.sega.maimai2.handler.impl; import com.fasterxml.jackson.core.JsonProcessingException; import icu.samnyan.aqua.sega.maimai2.model.response.data.UserFavoriteItem; import icu.samnyan.aqua.sega.maimai2.model.userdata.UserGeneralData; -import icu.samnyan.aqua.sega.maimai2.model.UserGeneralDataRepository; +import icu.samnyan.aqua.sega.maimai2.model.Mai2UserGeneralDataRepo; import icu.samnyan.aqua.sega.maimai2.handler.BaseHandler; import icu.samnyan.aqua.sega.util.jackson.StringMapper; import java.util.LinkedHashMap; @@ -23,10 +23,10 @@ public class GetUserFavoriteItemHandler implements BaseHandler { .getLogger(icu.samnyan.aqua.sega.maimai2.handler.impl.GetUserFavoriteItemHandler.class); private final StringMapper mapper; - private final UserGeneralDataRepository userGeneralDataRepository; + private final Mai2UserGeneralDataRepo userGeneralDataRepository; @Autowired - public GetUserFavoriteItemHandler(StringMapper mapper, UserGeneralDataRepository userGeneralDataRepository) { + public GetUserFavoriteItemHandler(StringMapper mapper, Mai2UserGeneralDataRepo userGeneralDataRepository) { this.mapper = mapper; this.userGeneralDataRepository = userGeneralDataRepository; } diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserFriendSeasonRankingHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserFriendSeasonRankingHandler.java index b7abcbb4..b25b300d 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserFriendSeasonRankingHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserFriendSeasonRankingHandler.java @@ -1,7 +1,7 @@ package icu.samnyan.aqua.sega.maimai2.handler.impl; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.maimai2.model.UserFriendSeasonRankingRepository; +import icu.samnyan.aqua.sega.maimai2.model.Mai2UserFriendSeasonRankingRepo; import icu.samnyan.aqua.sega.maimai2.handler.BaseHandler; import icu.samnyan.aqua.sega.maimai2.model.userdata.UserFriendSeasonRanking; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; @@ -24,9 +24,9 @@ public class GetUserFriendSeasonRankingHandler implements BaseHandler { private final BasicMapper mapper; - private final UserFriendSeasonRankingRepository userFriendSeasonRankingRepository; + private final Mai2UserFriendSeasonRankingRepo userFriendSeasonRankingRepository; - public GetUserFriendSeasonRankingHandler(BasicMapper mapper, UserFriendSeasonRankingRepository userFriendSeasonRankingRepository) { + public GetUserFriendSeasonRankingHandler(BasicMapper mapper, Mai2UserFriendSeasonRankingRepo userFriendSeasonRankingRepository) { this.mapper = mapper; this.userFriendSeasonRankingRepository = userFriendSeasonRankingRepository; } diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserItemHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserItemHandler.java index 159e9bb6..9c87e2e4 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserItemHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserItemHandler.java @@ -1,7 +1,7 @@ package icu.samnyan.aqua.sega.maimai2.handler.impl; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.maimai2.model.UserItemRepository; +import icu.samnyan.aqua.sega.maimai2.model.Mai2UserItemRepo; import icu.samnyan.aqua.sega.maimai2.handler.BaseHandler; import icu.samnyan.aqua.sega.maimai2.model.userdata.UserItem; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; @@ -24,9 +24,9 @@ public class GetUserItemHandler implements BaseHandler { private final BasicMapper mapper; - private final UserItemRepository userItemRepository; + private final Mai2UserItemRepo userItemRepository; - public GetUserItemHandler(BasicMapper mapper, UserItemRepository userItemRepository) { + public GetUserItemHandler(BasicMapper mapper, Mai2UserItemRepo userItemRepository) { this.mapper = mapper; this.userItemRepository = userItemRepository; } diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserLoginBonusHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserLoginBonusHandler.java index 16fa5e13..934a7489 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserLoginBonusHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserLoginBonusHandler.java @@ -1,7 +1,7 @@ package icu.samnyan.aqua.sega.maimai2.handler.impl; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.maimai2.model.UserLoginBonusRepository; +import icu.samnyan.aqua.sega.maimai2.model.Mai2UserLoginBonusRepo; import icu.samnyan.aqua.sega.maimai2.handler.BaseHandler; import icu.samnyan.aqua.sega.maimai2.model.userdata.UserLoginBonus; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; @@ -24,9 +24,9 @@ public class GetUserLoginBonusHandler implements BaseHandler { private final BasicMapper mapper; - private final UserLoginBonusRepository userLoginBonusRepository; + private final Mai2UserLoginBonusRepo userLoginBonusRepository; - public GetUserLoginBonusHandler(BasicMapper mapper, UserLoginBonusRepository userLoginBonusRepository) { + public GetUserLoginBonusHandler(BasicMapper mapper, Mai2UserLoginBonusRepo userLoginBonusRepository) { this.mapper = mapper; this.userLoginBonusRepository = userLoginBonusRepository; } diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserMapHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserMapHandler.java index 204f49d5..e6e2ac42 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserMapHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserMapHandler.java @@ -1,7 +1,7 @@ package icu.samnyan.aqua.sega.maimai2.handler.impl; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.maimai2.model.UserMapRepository; +import icu.samnyan.aqua.sega.maimai2.model.Mai2UserMapRepo; import icu.samnyan.aqua.sega.maimai2.handler.BaseHandler; import icu.samnyan.aqua.sega.maimai2.model.userdata.UserMap; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; @@ -24,9 +24,9 @@ public class GetUserMapHandler implements BaseHandler { private final BasicMapper mapper; - private final UserMapRepository userMapRepository; + private final Mai2UserMapRepo userMapRepository; - public GetUserMapHandler(BasicMapper mapper, UserMapRepository userMapRepository) { + public GetUserMapHandler(BasicMapper mapper, Mai2UserMapRepo userMapRepository) { this.mapper = mapper; this.userMapRepository = userMapRepository; } diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserMusicHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserMusicHandler.java index 7996a87c..a545efa8 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserMusicHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserMusicHandler.java @@ -1,7 +1,7 @@ package icu.samnyan.aqua.sega.maimai2.handler.impl; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.maimai2.model.UserMusicDetailRepository; +import icu.samnyan.aqua.sega.maimai2.model.Mai2UserMusicDetailRepo; import icu.samnyan.aqua.sega.maimai2.handler.BaseHandler; import icu.samnyan.aqua.sega.maimai2.model.response.data.UserMusic; import icu.samnyan.aqua.sega.maimai2.model.userdata.UserMusicDetail; @@ -27,9 +27,9 @@ public class GetUserMusicHandler implements BaseHandler { private final BasicMapper mapper; - private final UserMusicDetailRepository userMusicDetailRepository; + private final Mai2UserMusicDetailRepo userMusicDetailRepository; - public GetUserMusicHandler(BasicMapper mapper, UserMusicDetailRepository userMusicDetailRepository) { + public GetUserMusicHandler(BasicMapper mapper, Mai2UserMusicDetailRepo userMusicDetailRepository) { this.mapper = mapper; this.userMusicDetailRepository = userMusicDetailRepository; } diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserOptionHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserOptionHandler.java index 0fb6a1f8..7061834b 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserOptionHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserOptionHandler.java @@ -1,7 +1,7 @@ package icu.samnyan.aqua.sega.maimai2.handler.impl; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.maimai2.model.UserOptionRepository; +import icu.samnyan.aqua.sega.maimai2.model.Mai2UserOptionRepo; import icu.samnyan.aqua.sega.maimai2.handler.BaseHandler; import icu.samnyan.aqua.sega.maimai2.model.userdata.UserOption; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; @@ -22,9 +22,9 @@ public class GetUserOptionHandler implements BaseHandler { private final BasicMapper mapper; - private final UserOptionRepository userOptionRepository; + private final Mai2UserOptionRepo userOptionRepository; - public GetUserOptionHandler(BasicMapper mapper, UserOptionRepository userOptionRepository) { + public GetUserOptionHandler(BasicMapper mapper, Mai2UserOptionRepo userOptionRepository) { this.mapper = mapper; this.userOptionRepository = userOptionRepository; } diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserPreviewHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserPreviewHandler.java index 8c2bed03..77ca8db5 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserPreviewHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserPreviewHandler.java @@ -1,8 +1,8 @@ package icu.samnyan.aqua.sega.maimai2.handler.impl; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.maimai2.model.UserDataRepository; -import icu.samnyan.aqua.sega.maimai2.model.UserOptionRepository; +import icu.samnyan.aqua.sega.maimai2.model.Mai2UserDataRepo; +import icu.samnyan.aqua.sega.maimai2.model.Mai2UserOptionRepo; import icu.samnyan.aqua.sega.maimai2.handler.BaseHandler; import icu.samnyan.aqua.sega.maimai2.model.response.GetUserPreviewResp; import icu.samnyan.aqua.sega.maimai2.model.userdata.UserDetail; @@ -25,10 +25,10 @@ public class GetUserPreviewHandler implements BaseHandler { private final BasicMapper mapper; - private final UserDataRepository userDataRepository; - private final UserOptionRepository userOptionRepository; + private final Mai2UserDataRepo userDataRepository; + private final Mai2UserOptionRepo userOptionRepository; - public GetUserPreviewHandler(BasicMapper mapper, UserDataRepository userDataRepository, UserOptionRepository userOptionRepository) { + public GetUserPreviewHandler(BasicMapper mapper, Mai2UserDataRepo userDataRepository, Mai2UserOptionRepo userOptionRepository) { this.mapper = mapper; this.userDataRepository = userDataRepository; this.userOptionRepository = userOptionRepository; diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserRatingHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserRatingHandler.java index 513478e0..447829b5 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserRatingHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserRatingHandler.java @@ -2,9 +2,9 @@ package icu.samnyan.aqua.sega.maimai2.handler.impl; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.maimai2.model.UserDataRepository; -import icu.samnyan.aqua.sega.maimai2.model.UserGeneralDataRepository; -import icu.samnyan.aqua.sega.maimai2.model.UserUdemaeRepository; +import icu.samnyan.aqua.sega.maimai2.model.Mai2UserDataRepo; +import icu.samnyan.aqua.sega.maimai2.model.Mai2UserGeneralDataRepo; +import icu.samnyan.aqua.sega.maimai2.model.Mai2UserUdemaeRepo; import icu.samnyan.aqua.sega.maimai2.handler.BaseHandler; import icu.samnyan.aqua.sega.maimai2.model.response.data.UserRating; import icu.samnyan.aqua.sega.maimai2.model.userdata.UserDetail; @@ -28,12 +28,12 @@ public class GetUserRatingHandler implements BaseHandler { private static final Logger logger = LoggerFactory.getLogger(GetUserRatingHandler.class); private final BasicMapper mapper; - private final UserGeneralDataRepository userGeneralDataRepository; - private final UserUdemaeRepository userUdemaeRepository; - private final UserDataRepository userDataRepository; + private final Mai2UserGeneralDataRepo userGeneralDataRepository; + private final Mai2UserUdemaeRepo userUdemaeRepository; + private final Mai2UserDataRepo userDataRepository; - public GetUserRatingHandler(BasicMapper mapper, UserUdemaeRepository userUdemaeRepository, UserGeneralDataRepository userGeneralDataRepository, - UserDataRepository userDataRepository) { + public GetUserRatingHandler(BasicMapper mapper, Mai2UserUdemaeRepo userUdemaeRepository, Mai2UserGeneralDataRepo userGeneralDataRepository, + Mai2UserDataRepo userDataRepository) { this.mapper = mapper; this.userGeneralDataRepository = userGeneralDataRepository; this.userUdemaeRepository = userUdemaeRepository; diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserRivalDataHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserRivalDataHandler.java index 6831153b..8ba649e5 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserRivalDataHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserRivalDataHandler.java @@ -11,7 +11,7 @@ import org.springframework.stereotype.Component; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.maimai2.model.UserDataRepository; +import icu.samnyan.aqua.sega.maimai2.model.Mai2UserDataRepo; import icu.samnyan.aqua.sega.maimai2.model.response.data.UserRivalData; import icu.samnyan.aqua.sega.maimai2.model.userdata.UserDetail; import icu.samnyan.aqua.sega.util.jackson.StringMapper; @@ -22,10 +22,10 @@ public class GetUserRivalDataHandler { .getLogger(icu.samnyan.aqua.sega.maimai2.handler.impl.GetUserRivalDataHandler.class); private final StringMapper mapper; - private final UserDataRepository userDataRepository; + private final Mai2UserDataRepo userDataRepository; @Autowired - public GetUserRivalDataHandler(StringMapper mapper, UserDataRepository userDataRepository) { + public GetUserRivalDataHandler(StringMapper mapper, Mai2UserDataRepo userDataRepository) { this.mapper = mapper; this.userDataRepository = userDataRepository; } diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserRivalMusicHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserRivalMusicHandler.java index 5de6ff11..89c910f1 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserRivalMusicHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserRivalMusicHandler.java @@ -13,7 +13,7 @@ import org.springframework.stereotype.Component; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.maimai2.model.UserMusicDetailRepository; +import icu.samnyan.aqua.sega.maimai2.model.Mai2UserMusicDetailRepo; import icu.samnyan.aqua.sega.maimai2.model.response.data.UserRivalMusic; import icu.samnyan.aqua.sega.maimai2.model.response.data.UserRivalMusicDetail; import icu.samnyan.aqua.sega.maimai2.model.userdata.UserMusicDetail; @@ -25,10 +25,10 @@ public class GetUserRivalMusicHandler { .getLogger(icu.samnyan.aqua.sega.maimai2.handler.impl.GetUserRivalMusicHandler.class); private final StringMapper mapper; - private final UserMusicDetailRepository userMusicDetailRepository; + private final Mai2UserMusicDetailRepo userMusicDetailRepository; @Autowired - public GetUserRivalMusicHandler(StringMapper mapper, UserMusicDetailRepository userMusicDetailRepository) { + public GetUserRivalMusicHandler(StringMapper mapper, Mai2UserMusicDetailRepo userMusicDetailRepository) { this.mapper = mapper; this.userMusicDetailRepository = userMusicDetailRepository; } diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/UploadUserPlaylogHandler.kt b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/UploadUserPlaylogHandler.kt index b9c54463..e014fbd2 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/UploadUserPlaylogHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/UploadUserPlaylogHandler.kt @@ -1,8 +1,8 @@ package icu.samnyan.aqua.sega.maimai2.handler.impl import ext.millis -import icu.samnyan.aqua.sega.maimai2.model.UserDataRepository -import icu.samnyan.aqua.sega.maimai2.model.UserPlaylogRepository +import icu.samnyan.aqua.sega.maimai2.model.Mai2UserDataRepo +import icu.samnyan.aqua.sega.maimai2.model.Mai2UserPlaylogRepo import icu.samnyan.aqua.sega.maimai2.handler.BaseHandler import icu.samnyan.aqua.sega.maimai2.model.request.UploadUserPlaylog import icu.samnyan.aqua.sega.maimai2.model.userdata.UserPlaylog @@ -16,8 +16,8 @@ import kotlin.jvm.optionals.getOrNull */ @Component("Maimai2UploadUserPlaylogHandler") class UploadUserPlaylogHandler( - private val userDataRepository: UserDataRepository, - private val playlogRepo: UserPlaylogRepository, + private val userDataRepository: Mai2UserDataRepo, + private val playlogRepo: Mai2UserPlaylogRepo, private val mapper: BasicMapper ) : BaseHandler { data class BacklogEntry(val time: Long, val playlog: UserPlaylog) diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/UpsertUserAllHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/UpsertUserAllHandler.java index a761ef73..c111fb51 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/UpsertUserAllHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/UpsertUserAllHandler.java @@ -34,21 +34,21 @@ public class UpsertUserAllHandler implements BaseHandler { private final CardService cardService; - private final UserDataRepository userDataRepository; - private final UserExtendRepository userExtendRepository; - private final UserOptionRepository userOptionRepository; - private final UserItemRepository userItemRepository; - private final UserMusicDetailRepository userMusicDetailRepository; + private final Mai2UserDataRepo userDataRepository; + private final Mai2UserExtendRepo userExtendRepository; + private final Mai2UserOptionRepo userOptionRepository; + private final Mai2UserItemRepo userItemRepository; + private final Mai2UserMusicDetailRepo userMusicDetailRepository; private final Mai2UserActRepo userActRepository; private final Mai2UserCharacterRepo userCharacterRepository; - private final UserMapRepository userMapRepository; - private final UserLoginBonusRepository userLoginBonusRepository; - private final UserFavoriteRepository userFavoriteRepository; - private final UserUdemaeRepository userUdemaeRepository; - private final UserGeneralDataRepository userGeneralDataRepository; - private final UserCourseRepository userCourseRepository; - private final UserFriendSeasonRankingRepository userFriendSeasonRankingRepository; - private final UserPlaylogRepository userPlaylogRepository; + private final Mai2UserMapRepo userMapRepository; + private final Mai2UserLoginBonusRepo userLoginBonusRepository; + private final Mai2UserFavoriteRepo userFavoriteRepository; + private final Mai2UserUdemaeRepo userUdemaeRepository; + private final Mai2UserGeneralDataRepo userGeneralDataRepository; + private final Mai2UserCourseRepo userCourseRepository; + private final Mai2UserFriendSeasonRankingRepo userFriendSeasonRankingRepository; + private final Mai2UserPlaylogRepo userPlaylogRepository; @Override public String handle(Map request) throws JsonProcessingException { diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/UpsertUserPrintHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/UpsertUserPrintHandler.java index c49b1ecf..816aedd9 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/UpsertUserPrintHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/UpsertUserPrintHandler.java @@ -3,8 +3,8 @@ package icu.samnyan.aqua.sega.maimai2.handler.impl; import com.fasterxml.jackson.core.JsonProcessingException; import icu.samnyan.aqua.sega.maimai2.model.Mai2UserCardRepo; -import icu.samnyan.aqua.sega.maimai2.model.UserDataRepository; -import icu.samnyan.aqua.sega.maimai2.model.UserPrintDetailRepository; +import icu.samnyan.aqua.sega.maimai2.model.Mai2UserDataRepo; +import icu.samnyan.aqua.sega.maimai2.model.Mai2UserPrintDetailRepo; import icu.samnyan.aqua.sega.maimai2.handler.BaseHandler; import icu.samnyan.aqua.sega.maimai2.model.request.UpsertUserPrint; import icu.samnyan.aqua.sega.maimai2.model.userdata.UserCard; @@ -30,11 +30,11 @@ public class UpsertUserPrintHandler implements BaseHandler { private final BasicMapper mapper; private final Mai2UserCardRepo userCardRepository; - private final UserPrintDetailRepository userPrintDetailRepository; - private final UserDataRepository userDataRepository; + private final Mai2UserPrintDetailRepo userPrintDetailRepository; + private final Mai2UserDataRepo userDataRepository; @Autowired - public UpsertUserPrintHandler(BasicMapper mapper, UserPrintDetailRepository userPrintDetailRepository, Mai2UserCardRepo userCardRepository, UserDataRepository userDataRepository) { + public UpsertUserPrintHandler(BasicMapper mapper, Mai2UserPrintDetailRepo userPrintDetailRepository, Mai2UserCardRepo userCardRepository, Mai2UserDataRepo userDataRepository) { this.mapper = mapper; this.userPrintDetailRepository = userPrintDetailRepository; this.userCardRepository = userCardRepository; diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/model/Repos.kt b/src/main/java/icu/samnyan/aqua/sega/maimai2/model/Repos.kt index ba8b1288..d418f04a 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/model/Repos.kt +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/model/Repos.kt @@ -27,110 +27,109 @@ interface UserLinked: JpaRepository { fun deleteByUser(user: UserDetail) } -@Repository("Maimai2MapEncountNpcRepository") +@Repository interface Mai2MapEncountNpcRepo : UserLinked -@Repository("Maimai2UserActRepository") +@Repository interface Mai2UserActRepo : UserLinked { fun findByUserAndKindAndActivityId(user: UserDetail, kind: Int, id: Int): Optional fun findByUser_Card_ExtIdAndKind(userId: Long, kind: Int): List } -@Repository("Maimai2UserCardRepository") +@Repository interface Mai2UserCardRepo : UserLinked { fun findByUserAndCardId(user: UserDetail, cardId: Int): Optional } -@Repository("Maimai2UserCharacterRepository") +@Repository interface Mai2UserCharacterRepo : UserLinked { fun findByUserAndCharacterId(user: UserDetail, characterId: Int): Optional } -@Repository("Maimai2UserChargeRepository") -interface UserChargeRepository : UserLinked +@Repository +interface Mai2UserChargeRepo : UserLinked -@Repository("Maimai2UserCourseRepository") -interface UserCourseRepository : UserLinked { +@Repository +interface Mai2UserCourseRepo : UserLinked { fun findByUserAndCourseId(user: UserDetail, courseId: Int): Optional } -@Repository("Maimai2UserDataRepository") -interface UserDataRepository : GenericUserDataRepo { +@Repository +interface Mai2UserDataRepo : GenericUserDataRepo { fun findByCardExtId(userId: Long): Optional @Transactional fun deleteByCard(card: Card) } -@Repository("Maimai2UserExtendRepository") -interface UserExtendRepository : UserLinked +@Repository +interface Mai2UserExtendRepo : UserLinked -@Repository("Maimai2UserFavoriteRepository") -interface UserFavoriteRepository : UserLinked { +@Repository +interface Mai2UserFavoriteRepo : UserLinked { fun findByUserAndItemKind(user: UserDetail, kind: Int): Optional fun findByUserIdAndItemKind(userId: Long, kind: Int): List } -@Repository("Maimai2UserFriendSeasonRankingRepository") -interface UserFriendSeasonRankingRepository : UserLinked { +@Repository +interface Mai2UserFriendSeasonRankingRepo : UserLinked { fun findByUserAndSeasonId(user: UserDetail, seasonId: Int): Optional } -@Repository("Maimai2UserGeneralDataRepository") -interface UserGeneralDataRepository : UserLinked { +@Repository +interface Mai2UserGeneralDataRepo : UserLinked { fun findByUserAndPropertyKey(user: UserDetail, key: String): Optional fun findByUser_Card_ExtIdAndPropertyKey(userId: Long, key: String): Optional } -@Repository("Maimai2UserItemRepository") -interface UserItemRepository : UserLinked { +@Repository +interface Mai2UserItemRepo : UserLinked { fun findByUserAndItemKindAndItemId(user: UserDetail, itemKind: Int, itemId: Int): Optional fun findByUser_Card_ExtIdAndItemKind(userId: Long, kind: Int, page: Pageable): Page } -@Repository("Maimai2UserLoginBonusRepository") -interface UserLoginBonusRepository : UserLinked { +@Repository +interface Mai2UserLoginBonusRepo : UserLinked { fun findByUserAndBonusId(user: UserDetail, bonusId: Int): Optional } -@Repository("Maimai2UserMapRepository") -interface UserMapRepository : UserLinked { +@Repository +interface Mai2UserMapRepo : UserLinked { fun findByUserAndMapId(user: UserDetail, mapId: Int): Optional } -@Repository("Maimai2UserMusicDetailRepository") -interface UserMusicDetailRepository : UserLinked { +@Repository +interface Mai2UserMusicDetailRepo : UserLinked { fun findByUser_Card_ExtIdAndMusicId(userId: Long, id: Int): List fun findByUserAndMusicIdAndLevel(user: UserDetail, musicId: Int, level: Int): Optional } -@Repository("Maimai2UserOptionRepository") -interface UserOptionRepository : UserLinked { -} +@Repository +interface Mai2UserOptionRepo : UserLinked -@Repository("Maimai2UserPlaylogRepository") -interface UserPlaylogRepository : GenericPlaylogRepo, UserLinked { +@Repository +interface Mai2UserPlaylogRepo : GenericPlaylogRepo, UserLinked { fun findByUser_Card_ExtIdAndMusicIdAndLevel(userId: Long, musicId: Int, level: Int): List } -@Repository("Maimai2UserPrintDetailRepository") -interface UserPrintDetailRepository : JpaRepository +@Repository +interface Mai2UserPrintDetailRepo : JpaRepository -@Repository("Maimai2UserUdemaeRepository") -interface UserUdemaeRepository : UserLinked +@Repository +interface Mai2UserUdemaeRepo : UserLinked -@Repository("Maimai2GameChargeRepository") -interface GameChargeRepository : JpaRepository +@Repository +interface Mai2GameChargeRepo : JpaRepository -@Repository("Maimai2GameEventRepository") -interface GameEventRepository : JpaRepository { +@Repository +interface Mai2GameEventRepo : JpaRepository { fun findByTypeAndEnable(type: Int, enable: Boolean): List } -@Repository("Maimai2GameSellingCardRepository") -interface GameSellingCardRepository : JpaRepository \ No newline at end of file +@Repository +interface Mai2GameSellingCardRepo : JpaRepository \ No newline at end of file