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

1、bugfix

Browse Source
This commit is contained in:
lidongyang
2026-02-03 14:47:40 +08:00
parent 61001d680a
commit 1eb061f5e3
4 changed files with 14 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -342,7 +342,7 @@ public class DemandServiceImpl extends BaseService implements IDemandService {
return SdmResponse.failed("修改需求额外属性失败！");
}
}
renameDirNew(req.getUuid(),req.getDemandName());
renameDirNew(req.getUuid(),req.getDemandName(),false);
return SdmResponse.success();
}
@@ -353,7 +353,7 @@ public class DemandServiceImpl extends BaseService implements IDemandService {
mapper.deleteDemandMember(req.getDeleteNodeIdList());
mapper.deleteDemandExtra(req.getDeleteNodeIdList());
for (String demandNodeId : req.getDeleteNodeIdList()) {
SdmResponse response = deleteDirNew(demandNodeId);
SdmResponse response = deleteDirNew(demandNodeId,false);
if (ObjectUtils.isEmpty(response) || response.getCode() != ResultCode.SUCCESS.getCode()) {
// 先记录日志
log.error("deleteDemand，删除需求id为：{}的文件夹失败，原因为：{}", demandNodeId,response.getMessage());
@@ -1448,9 +1448,10 @@ public class DemandServiceImpl extends BaseService implements IDemandService {
}
// 删除文件夹
public SdmResponse deleteDirNew(String uuid) {
public SdmResponse deleteDirNew(String uuid,Boolean skipPermissionCheck) {
DelDirReq req = new DelDirReq();
req.setDelUuid(uuid);
req.setSkipPermissionCheck(skipPermissionCheck);
log.info("调用删除需求文件夹的参数为：{}", req);
SdmResponse response = dataClientFeignClient.delDir(req);
log.info("调用删除需求文件夹的返回值为：{}", response);
@@ -1464,7 +1465,7 @@ public class DemandServiceImpl extends BaseService implements IDemandService {
mapper.deleteDemandMember(req.getDeleteNodeIdList());
mapper.deleteDemandExtra(req.getDeleteNodeIdList());
for (String demandNodeId : req.getDeleteNodeIdList()) {
SdmResponse response = deleteDirNew(demandNodeId);
SdmResponse response = deleteDirNew(demandNodeId,true);
if (ObjectUtils.isEmpty(response) || response.getCode() != ResultCode.SUCCESS.getCode()) {
// 先记录日志
log.error("deleteDemandNoPermission，删除需求id为：{}的文件夹失败，原因为：{}", demandNodeId,response.getMessage());
@@ -1473,10 +1474,11 @@ public class DemandServiceImpl extends BaseService implements IDemandService {
return SdmResponse.success();
}
public SdmResponse renameDirNew(String uuid, String newDirName) {
public SdmResponse renameDirNew(String uuid, String newDirName,Boolean skipPermissionCheck) {
RenameDirReq req = new RenameDirReq();
req.setUuid(uuid);
req.setNewName(newDirName);
req.setSkipPermissionCheck(skipPermissionCheck);
log.info("修改需求调用重命名文件夹的参数为：{}", req);
SdmResponse response = dataClientFeignClient.renameDirNew(req);
log.info("修改需求调用重命名文件夹的返回值为：{}", response);
@@ -1581,7 +1583,7 @@ public class DemandServiceImpl extends BaseService implements IDemandService {
return SdmResponse.failed("修改需求额外属性失败！");
}
}
renameDirNew(req.getUuid(),req.getDemandName());
renameDirNew(req.getUuid(),req.getDemandName(),true);
return SdmResponse.success();
}

30
project/src/main/java/com/sdm/project/service/impl/SimulationTaskServiceImpl.java
View File

@@ -118,36 +118,6 @@ public class SimulationTaskServiceImpl extends ServiceImpl<SimulationTaskMapper,
if (req.getExpStatus() != null) {
wrapper.set(SimulationTask::getExpStatus, req.getExpStatus());
}
if (req.getTag1() != null) {
wrapper.set(SimulationTask::getTag1, req.getTag1());
}
if (req.getTag2() != null) {
wrapper.set(SimulationTask::getTag2, req.getTag2());
}
if (req.getTag3() != null) {
wrapper.set(SimulationTask::getTag3, req.getTag3());
}
if (req.getTag4() != null) {
wrapper.set(SimulationTask::getTag4, req.getTag4());
}
if (req.getTag5() != null) {
wrapper.set(SimulationTask::getTag5, req.getTag5());
}
if (req.getTag6() != null) {
wrapper.set(SimulationTask::getTag6, req.getTag6());
}
if (req.getTag7() != null) {
wrapper.set(SimulationTask::getTag7, req.getTag7());
}
if (req.getTag8() != null) {
wrapper.set(SimulationTask::getTag8, req.getTag8());
}
if (req.getTag9() != null) {
wrapper.set(SimulationTask::getTag9, req.getTag9());
}
if (req.getTag10() != null) {
wrapper.set(SimulationTask::getTag10, req.getTag10());
}
wrapper.set(SimulationTask::getCreator, ThreadLocalContext.getUserId());
wrapper.set(SimulationTask::getUpdateTime, DateUtil.now());
return this.update(wrapper);

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

@@ -1335,7 +1335,7 @@ public class TaskServiceImpl implements ITaskService {
.eq(SimulationTaskMember::getType, MemberTypeEnum.EXECUTOR.getCode()).list();
List<Long> oldEMemberIdList = new ArrayList<>();
// eMemberList传空字符串代表要清空仿真执行人，传null代表不对仿真执行人做操作
if (CollectionUtils.isNotEmpty(oldEMemberList) && Objects.equals(req.getEMemberList(), "")) {
if (CollectionUtils.isNotEmpty(oldEMemberList) && req.getEMemberList() != null) {
oldEMemberIdList = oldEMemberList.stream().map(SimulationTaskMember::getUserId).toList();
// 删除原来的仿真执行人信息
simulationTaskMemberService.deleteTaskMemberList(taskId, MemberTypeEnum.EXECUTOR.getCode());
@@ -1364,7 +1364,7 @@ public class TaskServiceImpl implements ITaskService {
}
log.info("老用户id为：{}", oldEMemberIdList);
log.info("新用户id为：{}", newUserIdList);
if (CollectionUtils.isNotEmpty(currentUserIdList)) {
if (CollectionUtils.isNotEmpty(currentUserIdList) && req.getEMemberList() != null) {
if (!simulationTaskMemberService.saveTaskMemberList(taskId, MemberTypeEnum.EXECUTOR.getCode(), currentUserIdList)) {
return SdmResponse.failed("编辑仿真执行人失败");
}
@@ -3777,7 +3777,7 @@ public class TaskServiceImpl implements ITaskService {
.eq(SimulationTaskMember::getType, MemberTypeEnum.EXECUTOR.getCode()).list();
List<Long> oldEMemberIdList = new ArrayList<>();
// eMemberList传空字符串代表要清空仿真执行人，传null代表不对仿真执行人做操作
if (CollectionUtils.isNotEmpty(oldEMemberList) && Objects.equals(req.getEMemberList(), "")) {
if (CollectionUtils.isNotEmpty(oldEMemberList) && req.getEMemberList() != null) {
oldEMemberIdList = oldEMemberList.stream().map(SimulationTaskMember::getUserId).toList();
// 删除原来的仿真执行人信息
simulationTaskMemberService.deleteTaskMemberList(taskId, MemberTypeEnum.EXECUTOR.getCode());
@@ -3806,7 +3806,7 @@ public class TaskServiceImpl implements ITaskService {
}
log.info("老用户id为：{}", oldEMemberIdList);
log.info("新用户id为：{}", newUserIdList);
if (CollectionUtils.isNotEmpty(currentUserIdList)) {
if (CollectionUtils.isNotEmpty(currentUserIdList) && req.getEMemberList() != null) {
if (!simulationTaskMemberService.saveTaskMemberList(taskId, MemberTypeEnum.EXECUTOR.getCode(), currentUserIdList)) {
return SdmResponse.failed("编辑仿真执行人失败");
}

4
project/src/main/resources/application-local.yml
View File

@@ -161,7 +161,7 @@ xxl:
job:
admin:
# 调度中心地址列表
addresses: http://127.0.0.1:7110/xxl-job-admin
addresses: http://192.168.65.161:7110/xxl-job-admin
# 调度中心访问令牌
accessToken: default_token
# xxl-job 超时时间（秒），默认3秒
@@ -178,7 +178,7 @@ xxl:
# 执行器端口,为了好记，web服务端口+1000
port: 8101
# 执行器日志路径
logpath: D:\xxljob\logs
logpath: /home/app/project/xxljob
# 执行器日志保留天数
logretentiondays: 14
# 执行器排除扫描的包，多个用逗号分隔，如 "org.package01" 或 "org.package01,org.package02"