hy/yumi-java
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: hy:1ac5e6c62d09542c673d87167a61072a5fa0c530
Branches Tags
hy:main
hy:test
hy:release/redis-memory-fix-20260521
hy:feature-trtc
..
compare: hy:354f11150fc1d23bf080cad2529ea4e9f15fa8e6
Branches Tags
hy:main
hy:test
hy:release/redis-memory-fix-20260521
hy:feature-trtc

No commits in common. "1ac5e6c62d09542c673d87167a61072a5fa0c530" and "354f11150fc1d23bf080cad2529ea4e9f15fa8e6" have entirely different histories.
1ac5e6c62d ... 354f11150f

1 changed files with 0 additions and 47 deletions
Show Stats Expand all files Collapse all files

47
rc-service/rc-service-console/console-application/src/main/java/com/red/circle/console/app/service/app/team/manager/TeamManagerServiceImpl.java
View File

@ -9,16 +9,11 @@ import com.red.circle.console.inner.error.ConsoleErrorCode;
import com.red.circle.framework.core.asserts.ResponseAssert; import com.red.circle.framework.core.asserts.ResponseAssert;
import com.red.circle.framework.core.response.CommonErrorCode; import com.red.circle.framework.core.response.CommonErrorCode;
import com.red.circle.framework.dto.PageResult; import com.red.circle.framework.dto.PageResult;
import com.red.circle.other.inner.endpoint.sys.AdministratorClient;
import com.red.circle.other.inner.endpoint.team.manager.TeamManagerClient; import com.red.circle.other.inner.endpoint.team.manager.TeamManagerClient;
import com.red.circle.other.inner.endpoint.team.target.UserHistoryIdentityClient; import com.red.circle.other.inner.endpoint.team.target.UserHistoryIdentityClient;
import com.red.circle.other.inner.endpoint.user.region.RegionConfigClient; import com.red.circle.other.inner.endpoint.user.region.RegionConfigClient;
import com.red.circle.other.inner.endpoint.user.user.UserProfileClient; import com.red.circle.other.inner.endpoint.user.user.UserProfileClient;
import com.red.circle.other.inner.enums.sys.appmanager.RoomRolesEnum;
import com.red.circle.other.inner.model.cmd.sys.AddSysAdministratorCmd;
import com.red.circle.other.inner.model.cmd.sys.SysAdministratorChangeStatusCmd;
import com.red.circle.other.inner.model.cmd.team.manager.TeamManagerOpsPageQryCmd; import com.red.circle.other.inner.model.cmd.team.manager.TeamManagerOpsPageQryCmd;
import com.red.circle.other.inner.model.dto.sys.AdministratorDTO;
import com.red.circle.other.inner.model.dto.agency.manager.TeamManagerDTO; import com.red.circle.other.inner.model.dto.agency.manager.TeamManagerDTO;
import com.red.circle.other.inner.model.dto.user.UserProfileDTO; import com.red.circle.other.inner.model.dto.user.UserProfileDTO;
import com.red.circle.tool.core.sequence.IdWorkerUtils; import com.red.circle.tool.core.sequence.IdWorkerUtils;
@ -41,7 +36,6 @@ public class TeamManagerServiceImpl implements TeamManagerService {
private final UserService userService; private final UserService userService;
private final TeamManagerClient teamManagerClient; private final TeamManagerClient teamManagerClient;
private final AdministratorClient administratorClient;
private final UserProfileClient userProfileClient; private final UserProfileClient userProfileClient;
private final RegionConfigClient regionConfigClient; private final RegionConfigClient regionConfigClient;
private final UserHistoryIdentityClient userHistoryIdentityClient; private final UserHistoryIdentityClient userHistoryIdentityClient;
@ -118,7 +112,6 @@ public class TeamManagerServiceImpl implements TeamManagerService {
ResponseAssert.requiredSuccess(teamManagerClient.add(addCmd)); ResponseAssert.requiredSuccess(teamManagerClient.add(addCmd));
ResponseAssert.requiredSuccess(userHistoryIdentityClient.saveManager(cmd.getUserId())); ResponseAssert.requiredSuccess(userHistoryIdentityClient.saveManager(cmd.getUserId()));
ensureAppManager(cmd.getUserId(), cmd.getCreateUser());
} }
@Override @Override
@ -135,46 +128,6 @@ public class TeamManagerServiceImpl implements TeamManagerService {
TeamManagerDTO db = ResponseAssert.requiredSuccess(teamManagerClient.getById(id)); TeamManagerDTO db = ResponseAssert.requiredSuccess(teamManagerClient.getById(id));
ResponseAssert.notNull(CommonErrorCode.DATA_ERROR, db); ResponseAssert.notNull(CommonErrorCode.DATA_ERROR, db);
ResponseAssert.requiredSuccess(teamManagerClient.deleteById(id)); ResponseAssert.requiredSuccess(teamManagerClient.deleteById(id));
removeAppManagerIfOnlyManagerRole(db.getUserId());
}
private void ensureAppManager(Long userId, Long operatorUserId) {
AdministratorDTO administrator = ResponseAssert.requiredSuccess(
administratorClient.getByUserId(userId));
if (Objects.isNull(administrator)) {
AddSysAdministratorCmd addCmd = new AddSysAdministratorCmd();
addCmd.setUserId(userId);
addCmd.setRoles(RoomRolesEnum.MANAGER.name());
addCmd.setReqUserId(operatorUserId);
ResponseAssert.requiredSuccess(administratorClient.addSysAdministrator(addCmd));
administrator = ResponseAssert.requiredSuccess(administratorClient.getByUserId(userId));
}
ResponseAssert.notNull(CommonErrorCode.DATA_ERROR, administrator);
if (StringUtils.isBlank(administrator.getRoles())
|| !Boolean.TRUE.equals(administrator.getStatus())) {
ResponseAssert.requiredSuccess(
administratorClient.changeRoles(administrator.getId(), RoomRolesEnum.MANAGER.name()));
}
if (!Boolean.TRUE.equals(administrator.getStatus())) {
SysAdministratorChangeStatusCmd statusCmd = new SysAdministratorChangeStatusCmd()
.setId(administrator.getId())
.setStatus(1);
statusCmd.setReqUserId(operatorUserId);
ResponseAssert.requiredSuccess(administratorClient.changeStatusAdministrator(statusCmd));
}
}
private void removeAppManagerIfOnlyManagerRole(Long userId) {
AdministratorDTO administrator = ResponseAssert.requiredSuccess(
administratorClient.getByUserId(userId));
if (Objects.isNull(administrator) || !RoomRolesEnum.MANAGER.eq(administrator.getRoles())) {
return;
}
ResponseAssert.requiredSuccess(administratorClient.deleteSysAdministrator(administrator.getId()));
} }
} }