Bennett/AquaDX
1
0
Fork 0
forked from Cookies_Github_mirror/AquaDX
Code Pull Requests Actions Releases Activity

[F] Fix chusan export

Browse Source
This commit is contained in:
Azalea
2024-04-01 21:04:49 -04:00
parent 49d4e88022
commit 686b50eeda
11 changed files with 34 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserMapAreaHandler.java
View File

@@ -2,7 +2,7 @@ package icu.samnyan.aqua.sega.chusan.handler;
import com.fasterxml.jackson.core.JsonProcessingException;
import icu.samnyan.aqua.sega.general.BaseHandler;
import icu.samnyan.aqua.sega.chusan.model.userdata.UserMapArea;
import icu.samnyan.aqua.sega.chusan.model.userdata.UserMap;
import icu.samnyan.aqua.sega.chusan.service.UserMapAreaService;
import icu.samnyan.aqua.sega.util.jackson.StringMapper;
import org.slf4j.Logger;
@@ -37,7 +37,7 @@ public class GetUserMapAreaHandler implements BaseHandler {
public String handle(Map<String, Object> request) throws JsonProcessingException {
String userId = (String) request.get("userId");
List<UserMapArea> userMapAreaList = userMapAreaService.getByUserId(userId);
List<UserMap> userMapAreaList = userMapAreaService.getByUserId(userId);
Map<String, Object> resultMap = new LinkedHashMap<>();
resultMap.put("userId", userId);

10
src/main/java/icu/samnyan/aqua/sega/chusan/handler/UpsertUserAllHandler.java
View File

@@ -102,14 +102,14 @@ public class UpsertUserAllHandler implements BaseHandler {
// userMapList
if (upsertUserAll.getUserMapAreaList() != null) {
List<UserMapArea> userMapList = upsertUserAll.getUserMapAreaList();
Map<Integer, UserMapArea> newUserMapMap = new HashMap<>();
List<UserMap> userMapList = upsertUserAll.getUserMapAreaList();
Map<Integer, UserMap> newUserMapMap = new HashMap<>();
userMapList.forEach(newUserMap -> {
int mapId = newUserMap.getMapAreaId();
UserMapArea userMap;
Optional<UserMapArea> userMapOptional = userMapService.getByUserAndMapAreaId(newUserData, mapId);
userMap = userMapOptional.orElseGet(() -> new UserMapArea(newUserData));
UserMap userMap;
Optional<UserMap> userMapOptional = userMapService.getByUserAndMapAreaId(newUserData, mapId);
userMap = userMapOptional.orElseGet(() -> new UserMap(newUserData));
newUserMap.setId(userMap.getId());
newUserMap.setUser(userMap.getUser());