diff --git a/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/feign/IBasicPrintTemplateClient.java b/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/feign/IBasicPrintTemplateClient.java index 47ba20769..52f8c6031 100644 --- a/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/feign/IBasicPrintTemplateClient.java +++ b/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/feign/IBasicPrintTemplateClient.java @@ -17,11 +17,14 @@ package com.logpm.basic.feign; import com.logpm.basic.entity.BasicPrintTemplateEntity; +import org.springblade.common.constant.ModuleNameConstant; import org.springblade.core.mp.support.BladePage; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; +import java.util.Map; + /** * 打印模板信息 Feign接口类 * @@ -29,11 +32,11 @@ import org.springframework.web.bind.annotation.RequestParam; * @since 2023-05-15 */ @FeignClient( - value = "blade-basicPrintTemplate" + value = ModuleNameConstant.APPLICATION_BASIC_NAME+"-tjj" ) public interface IBasicPrintTemplateClient { - String API_PREFIX = "/client"; + String API_PREFIX = "template/client"; String TOP = API_PREFIX + "/top"; /** @@ -44,6 +47,17 @@ public interface IBasicPrintTemplateClient { * @return BladePage */ @GetMapping(TOP) - BladePage top(@RequestParam("current") Integer current, @RequestParam("size") Integer size); + BladePage templateTop(@RequestParam("current") Integer current, @RequestParam("size") Integer size); + + /** + * 获取模板信息 + * @param tenantId 租户编号 + * @param templateType 模板类型 + * @return + */ + @GetMapping(TOP+"/getTemplateLink") + BasicPrintTemplateEntity getTemplate(@RequestParam("tenantId") String tenantId, @RequestParam("templateType") String templateType); + + } diff --git a/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/IBasicPrintTemplateService.java b/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/IBasicPrintTemplateService.java index 57d5af48a..6b1bbdaf5 100644 --- a/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/IBasicPrintTemplateService.java +++ b/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/IBasicPrintTemplateService.java @@ -26,6 +26,7 @@ import com.logpm.basic.vo.BasicPrintTemplateVO; import org.springblade.core.mp.base.BaseService; import java.util.List; +import java.util.Map; /** * 打印模板信息 服务类 @@ -52,6 +53,19 @@ public interface IBasicPrintTemplateService extends BaseService exportBasicPrintTemplate(Wrapper queryWrapper); + /** + * 新增模板 + * @param basicPrintTemplateDTO + * @return + */ boolean insertPrintTemplate(BasicPrintTemplateDTO basicPrintTemplateDTO); + /** + * 获取租户指定类型模板 + * @param tenantId 租户编号 + * @param templateType 模板类型 + * @return 文件连接 + */ + BasicPrintTemplateEntity selectTemplateLink(String tenantId, String templateType); + }