diff --git a/capability/src/main/java/com/sdm/capability/controller/ReportTemplateController.java b/capability/src/main/java/com/sdm/capability/controller/ReportTemplateController.java index 5e2013d8..69b345c2 100644 --- a/capability/src/main/java/com/sdm/capability/controller/ReportTemplateController.java +++ b/capability/src/main/java/com/sdm/capability/controller/ReportTemplateController.java @@ -4,6 +4,7 @@ import com.sdm.capability.model.dto.ReportTemplateDto; import com.sdm.capability.service.ISimulationReportTemplateService; import com.sdm.common.common.SdmResponse; import com.sdm.common.entity.req.system.LaunchApproveReq; +import com.sdm.common.entity.resp.capability.FlowTemplateResp; import com.sdm.common.entity.resp.capability.ReportTemplateResp; import com.sdm.common.feign.inter.capability.ISimulationReportFeignClient; import org.springframework.http.MediaType; @@ -105,5 +106,11 @@ public class ReportTemplateController implements ISimulationReportFeignClient { return reportTemplateService.handleApproveResult(req); } + @GetMapping("/queryValidReportTemplate") + public SdmResponse> queryValidReportTemplate() + { + return reportTemplateService.queryValidReportTemplate(); + } + } diff --git a/capability/src/main/java/com/sdm/capability/service/ISimulationReportTemplateService.java b/capability/src/main/java/com/sdm/capability/service/ISimulationReportTemplateService.java index 6019d2bb..5f4b96dd 100644 --- a/capability/src/main/java/com/sdm/capability/service/ISimulationReportTemplateService.java +++ b/capability/src/main/java/com/sdm/capability/service/ISimulationReportTemplateService.java @@ -7,6 +7,8 @@ import com.sdm.common.common.SdmResponse; import com.sdm.common.entity.req.system.LaunchApproveReq; import com.sdm.common.entity.resp.capability.ReportTemplateResp; +import java.util.List; + public interface ISimulationReportTemplateService extends IService { SdmResponse createReportTemplate(ReportTemplateDto reportTemplate); @@ -29,5 +31,7 @@ public interface ISimulationReportTemplateService extends IService> queryValidReportTemplate(); + } diff --git a/capability/src/main/java/com/sdm/capability/service/impl/SimulationReportTemplateServiceImpl.java b/capability/src/main/java/com/sdm/capability/service/impl/SimulationReportTemplateServiceImpl.java index b23a3c4e..1f06b88c 100644 --- a/capability/src/main/java/com/sdm/capability/service/impl/SimulationReportTemplateServiceImpl.java +++ b/capability/src/main/java/com/sdm/capability/service/impl/SimulationReportTemplateServiceImpl.java @@ -299,6 +299,28 @@ public class SimulationReportTemplateServiceImpl extends ServiceImpl> queryValidReportTemplate() { + List reportTemplates = this.lambdaQuery() + .eq(SimulationReportTemplate::getApproveType, ApproveStatusEnum.PASSED.getCode()) + .eq(SimulationReportTemplate::getTemplateStatus, 1) + .list(); + if (CollectionUtils.isEmpty(reportTemplates)) { + return SdmResponse.success(new ArrayList<>()); + } + List resp = reportTemplates.stream().map(i -> { + ReportTemplateResp templateResp = new ReportTemplateResp(); + templateResp.setTemplateCode(i.getTemplateCode()); + templateResp.setTemplateName(i.getTemplateName()); + return templateResp; + }).toList(); + return SdmResponse.success(resp); + } + /** * 过滤出最新的版本模版 * @param templates diff --git a/common/src/main/java/com/sdm/common/feign/impl/capability/SimulationReportFeignClientImpl.java b/common/src/main/java/com/sdm/common/feign/impl/capability/SimulationReportFeignClientImpl.java index eae4e368..f431a791 100644 --- a/common/src/main/java/com/sdm/common/feign/impl/capability/SimulationReportFeignClientImpl.java +++ b/common/src/main/java/com/sdm/common/feign/impl/capability/SimulationReportFeignClientImpl.java @@ -8,6 +8,8 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import java.util.List; + @Slf4j @Component @@ -46,4 +48,19 @@ public class SimulationReportFeignClientImpl implements ISimulationReportFeignCl } } + @Override + public SdmResponse> queryValidReportTemplate() { + SdmResponse> response; + try { + response = reportFeignClient.queryValidReportTemplate(); + if (!response.isSuccess()) { + return SdmResponse.failed("查询有效报告模板失败"); + } + return response; + } catch (Exception e) { + log.error("查询有效报告模板失败", e); + return SdmResponse.failed("查询有效报告模板失败"); + } + } + } diff --git a/common/src/main/java/com/sdm/common/feign/inter/capability/ISimulationReportFeignClient.java b/common/src/main/java/com/sdm/common/feign/inter/capability/ISimulationReportFeignClient.java index 2f41e9b0..e73b6b7d 100644 --- a/common/src/main/java/com/sdm/common/feign/inter/capability/ISimulationReportFeignClient.java +++ b/common/src/main/java/com/sdm/common/feign/inter/capability/ISimulationReportFeignClient.java @@ -2,6 +2,7 @@ package com.sdm.common.feign.inter.capability; import com.sdm.common.common.SdmResponse; import com.sdm.common.entity.req.system.LaunchApproveReq; +import com.sdm.common.entity.resp.capability.FlowTemplateResp; import com.sdm.common.entity.resp.capability.ReportTemplateResp; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; @@ -9,6 +10,8 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; +import java.util.List; + @FeignClient(name = "capability",contextId = "reportTemplateFeignClient") public interface ISimulationReportFeignClient { @@ -19,4 +22,7 @@ public interface ISimulationReportFeignClient { @GetMapping("/report/queryReportTemplateInfo") SdmResponse queryReportTemplateInfo(@RequestParam("uuid") String uuid); + @GetMapping("/report/queryValidReportTemplate") + SdmResponse> queryValidReportTemplate(); + }