From d215b3a4329a7c22159aff459102b713bb03b476 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Mon, 27 Dec 2021 14:07:13 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E7=AC=AC=E4=B8=89=E6=96=B9=E5=9C=A8?=
 =?UTF-8?q?=E7=A0=94=E9=A1=B9=E7=9B=AE-=E4=B8=8B=E8=BD=BD=20=E6=94=B9?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=E5=90=8D=EF=BC=8C=E6=94=B9=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PayResearchProjectController.java      | 11 ++++-------
 .../project/service/IPayResearchProjectService.java   |  2 +-
 .../service/impl/PayResearchProjectServiceImpl.java   |  2 +-
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayResearchProjectController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayResearchProjectController.java
index 2a59f618..e4a8903e 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayResearchProjectController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayResearchProjectController.java
@@ -4,8 +4,6 @@ import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
 import java.util.UUID;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
 import com.alibaba.fastjson.JSONObject;
 import com.jero.common.api.vo.Result;
@@ -23,7 +21,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.servlet.ModelAndView;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
@@ -102,11 +99,11 @@ public class PayResearchProjectController extends JeroController<PayResearchProj
 	 */
 	@AutoLog(value = "第三方在研项目-下载")
 	@ApiOperation(value="第三方在研项目-下载", notes="第三方在研项目-下载")
-	@GetMapping(value = "/downLoad")
-	public void downLoad(@RequestParam(name="fileId",required = true) Integer fileId,
-							  @RequestParam(name="fileName",required = true) String fileName
+	@GetMapping(value = "/download")
+	public void download(@RequestParam(name="fileId",required = true) Integer fileId,
+							  @RequestParam(name="fullfilename",required = true) String fileName
 										) throws IOException {
-		payResearchProjectService.downLoad(fileId,fileName);
+		payResearchProjectService.download(fileId,fileName);
 	}
 
 	 /**
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayResearchProjectService.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayResearchProjectService.java
index 222e7589..46b0cd6b 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayResearchProjectService.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayResearchProjectService.java
@@ -20,7 +20,7 @@ public interface IPayResearchProjectService extends IService<PayResearchProject>
 
     JSONObject listForThree(Integer pageNo, Integer pageSize, String abbreviation, String projectName);
 
-    void downLoad(Integer fileId,String fileName) throws IOException;
+    void download(Integer fileId, String fileName) throws IOException;
 
     IPage<PayResearchProject> pageList(Page<PayResearchProject> page, QueryWrapper<PayResearchProject> queryWrapper);
 
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayResearchProjectServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayResearchProjectServiceImpl.java
index 89649775..ef33ee23 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayResearchProjectServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayResearchProjectServiceImpl.java
@@ -109,7 +109,7 @@ public class PayResearchProjectServiceImpl extends ServiceImpl<PayResearchProjec
 //    }
 
     @Override
-    public void downLoad(Integer fileId,String fileName) throws IOException {
+    public void download(Integer fileId, String fileName) throws IOException {
             ServletRequestAttributes requestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
             HttpServletResponse response = requestAttributes.getResponse();
             String type = new MimetypesFileTypeMap().getContentType(fileName);