Merge remote-tracking branch 'origin/main'

This commit is contained in:
2025-12-02 19:17:21 +08:00
21 changed files with 323 additions and 38 deletions

View File

@@ -4,6 +4,7 @@ import com.sdm.common.common.SdmResponse;
import com.sdm.common.entity.enums.ApproveTypeEnum;
import com.sdm.common.entity.req.system.LaunchApproveReq;
import com.sdm.common.feign.inter.data.IDataFeignClient;
import com.sdm.common.feign.inter.project.ISimulationRunFeignClient;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -11,7 +12,7 @@ import org.springframework.stereotype.Component;
public class TaskDeliverableStrategy extends ApproveAbstractNoticeStrategy {
@Autowired
private IDataFeignClient dataFeignClient;
private ISimulationRunFeignClient runFeignClient;
// 这个回调场景值和 LaunchApproveReq 类里的 approveType 对应
// 审批类型 0.http回调的replyUrl必须传递相当于是跨系统的,调用的时候可以不传replyUrl必须传递 1仿真地图审批spdm内部feign 2知识库审批spdm内部feign 4交付物审批spdm内部feign
@Override
@@ -21,7 +22,7 @@ public class TaskDeliverableStrategy extends ApproveAbstractNoticeStrategy {
@Override
public SdmResponse noticeResult(LaunchApproveReq req) {
return dataFeignClient.approveDataFile(req);
return runFeignClient.deliverableApproveCallback(req);
}
}