lzc256
/
AquaDX
mirror of https://github.com/hykilpikonna/AquaDX
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

[maimai2] Add Splash Plus support

pull/1/head
Dom Eori 2021-11-30 18:43:02 +09:00
parent 90091d2155
commit 708cbf33d1
5 changed files with 49 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/icu/samnyan/aqua/sega/allnet/AllNetController.java
View File

@ -128,8 +128,7 @@ public class AllNetController {
case "SDEY":
return "http://" + HOST + ":" + PORT + "/MaimaiServlet/";
case "SDEZ":
// This leads to http://HOST+PORT/Maimai2Servlet/
return HOST + ":" + PORT + "/";
return "http://" + HOST + ":" + PORT + "/";
default:
return "http://" + HOST + ":" + PORT + "/";
}

22
src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/UpsertUserAllHandler.java
View File

@ -45,8 +45,9 @@ public class UpsertUserAllHandler implements BaseHandler {
private final UserFavoriteRepository userFavoriteRepository;
private final UserUdemaeRepository userUdemaeRepository;
private final UserGeneralDataRepository userGeneralDataRepository;
private final UserCourseRepository userCourseRepository;
public UpsertUserAllHandler(BasicMapper mapper, CardService cardService, UserDataRepository userDataRepository, UserExtendRepository userExtendRepository, UserOptionRepository userOptionRepository, UserItemRepository userItemRepository, UserMusicDetailRepository userMusicDetailRepository, UserActRepository userActRepository, UserCharacterRepository userCharacterRepository, UserMapRepository userMapRepository, UserLoginBonusRepository userLoginBonusRepository, UserFavoriteRepository userFavoriteRepository, UserUdemaeRepository userUdemaeRepository, UserGeneralDataRepository userGeneralDataRepository) {
public UpsertUserAllHandler(BasicMapper mapper, CardService cardService, UserDataRepository userDataRepository, UserExtendRepository userExtendRepository, UserOptionRepository userOptionRepository, UserItemRepository userItemRepository, UserMusicDetailRepository userMusicDetailRepository, UserActRepository userActRepository, UserCharacterRepository userCharacterRepository, UserMapRepository userMapRepository, UserLoginBonusRepository userLoginBonusRepository, UserFavoriteRepository userFavoriteRepository, UserUdemaeRepository userUdemaeRepository, UserGeneralDataRepository userGeneralDataRepository, UserCourseRepository userCourseRepository) {
this.mapper = mapper;
this.cardService = cardService;
this.userDataRepository = userDataRepository;
@ -61,6 +62,7 @@ public class UpsertUserAllHandler implements BaseHandler {
this.userFavoriteRepository = userFavoriteRepository;
this.userUdemaeRepository = userUdemaeRepository;
this.userGeneralDataRepository = userGeneralDataRepository;
this.userCourseRepository = userCourseRepository;
}
@Override
@ -248,6 +250,24 @@ public class UpsertUserAllHandler implements BaseHandler {
userMusicDetailRepository.saveAll(newUserMusicDetailList);
}
// UserCourseList
if (userAll.getUserCourseList() != null) {
List<UserCourse> userCourseList = userAll.getUserCourseList();
List<UserCourse> newUserCourseList = new ArrayList<>();
for (UserCourse newUserCourse : userCourseList) {
int courseId = newUserCourse.getCourseId();
Optional<UserCourse> userCourseOptional = userCourseRepository.findByUserAndCourseId(newUserData, courseId);
UserCourse userCourse = userCourseOptional.orElseGet(() -> new UserCourse(newUserData));
newUserCourse.setId(userCourse.getId());
newUserCourse.setUser(newUserData);
newUserCourseList.add(newUserCourse);
}
userCourseRepository.saveAll(newUserCourseList);
}
// UserFavoriteList
if (userAll.getUserFavoriteList() != null) {
List<UserFavorite> userFavoriteList = userAll.getUserFavoriteList();

2
src/main/java/icu/samnyan/aqua/sega/maimai2/model/request/data/UserAll.java
View File

@ -32,7 +32,7 @@ public class UserAll implements Serializable {
private List<UserCharge> userChargeList;
private List<UserFavorite> userFavoriteList;
private List<UserActivity> userActivityList;
private Map<String, Object> userGamePlaylogList;
private List<Map<String, Object>> userGamePlaylogList;
private String isNewCharacterList;
private String isNewMapList;
private String isNewLoginBonusList;

2
src/main/resources/db/migration/mysql/V63__fix_maimai2_spp_table.sql 100644
View File

@ -0,0 +1,2 @@
ALTER TABLE `maimai2_user_course`
RENAME COLUMN `total_rest_life` TO `total_restlife`;

24
src/main/resources/db/migration/sqlite/V63__fix_maimai2_spp_table.sql 100644
View File

@ -0,0 +1,24 @@
-- I got zero bug report about this before so.. just assume that user never used this table and API.
DROP TABLE `maimai2_user_course`;
CREATE TABLE `maimai2_user_course` (
id INTEGER,
course_id INTEGER,
is_last_clear BOOLEAN,
total_restlife INTEGER,
total_achievement INTEGER,
total_deluxscore INTEGER,
play_count INTEGER,
clear_date VARCHAR (255),
last_play_date VARCHAR (255),
best_achievement INTEGER,
best_achievement_date VARCHAR (255),
best_deluxscore INTEGER,
best_deluxscore_date VARCHAR (255),
user_id BIGINT REFERENCES maimai2_user_detail (id),
PRIMARY KEY (
id
)
);