[general] Fix all type mismatch with db

This commit is contained in:
samnyan
2020-12-25 14:15:04 +08:00
parent 6152e8ef0a
commit ff5eab48c7
78 changed files with 165 additions and 190 deletions

View File

@@ -35,10 +35,10 @@ public class UserActivityService {
}
public List<UserActivity> getAllByUserIdAndKind(String userId, String kind) {
return userActivityRepository.findAllByUser_Card_ExtIdAndKindOrderBySortNumberDesc(Integer.parseInt(userId), Integer.parseInt(kind));
return userActivityRepository.findAllByUser_Card_ExtIdAndKindOrderBySortNumberDesc(Long.parseLong(userId), Integer.parseInt(kind));
}
public List<UserActivity> getByUserId(String userId) {
return userActivityRepository.findAllByUser_Card_ExtId(Integer.parseInt(userId));
return userActivityRepository.findAllByUser_Card_ExtId(Long.parseLong(userId));
}
}

View File

@@ -34,12 +34,12 @@ public class UserCharacterService {
}
public List<UserCharacter> getByUserId(String userId) {
return userCharacterRepository.findByUser_Card_ExtId(Integer.parseInt(userId));
return userCharacterRepository.findByUser_Card_ExtId(Long.parseLong(userId));
}
public Page<UserCharacter> getByUserId(String userId, int pageNumber, int maxCount) {
Pageable pageable = PageRequest.of(pageNumber, maxCount);
return userCharacterRepository.findByUser_Card_ExtId(Integer.parseInt(userId), pageable);
return userCharacterRepository.findByUser_Card_ExtId(Long.parseLong(userId), pageable);
}
public Optional<UserCharacter> getByUserAndCharacterId(UserData user, int characterId) {

View File

@@ -29,7 +29,7 @@ public class UserChargeService {
}
public List<UserCharge> getByUserId(String userId) {
return userChargeRepository.findByUser_Card_ExtId(Integer.parseInt(userId));
return userChargeRepository.findByUser_Card_ExtId(Long.parseLong(userId));
}
public Optional<UserCharge> getByUserAndChargeId(UserData user, int chargeId) {

View File

@@ -34,12 +34,12 @@ public class UserCourseService {
}
public List<UserCourse> getByUserId(String userId) {
return userCourseRepository.findByUser_Card_ExtId(Integer.parseInt(userId));
return userCourseRepository.findByUser_Card_ExtId(Long.parseLong(userId));
}
public Page<UserCourse> getByUserId(String userId, int pageNum, int maxCount) {
Pageable page = PageRequest.of(pageNum, maxCount);
return userCourseRepository.findByUser_Card_ExtId(Integer.parseInt(userId), page);
return userCourseRepository.findByUser_Card_ExtId(Long.parseLong(userId), page);
}
public Optional<UserCourse> getByUserAndCourseId(UserData user, int courseId) {

View File

@@ -30,6 +30,6 @@ public class UserDataExService {
}
public Optional<UserDataEx> getByExtId(String userId) {
return userDataExRepository.findByUser_Card_ExtId(Integer.parseInt(userId));
return userDataExRepository.findByUser_Card_ExtId(Long.parseLong(userId));
}
}

View File

@@ -31,7 +31,7 @@ public class UserDataService {
}
public Optional<UserData> getUserByExtId(String aimeId) {
return userDataRepository.findByCard_ExtId(Integer.parseInt(aimeId));
return userDataRepository.findByCard_ExtId(Long.parseLong(aimeId));
}
public Optional<UserData> getUserByCard(Card card) {

View File

@@ -35,6 +35,6 @@ public class UserDuelService {
}
public List<UserDuel> getByUserId(String userId) {
return userDuelRepository.findByUser_Card_ExtId(Integer.parseInt(userId));
return userDuelRepository.findByUser_Card_ExtId(Long.parseLong(userId));
}
}

View File

@@ -30,6 +30,6 @@ public class UserGameOptionExService {
}
public Optional<UserGameOptionEx> getByUserId(String userId) {
return userGameOptionExRepository.findByUser_Card_ExtId(Integer.parseInt(userId));
return userGameOptionExRepository.findByUser_Card_ExtId(Long.parseLong(userId));
}
}

View File

@@ -30,6 +30,6 @@ public class UserGameOptionService {
}
public Optional<UserGameOption> getByUserId(String userId) {
return userGameOptionRepository.findByUser_Card_ExtId(Integer.parseInt(userId));
return userGameOptionRepository.findByUser_Card_ExtId(Long.parseLong(userId));
}
}

View File

