diff --git a/common/src/main/java/com/sdm/common/entity/req/project/GetDedicatedTimeReq.java b/common/src/main/java/com/sdm/common/entity/req/project/GetDedicatedTimeReq.java index 9d3fd0d8..b3ac4cfd 100644 --- a/common/src/main/java/com/sdm/common/entity/req/project/GetDedicatedTimeReq.java +++ b/common/src/main/java/com/sdm/common/entity/req/project/GetDedicatedTimeReq.java @@ -19,6 +19,5 @@ public class GetDedicatedTimeReq extends BaseReq { * 节点UUID() */ @Schema(description = "节点UUID,可以传阶段uuid,用于获取阶段下的所有工位") - @NotBlank(message = "nodeUuid不能为空") private String nodeUuid; } diff --git a/project/src/main/java/com/sdm/project/model/req/SpdmAddDemandReq.java b/project/src/main/java/com/sdm/project/model/req/SpdmAddDemandReq.java index 03f08a31..39c93ef9 100644 --- a/project/src/main/java/com/sdm/project/model/req/SpdmAddDemandReq.java +++ b/project/src/main/java/com/sdm/project/model/req/SpdmAddDemandReq.java @@ -148,4 +148,10 @@ public class SpdmAddDemandReq extends BaseEntity { */ private String description; + + /** + * 是否为绿元亨项目 + */ + private boolean isLyric=false; + } diff --git a/project/src/main/java/com/sdm/project/service/impl/DemandServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/DemandServiceImpl.java index 16355dbd..0f624c95 100644 --- a/project/src/main/java/com/sdm/project/service/impl/DemandServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/DemandServiceImpl.java @@ -233,10 +233,12 @@ public class DemandServiceImpl extends BaseService implements IDemandService { SdmResponse updatePermissionResponse = dataFeignClient.updatePermission(updatePermissionReq); log.info("创建需求时,更新需求创建人和需求仿真负责人(确认人)权限的返回值为:{}",updatePermissionResponse); - // 同步创建任务 - SimulationDemand demand = new SimulationDemand(); - BeanUtils.copyProperties(req, demand); - simulationTaskService.batchCreateTaskFromDemand(Collections.singletonList(demand)); + // 只有绿元亨需要在创建需求的同时创建任务 + if (req.isLyric()) { + SimulationDemand demand = new SimulationDemand(); + BeanUtils.copyProperties(req, demand); + simulationTaskService.batchCreateTaskFromDemand(Collections.singletonList(demand)); + } return SdmResponse.success(req.getUuid()); } diff --git a/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java index 08ba3e47..150e492c 100644 --- a/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java @@ -1299,6 +1299,11 @@ public class NodeServiceImpl extends ServiceImpl()); + } + // 验证项目存在性 SimulationNode project = getProjectOrThrow(projectUuid);