From 38f2e7b1a62237e9d65e30e86ec1b609dbc648e2 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Thu, 11 May 2023 15:06:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6=E7=BB=9F?= =?UTF-8?q?=E4=B8=80=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/glxp/api/constant/FileConstant.java | 13 +++++++++++++ .../api/controller/purchase/SupCertController.java | 9 +++++---- .../glxp/api/idc/service/impl/FileServiceImpl.java | 3 ++- .../glxp/api/idc/service/impl/IdcServiceImpl.java | 3 ++- .../com/glxp/api/upload/DownloadController.java | 3 ++- 5 files changed, 24 insertions(+), 7 deletions(-) create mode 100644 src/main/java/com/glxp/api/constant/FileConstant.java diff --git a/src/main/java/com/glxp/api/constant/FileConstant.java b/src/main/java/com/glxp/api/constant/FileConstant.java new file mode 100644 index 000000000..5f48d88e5 --- /dev/null +++ b/src/main/java/com/glxp/api/constant/FileConstant.java @@ -0,0 +1,13 @@ +package com.glxp.api.constant; + +public class FileConstant { + + public static String CERT_FILE_PATH = ""; + + public static String INVOICE_FILE_PATH = ""; + + public static String PDF_FILE_PATH = ""; + + public static String COMMON_FILE_PATH = "register/image2/"; + +} diff --git a/src/main/java/com/glxp/api/controller/purchase/SupCertController.java b/src/main/java/com/glxp/api/controller/purchase/SupCertController.java index cc8714068..267f8b58f 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupCertController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupCertController.java @@ -12,6 +12,7 @@ import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.BusinessType; import com.glxp.api.constant.ConstantStatus; +import com.glxp.api.constant.FileConstant; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.purchase.*; import com.glxp.api.entity.system.SysPdfTemplateRelevanceStatemenEntity; @@ -306,7 +307,7 @@ public class SupCertController { @PostMapping("/sup/info/deleteCompanyCert") public BaseResponse deleteCompanyCert(@RequestBody DeleteCompanyFileRequest deleteCompanyFileRequest, BindingResult bindingResult) { boolean b = supCertService.deleteById(deleteCompanyFileRequest.getId()); - String URL = filePath + "/register/file/image2/" + deleteCompanyFileRequest.getFilePath(); + String URL = filePath + FileConstant.COMMON_FILE_PATH + deleteCompanyFileRequest.getFilePath(); File file = new File(URL); if (file.exists() && file.isFile()) { file.delete(); @@ -396,7 +397,7 @@ public class SupCertController { supData.put("status", obj.getStatus() == 0 ? "有效" : "失效"); supData.put("auditStatus", getAuditStatus(obj.getAuditStatus())); supData.put("remark", obj.getRemark() == null ? ' ' : obj.getRemark()); - supData.put("filePath", filePath + "register/image2/" + url); + supData.put("filePath", filePath + FileConstant.COMMON_FILE_PATH + url); list.add(supData); i++; } @@ -512,7 +513,7 @@ public class SupCertController { supData.put("status", obj.getStatus() == 0 ? "有效" : "失效"); supData.put("auditStatus", getAuditStatus(obj.getAuditStatus())); supData.put("remark2", obj.getRemark() == null ? ' ' : obj.getRemark()); - supData.put("filePath", filePath + "register/image2/" + url); + supData.put("filePath", filePath + FileConstant.COMMON_FILE_PATH + url); list.add(supData); i++; } @@ -578,7 +579,7 @@ public class SupCertController { supData.put("status", obj.getStatus() == 0 ? "有效" : "失效"); supData.put("auditStatus", getAuditStatus(obj.getAuditStatus())); supData.put("remark2", obj.getRemark() == null ? ' ' : obj.getRemark()); - supData.put("filePath", filePath + "register/image2/" + url); + supData.put("filePath", filePath + FileConstant.COMMON_FILE_PATH + url); list.add(supData); i++; } diff --git a/src/main/java/com/glxp/api/idc/service/impl/FileServiceImpl.java b/src/main/java/com/glxp/api/idc/service/impl/FileServiceImpl.java index 6fdfcef27..38affea5b 100644 --- a/src/main/java/com/glxp/api/idc/service/impl/FileServiceImpl.java +++ b/src/main/java/com/glxp/api/idc/service/impl/FileServiceImpl.java @@ -12,6 +12,7 @@ import java.util.concurrent.TimeUnit; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; +import com.glxp.api.constant.FileConstant; import org.apache.commons.lang3.StringUtils; import org.apache.tools.ant.util.DateUtils; import org.slf4j.Logger; @@ -53,7 +54,7 @@ public class FileServiceImpl implements FileService { private DbDao dbDao; @Resource private IdcService idcService; - private String imagePath = "register/image2/"; + private String imagePath = FileConstant.COMMON_FILE_PATH; String pdfPath = "pdf/template/"; @Override diff --git a/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java b/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java index 4ba7f3005..db102c6c6 100644 --- a/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java +++ b/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java @@ -17,6 +17,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import com.glxp.api.constant.FileConstant; import org.apache.commons.lang3.StringUtils; import org.apache.commons.text.WordUtils; import org.apache.tools.ant.util.DateUtils; @@ -85,7 +86,7 @@ public class IdcServiceImpl implements IdcService { @Resource private ScheduledDao scheduledDao; - private String imagePath = "register/image2/"; + private String imagePath = FileConstant.COMMON_FILE_PATH; /*获取拉取任务列表*/ @Override public BaseResponse taskList(HttpServletRequest request, Map params) { diff --git a/src/main/java/com/glxp/api/upload/DownloadController.java b/src/main/java/com/glxp/api/upload/DownloadController.java index 7339130cf..b6dddd183 100644 --- a/src/main/java/com/glxp/api/upload/DownloadController.java +++ b/src/main/java/com/glxp/api/upload/DownloadController.java @@ -1,5 +1,6 @@ package com.glxp.api.upload; +import com.glxp.api.constant.FileConstant; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -27,7 +28,7 @@ public class DownloadController { if (name.endsWith("pdf") || name.endsWith("doc")) { OutputStream os = null; try { - FileInputStream input = new FileInputStream(new File(filePath + "/register/file/" + type + "/" + name)); + FileInputStream input = new FileInputStream(new File(filePath + FileConstant.COMMON_FILE_PATH + name)); OutputStream out = response.getOutputStream(); byte[] b = new byte[2048]; int len;