@@ -28,7 +28,7 @@ public class UserGeneralDataService {
}
public Optional<UserGeneralData> getByUserIdAndKey(String userId, String key) {
return userGeneralDataRepository.findByUser_Card_ExtIdAndPropertyKey(Integer.parseInt(userId), key);
return userGeneralDataRepository.findByUser_Card_ExtIdAndPropertyKey(Long.parseLong(userId), key);
}
}

View File

@@ -33,7 +33,7 @@ public class UserItemService {
}
public List<UserItem> getByUserId(String userId) {
return userItemRepository.findAllByUser_Card_ExtId(Integer.parseInt(userId));
return userItemRepository.findAllByUser_Card_ExtId(Long.parseLong(userId));
}
public Optional<UserItem> getByUserAndItemIdAndKind(UserData user, int itemId, int itemKind) {
@@ -42,10 +42,10 @@ public class UserItemService {
public Page<UserItem> getByUserAndItemKind(String userId, int kind, int pageNumber, int maxCount) {
Pageable page = PageRequest.of(pageNumber, maxCount);
return userItemRepository.findAllByUser_Card_ExtIdAndItemKind(Integer.parseInt(userId), kind, page);
return userItemRepository.findAllByUser_Card_ExtIdAndItemKind(Long.parseLong(userId), kind, page);
}
public Page<UserItem> getByUserId(String userId, int page, int size) {
return userItemRepository.findByUser_Card_ExtId(Integer.parseInt(userId), PageRequest.of(page, size));
return userItemRepository.findByUser_Card_ExtId(Long.parseLong(userId), PageRequest.of(page, size));
}
}

View File

@@ -35,7 +35,7 @@ public class UserMapService {
}
public List<UserMap> getByUserId(String userId) {
return userMapRepository.findAllByUser_Card_ExtId(Integer.parseInt(userId));
return userMapRepository.findAllByUser_Card_ExtId(Long.parseLong(userId));
}
public Optional<UserMap> getByUserAndMapId(UserData user, int mapId) {

View File

@@ -5,7 +5,6 @@ import icu.samnyan.aqua.sega.chunithm.model.userdata.UserData;
import icu.samnyan.aqua.sega.chunithm.model.userdata.UserMusicDetail;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
@@ -34,15 +33,15 @@ public class UserMusicDetailService {
}
public List<UserMusicDetail> getByUserId(String userId) {
return userMusicDetailRepository.findByUser_Card_ExtId(Integer.parseInt(userId));
return userMusicDetailRepository.findByUser_Card_ExtId(Long.parseLong(userId));
}
public Page<UserMusicDetail> getByUserId(String userId, Pageable page) {
return userMusicDetailRepository.findByUser_Card_ExtId(Integer.parseInt(userId), page);
return userMusicDetailRepository.findByUser_Card_ExtId(Long.parseLong(userId), page);
}
public List<UserMusicDetail> getByUserIdAndMusicId(String userId, int musicId) {
return userMusicDetailRepository.findByUser_Card_ExtIdAndMusicId(Integer.parseInt(userId), musicId);
return userMusicDetailRepository.findByUser_Card_ExtIdAndMusicId(Long.parseLong(userId), musicId);
}
public Optional<UserMusicDetail> getByUserAndMusicIdAndLevel(UserData user, int musicId, int level) {

View File

@@ -33,19 +33,19 @@ public class UserPlaylogService {
}
public Page<UserPlaylog> getRecentPlays(String userId, Pageable page) {
return userPlaylogRepository.findByUser_Card_ExtId(Integer.parseInt(userId), page);
return userPlaylogRepository.findByUser_Card_ExtId(Long.parseLong(userId), page);
}
public List<UserPlaylog> getRecent30Plays(String userId) {
Pageable page = PageRequest.of(0, 30, Sort.by(Sort.Direction.DESC, "userPlayDate"));
return userPlaylogRepository.findByUser_Card_ExtIdAndLevelNot(Integer.parseInt(userId), 4, page);
return userPlaylogRepository.findByUser_Card_ExtIdAndLevelNot(Long.parseLong(userId), 4, page);
}
public List<UserPlaylog> getByUserId(String userId) {
return userPlaylogRepository.findByUser_Card_ExtId(Integer.parseInt(userId));
return userPlaylogRepository.findByUser_Card_ExtId(Long.parseLong(userId));
}
public List<UserPlaylog> getByUserIdAndMusicIdAndLevel(String userId, int id, int level) {
return userPlaylogRepository.findByUser_Card_ExtIdAndMusicIdAndLevel(Integer.parseInt(userId), id, level);
return userPlaylogRepository.findByUser_Card_ExtIdAndMusicIdAndLevel(Long.parseLong(userId), id, level);
}
}