toolchaintechnologycenter/spdm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of http://192.168.65.198:3000/toolchaintechnologycenter/spdm-backend

Browse Source
This commit is contained in:
lidongyang
2026-02-05 14:47:04 +08:00
parent 9469dcbb63 9323060c87
commit e8fa5b594e
7 changed files with 52 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
project/src/main/java/com/sdm/project/service/impl/DemandServiceImpl.java
View File

@@ -748,6 +748,19 @@ public class DemandServiceImpl extends BaseService implements IDemandService {
String eUserIdStr = task.getEMemberList();
log.info("下发的仿真负责人为：{}", pUserIdStr);
log.info("下发的仿真执行人为：{}", eUserIdStr);
BatchUpdatePermissionReq.FilePermissionItem item = new BatchUpdatePermissionReq.FilePermissionItem();
item.setUuid(task.getUuid());
Map<Long, Byte> userPermissions = new HashMap<>();
item.setUserPermissions(userPermissions);
filePermissions.add(item);
BatchUpdatePermissionReq.FilePermissionItem demandItem = new BatchUpdatePermissionReq.FilePermissionItem();
demandItem.setUuid(demandId);
Map<Long, Byte> demandUserPermissions = new HashMap<>();
demandItem.setUserPermissions(demandUserPermissions);
filePermissions.add(demandItem);
if (StringUtils.isNotBlank(pUserIdStr)) {
String[] userIdArr = pUserIdStr.split(",");
for (String userId : userIdArr) {
@@ -758,10 +771,10 @@ public class DemandServiceImpl extends BaseService implements IDemandService {
taskMemberNode.setType(MemberTypeEnum.PRINCIPAL.getCode());
projectNodeMemberList.add(taskMemberNode);
// 更新任务仿真负责人对任务文件夹的权限
filePermissions.add(buildFilePermissionItem(task.getUuid(), Long.valueOf(userId), FilePermissionEnum.ALL));
userPermissions.put(Long.valueOf(userId), FilePermissionEnum.ALL.getValue());
// 更新任务仿真负责人对关联的需求文件夹权限
filePermissions.add(buildFilePermissionItem(demandId, Long.valueOf(userId), FilePermissionEnum.BASE));
demandUserPermissions.put(Long.valueOf(userId), FilePermissionEnum.BASE.getValue());
}
}
if (StringUtils.isNotBlank(eUserIdStr)) {
@@ -776,20 +789,20 @@ public class DemandServiceImpl extends BaseService implements IDemandService {
// 发送消息通知
sendMessage(MessageTemplateEnum.TASK_ISSUE, task.getNodeName(), userId, task.getUuid());
// 更新任务仿真执行人对任务文件夹权限
filePermissions.add(buildFilePermissionItem(task.getUuid(), Long.valueOf(userId), FilePermissionEnum.ALL_EXCLUDE_DELETE));
userPermissions.put(Long.valueOf(userId), FilePermissionEnum.ALL_EXCLUDE_DELETE.getValue());
// 更新任务仿真执行人对关联的需求文件夹权限
filePermissions.add(buildFilePermissionItem(demandId, Long.valueOf(userId), FilePermissionEnum.BASE));
demandUserPermissions.put(Long.valueOf(userId), FilePermissionEnum.BASE.getValue());
}
}
// 更新需求创建人对任务文件夹的权限
filePermissions.add(buildFilePermissionItem(task.getUuid(), demandCreator, FilePermissionEnum.BASE));
userPermissions.put(demandCreator, FilePermissionEnum.BASE.getValue());
// 更新任务创建人对任务文件夹的权限
filePermissions.add(buildFilePermissionItem(task.getUuid(), jobNumber, FilePermissionEnum.READ));
userPermissions.put(jobNumber, FilePermissionEnum.READ.getValue());
// 更新任务创建人对需求文件夹的权限
filePermissions.add(buildFilePermissionItem(demandId, jobNumber, FilePermissionEnum.READ));
demandUserPermissions.put(jobNumber, FilePermissionEnum.READ.getValue());
List<TaskExtraNode> extraList = task.getExtras();
if (CollectionUtils.isNotEmpty(extraList)) {

12
project/src/main/java/com/sdm/project/service/impl/ProjectServiceImpl.java
View File

@@ -2038,19 +2038,9 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
}
log.info("taskNodeMemberList为：{}",taskNodeMemberList);
if (CollectionUtils.isNotEmpty(taskNodeMemberList)) {
List<BatchUpdatePermissionReq.FilePermissionItem> filePermissions = new ArrayList<>();
for (TaskMemberNode taskMemberNode : taskNodeMemberList) {
BatchUpdatePermissionReq.FilePermissionItem item = new BatchUpdatePermissionReq.FilePermissionItem();
item.setUuid(taskMemberNode.getTaskId());
Map<Long, Byte> userPermissions = new HashMap<>();
userPermissions.put(Long.valueOf(taskMemberNode.getUserId()), MemberTypeEnum.EXECUTOR.getCode().equals(taskMemberNode.getType()) ? FilePermissionEnum.ALL_EXCLUDE_DELETE.getValue() : FilePermissionEnum.ALL.getValue());
item.setUserPermissions(userPermissions);
filePermissions.add(item);
updatePermission(Long.valueOf(taskMemberNode.getUserId()),taskMemberNode.getTaskId(),MemberTypeEnum.EXECUTOR.getCode().equals(taskMemberNode.getType()) ? FilePermissionEnum.ALL_EXCLUDE_DELETE.getValue() : FilePermissionEnum.ALL.getValue());
}
batchUpdatePermission(filePermissions);
}
if (CollectionUtils.isNotEmpty(projectNodePerformanceList)) {
projectNodePerformanceList.forEach(projectNode -> {

46
project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java
View File

@@ -1426,28 +1426,29 @@ public class TaskServiceImpl implements ITaskService {
});
List<BatchUpdatePermissionReq.FilePermissionItem> filePermissions = new ArrayList<>();
BatchUpdatePermissionReq.FilePermissionItem item = new BatchUpdatePermissionReq.FilePermissionItem();
item.setUuid(task.getUuid());
Map<Long, Byte> userPermissions = new HashMap<>();
// 保存当前的仿真执行人权限
for (Long currentUserId : currentUserIdList) {
BatchUpdatePermissionReq.FilePermissionItem item = new BatchUpdatePermissionReq.FilePermissionItem();
item.setUuid(task.getUuid());
Map<Long, Byte> userPermissions = new HashMap<>();
userPermissions.put(currentUserId, FilePermissionEnum.ALL_EXCLUDE_DELETE.getValue());
item.setUserPermissions(userPermissions);
filePermissions.add(item);
}
item.setUserPermissions(userPermissions);
filePermissions.add(item);
// 设置任务执行人对关联的需求文件夹设置权限
if (StringUtils.isNotEmpty(task.getDemandId())) {
List<SpdmDemandVo> demandVoList = demandMapper.getDemandListById(Collections.singletonList(task.getDemandId()));
if (CollectionUtils.isNotEmpty(demandVoList)) {
SpdmDemandVo demand = demandVoList.get(0);
BatchUpdatePermissionReq.FilePermissionItem item2 = new BatchUpdatePermissionReq.FilePermissionItem();
item2.setUuid(demand.getUuid());
Map<Long, Byte> userPermissions2 = new HashMap<>();
for (Long currentUserId : currentUserIdList) {
BatchUpdatePermissionReq.FilePermissionItem item = new BatchUpdatePermissionReq.FilePermissionItem();
item.setUuid(demand.getUuid());
Map<Long, Byte> userPermissions = new HashMap<>();
userPermissions.put(currentUserId, FilePermissionEnum.BASE.getValue());
item.setUserPermissions(userPermissions);
filePermissions.add(item);
userPermissions2.put(currentUserId, FilePermissionEnum.BASE.getValue());
}
item2.setUserPermissions(userPermissions2);
filePermissions.add(item2);
}
}
batchUpdatePermission(filePermissions);
@@ -3885,28 +3886,29 @@ public class TaskServiceImpl implements ITaskService {
sendMessage(MessageTemplateEnum.TASK_ISSUE, req.getNodeName(), String.valueOf(i), taskId);
});
List<BatchUpdatePermissionReq.FilePermissionItem> filePermissions = new ArrayList<>();
BatchUpdatePermissionReq.FilePermissionItem item = new BatchUpdatePermissionReq.FilePermissionItem();
item.setUuid(task.getUuid());
Map<Long, Byte> userPermissions = new HashMap<>();
// 保存当前的仿真执行人权限
for (Long currentUserId : currentUserIdList) {
BatchUpdatePermissionReq.FilePermissionItem item = new BatchUpdatePermissionReq.FilePermissionItem();
item.setUuid(task.getUuid());
Map<Long, Byte> userPermissions = new HashMap<>();
userPermissions.put(currentUserId, FilePermissionEnum.ALL_EXCLUDE_DELETE.getValue());
item.setUserPermissions(userPermissions);
filePermissions.add(item);
}
item.setUserPermissions(userPermissions);
filePermissions.add(item);
// 设置任务执行人对关联的需求文件夹设置权限
if (StringUtils.isNotEmpty(task.getDemandId())) {
List<SpdmDemandVo> demandVoList = demandMapper.getDemandListById(Collections.singletonList(task.getDemandId()));
if (CollectionUtils.isNotEmpty(demandVoList)) {
SpdmDemandVo demand = demandVoList.get(0);
BatchUpdatePermissionReq.FilePermissionItem item2 = new BatchUpdatePermissionReq.FilePermissionItem();
item2.setUuid(demand.getUuid());
Map<Long, Byte> userPermissions2 = new HashMap<>();
for (Long currentUserId : currentUserIdList) {
BatchUpdatePermissionReq.FilePermissionItem item = new BatchUpdatePermissionReq.FilePermissionItem();
item.setUuid(demand.getUuid());
Map<Long, Byte> userPermissions = new HashMap<>();
userPermissions.put(currentUserId, FilePermissionEnum.BASE.getValue());
item.setUserPermissions(userPermissions);
filePermissions.add(item);
userPermissions2.put(currentUserId, FilePermissionEnum.BASE.getValue());
}
item2.setUserPermissions(userPermissions2);
filePermissions.add(item2);
}
}
batchUpdatePermission(filePermissions);

3
system/src/main/resources/application-dev-190.yml
View File

@@ -200,4 +200,5 @@ security:
- /tenant/list
- /tenant/initNewTenant
- /user/getUserByRoleCode
- /lyricUser/queryUserList
- /lyricUser/queryUserList
- /user/listUser

3
system/src/main/resources/application-dev-65.yml
View File

@@ -200,4 +200,5 @@ security:
- /tenant/list
- /tenant/initNewTenant
- /user/getUserByRoleCode
- /lyricUser/queryUserList
- /lyricUser/queryUserList
- /user/listUser

1
system/src/main/resources/application-local.yml
View File

@@ -201,6 +201,7 @@ security:
- /tenant/initNewTenant
- /user/getUserByRoleCode
- /lyricUser/queryUserList
- /user/listUser
# 0单机处理，可以指向本地，1负载均衡轮询
serverType: 0

3
system/src/main/resources/application-lyric.yml
View File

@@ -200,4 +200,5 @@ security:
- /systemLog/saveLog
- /tenant/initNewTenant
- /user/getUserByRoleCode
- /lyricUser/queryUserList
- /lyricUser/queryUserList
- /user/listUser