zyh/game_server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor account management DTOs by removing displayName and role fields from AccountCreateRequest, AccountUpdateRequest, and AccountResponse, and updating related logic in AccountService. Adjust alwaysApply setting in zh.mdc to false.

Browse Source
This commit is contained in:
zyh
2025-08-24 18:41:57 +08:00
parent f37159e1fc
commit 1b3ce1040a
31 changed files with 240 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/com/gameplatform/server/service/account/AccountService.java
View File

@@ -25,14 +25,14 @@ public class AccountService {
this.passwordEncoder = passwordEncoder;
}
public Mono<PageResult<AccountResponse>> list(String userType, String status, String role, String keyword,
public Mono<PageResult<AccountResponse>> list(String userType, String status, String keyword,
Integer page, Integer size) {
int p = (page == null || page < 1) ? 1 : page;
int s = (size == null || size < 1 || size > 200) ? 20 : size;
int offset = (p - 1) * s;
return Mono.fromCallable(() -> {
long total = mapper.countByFilter(userType, status, role, keyword);
List<UserAccount> list = mapper.listByFilter(userType, status, role, keyword, s, offset);
long total = mapper.countByFilter(userType, status, null, keyword);
List<UserAccount> list = mapper.listByFilter(userType, status, null, keyword, s, offset);
List<AccountResponse> items = list.stream().map(this::toResp).collect(Collectors.toList());
return new PageResult<>(items, total, p, s);
})
@@ -54,16 +54,13 @@ public class AccountService {
UserAccount acc = new UserAccount();
acc.setUserType(type);
acc.setUsername(req.getUsername());
acc.setDisplayName(req.getDisplayName());
acc.setStatus(req.getStatus() == null ? "ENABLED" : req.getStatus());
if ("ADMIN".equals(type)) {
acc.setRole(req.getRole() == null ? "ADMIN" : req.getRole());
acc.setPointsBalance(0L);
} else {
acc.setRole(null);
acc.setPointsBalance(req.getPointsBalance() == null ? 0L : req.getPointsBalance());
}
acc.setPasswordHash(passwordEncoder.encode(req.getInitialPassword()));
acc.setPasswordHash(passwordEncoder.encode(req.getPassword()));
mapper.insert(acc);
return toResp(acc);
})
@@ -83,11 +80,7 @@ public class AccountService {
if (db == null) return null;
UserAccount patch = new UserAccount();
patch.setId(id);
patch.setDisplayName(req.getDisplayName());
// Only ADMIN account may set role; AGENT's role must remain null
if ("ADMIN".equalsIgnoreCase(db.getUserType())) {
patch.setRole(req.getRole());
}
patch.setStatus(req.getStatus());
mapper.update(patch);
return mapper.findById(id);
@@ -119,8 +112,7 @@ public class AccountService {
r.setId(a.getId());
r.setUserType(a.getUserType());
r.setUsername(a.getUsername());
r.setDisplayName(a.getDisplayName());
r.setRole(a.getRole());
r.setStatus(a.getStatus());
r.setPointsBalance(a.getPointsBalance());
r.setCreatedAt(a.getCreatedAt());