gfwleak/appsketch-works-asw-controller
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: ASW-108 调整 workspace 新增/修改接口 members 属性校验规则

Browse Source
This commit is contained in:
shizhendong
2024-10-21 15:51:56 +08:00
parent c96e57cb30
commit 63fd0ded17
2 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/geedge/asw/module/workspace/controller/WorkspaceController.java
View File

@@ -60,7 +60,6 @@ public class WorkspaceController {
public R save(@RequestBody WorkspaceEntity workspace) { public R save(@RequestBody WorkspaceEntity workspace) {
VerifyUtil.is(workspace).notNull() VerifyUtil.is(workspace).notNull()
.and(workspace.getName()).notEmpty(RCode.WORKSPACE_NAME_CANNOT_EMPTY) .and(workspace.getName()).notEmpty(RCode.WORKSPACE_NAME_CANNOT_EMPTY)
.and(workspace.getMembers()).notEmpty(RCode.WORKSPACE_MEMBER_CANNOT_EMPTY)
.and(workspace.getVisibility()).notEmpty(RCode.WORKSPACE_VISIBILITY_CANNOT_EMPTY); .and(workspace.getVisibility()).notEmpty(RCode.WORKSPACE_VISIBILITY_CANNOT_EMPTY);
WorkspaceEntity workspaceEntity = workspaceService.saveWorkspace(workspace); WorkspaceEntity workspaceEntity = workspaceService.saveWorkspace(workspace);
@@ -73,7 +72,6 @@ public class WorkspaceController {
VerifyUtil.is(workspace).notNull() VerifyUtil.is(workspace).notNull()
.and(workspace.getId()).notEmpty(RCode.WORKSPACE_ID_CANNOT_EMPTY) .and(workspace.getId()).notEmpty(RCode.WORKSPACE_ID_CANNOT_EMPTY)
.and(workspace.getName()).notEmpty(RCode.WORKSPACE_NAME_CANNOT_EMPTY) .and(workspace.getName()).notEmpty(RCode.WORKSPACE_NAME_CANNOT_EMPTY)
.and(workspace.getMembers()).notEmpty(RCode.WORKSPACE_MEMBER_CANNOT_EMPTY)
.and(workspace.getVisibility()).notEmpty(RCode.WORKSPACE_VISIBILITY_CANNOT_EMPTY); .and(workspace.getVisibility()).notEmpty(RCode.WORKSPACE_VISIBILITY_CANNOT_EMPTY);
WorkspaceEntity workspaceEntity = workspaceService.updateWorkspace(workspace); WorkspaceEntity workspaceEntity = workspaceService.updateWorkspace(workspace);

32
src/main/java/net/geedge/asw/module/workspace/service/impl/WorkspaceServiceImpl.java
View File

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import net.geedge.asw.common.util.ASWException; import net.geedge.asw.common.util.ASWException;
import net.geedge.asw.common.util.Constants;
import net.geedge.asw.common.util.RCode; import net.geedge.asw.common.util.RCode;
import net.geedge.asw.common.util.T; import net.geedge.asw.common.util.T;
import net.geedge.asw.module.workspace.dao.WorkspaceDao; import net.geedge.asw.module.workspace.dao.WorkspaceDao;
@@ -49,12 +48,14 @@ public class WorkspaceServiceImpl extends ServiceImpl<WorkspaceDao, WorkspaceEnt
workspaceService.save(workspace); workspaceService.save(workspace);
List<WorkspaceMemberEntity> members = workspace.getMembers(); List<WorkspaceMemberEntity> members = workspace.getMembers();
members.stream().forEach(x -> { if (T.CollUtil.isNotEmpty(members)) {
x.setWorkspaceId(workspace.getId()); members.stream().forEach(x -> {
x.setCreateTimestamp(System.currentTimeMillis()); x.setWorkspaceId(workspace.getId());
x.setCreateUserId(StpUtil.getLoginIdAsString()); x.setCreateTimestamp(System.currentTimeMillis());
}); x.setCreateUserId(StpUtil.getLoginIdAsString());
workspaceMemberService.saveBatch(members); });
workspaceMemberService.saveBatch(members);
}
return workspace; return workspace;
} }
@@ -67,14 +68,17 @@ public class WorkspaceServiceImpl extends ServiceImpl<WorkspaceDao, WorkspaceEnt
workspace.setUpdateTimestamp(System.currentTimeMillis()); workspace.setUpdateTimestamp(System.currentTimeMillis());
workspaceService.updateById(workspace); workspaceService.updateById(workspace);
List<WorkspaceMemberEntity> members = workspace.getMembers();
members.stream().forEach(x -> {
x.setWorkspaceId(workspace.getId());
x.setCreateTimestamp(System.currentTimeMillis());
x.setCreateUserId(StpUtil.getLoginIdAsString());
});
workspaceMemberService.remove(new LambdaQueryWrapper<WorkspaceMemberEntity>().eq(WorkspaceMemberEntity::getWorkspaceId, workspace.getId())); workspaceMemberService.remove(new LambdaQueryWrapper<WorkspaceMemberEntity>().eq(WorkspaceMemberEntity::getWorkspaceId, workspace.getId()));
workspaceMemberService.saveBatch(members);
List<WorkspaceMemberEntity> members = workspace.getMembers();
if (T.CollUtil.isNotEmpty(members)) {
members.stream().forEach(x -> {
x.setWorkspaceId(workspace.getId());
x.setCreateTimestamp(System.currentTimeMillis());
x.setCreateUserId(StpUtil.getLoginIdAsString());
});
workspaceMemberService.saveBatch(members);
}
return workspace; return workspace;
} }