diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java index c272790..9317967 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java @@ -10,6 +10,7 @@ import com.casic.missiles.core.shiro.ShiroKit; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.certificate.RegisterCustomParameters; import com.casic.missiles.dto.business.order.OrderCancelRequest; import com.casic.missiles.dto.business.order.OrderListRequest; import com.casic.missiles.dto.business.order.OrderListResponse; @@ -49,6 +50,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.business.FilePrintTypeEnum.CALIBRATION_CERTIFICATE; + /** *

* 业务管理-委托书 服务实现类 @@ -266,8 +269,15 @@ PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class); try { DictCodeUtils.convertDictCodeToName(businessOrder); - String printFileName = printFileRegister.registerPrintFile(businessOrder, businessOrder.getOrderTypeName()); - minioUtil.downloadStream(printFileName, response); + printFileRegister.registerPrintFile( + RegisterCustomParameters.builder() + .customObject(businessOrder) + .prefixType(businessOrder.getOrderTypeName()) + .pdf(false) + .response(response) + //文件自定义命名 证书报告名称+证书报告编号 + .customFileName(businessOrder.getOrderTypeName() + businessOrder.getOrderCode()) + .build()); } catch (Exception ex) { log.error("委托书表单导出/打印异常,表单信息:{},异常信息:{}", JSONObject.toJSON(businessOrder), ex); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java index c272790..9317967 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java @@ -10,6 +10,7 @@ import com.casic.missiles.core.shiro.ShiroKit; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.certificate.RegisterCustomParameters; import com.casic.missiles.dto.business.order.OrderCancelRequest; import com.casic.missiles.dto.business.order.OrderListRequest; import com.casic.missiles.dto.business.order.OrderListResponse; @@ -49,6 +50,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.business.FilePrintTypeEnum.CALIBRATION_CERTIFICATE; + /** *

* 业务管理-委托书 服务实现类 @@ -266,8 +269,15 @@ PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class); try { DictCodeUtils.convertDictCodeToName(businessOrder); - String printFileName = printFileRegister.registerPrintFile(businessOrder, businessOrder.getOrderTypeName()); - minioUtil.downloadStream(printFileName, response); + printFileRegister.registerPrintFile( + RegisterCustomParameters.builder() + .customObject(businessOrder) + .prefixType(businessOrder.getOrderTypeName()) + .pdf(false) + .response(response) + //文件自定义命名 证书报告名称+证书报告编号 + .customFileName(businessOrder.getOrderTypeName() + businessOrder.getOrderCode()) + .build()); } catch (Exception ex) { log.error("委托书表单导出/打印异常,表单信息:{},异常信息:{}", JSONObject.toJSON(businessOrder), ex); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java index 1b0d2f6..75abf4d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java @@ -33,21 +33,6 @@ private String localFileDir; /** - * 新增,增加文件流回传下载 - * - * @param customObject - * @param prefixType - * @return - */ - public String registerPrintFile(Object customObject, String prefixType) { - return this.registerPrintFile(RegisterCustomParameters. - builder() - .customObject(customObject) - .prefixType(prefixType). - build()); - } - - /** * 打印文件注册到服务器上有以下几个步骤 * 1、根据打印证书的类型,获取自定义的注册打印文件对象 * 2、进行远程文件的下载工作,支持文件的读写权限操作