From 7d64716cb0d406f21cde03976fd273bd07fdc06f Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期二, 28 九月 2021 11:44:28 +0800
Subject: [PATCH] 更新用户-角色-菜单-权限
---
src/main/java/com/whyc/controller/ProjectManageController.java | 39 +++++++++++++++++++++++----------------
1 files changed, 23 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/whyc/controller/ProjectManageController.java b/src/main/java/com/whyc/controller/ProjectManageController.java
index 055290c..90deccf 100644
--- a/src/main/java/com/whyc/controller/ProjectManageController.java
+++ b/src/main/java/com/whyc/controller/ProjectManageController.java
@@ -128,10 +128,18 @@
@GetMapping("/download")
- @ApiOperation(notes = "闇�瑕佸湪鍦板潃鏍忔祴璇�",value = "椤圭洰杩囩▼绠＄悊-鏂囨。鏉愭枡涓嬭浇")
- public Object download(HttpServletResponse response, @RequestParam String filePath,@RequestParam String fileName) {
- Response<Object> result = new Response<>();
- File file = new File( filePath);
+ @ApiOperation(notes = "闇�瑕佸湪鍦板潃鏍忔祴璇� http://localhost:8090/projectManage/download?fileName=鐢宠涔�.pdf",value = "椤圭洰杩囩▼绠＄悊-鏂囨。鏉愭枡涓嬭浇")
+ public String download(HttpServletResponse response, @ApiParam(value = "鏂囦欢璺緞",required = true)@RequestParam String filePath) {
+ String fileName = "";
+ if (filePath.length() > 10&&filePath.contains("/")) { //IP鍦板潃+鏂囦欢鍚�
+ int lastIndexOf = filePath.lastIndexOf("/");
+ fileName = filePath.substring(lastIndexOf);
+ } else {
+ return "filePath is Error";
+ }
+
+ String projectPath = FileUtils.getProjectPath();
+ File file = new File( projectPath+fileName);
if (file.exists()) {
try {
fileName= new String(fileName.getBytes("gbk"), "ISO8859-1");
@@ -153,10 +161,12 @@
outputStream.write(buffer, 0, i);
i = bis.read(buffer);
}
- return result.setMsg(1,"涓嬭浇鎴愬姛");
+// return result.setMsg(1,"涓嬭浇鎴愬姛");
+ return "downloadSuccessful";
} catch (Exception e) {
e.printStackTrace();
- return result.setMsg(0,"涓嬭浇澶辫触");
+// return result.setMsg(0,"涓嬭浇澶辫触");
+ return "downloadFailed";
} finally {
if (bis != null) {
try {
@@ -173,8 +183,9 @@
}
}
}
+ }else{
+ return "fileDoesNotExist";
}
- return result.setMsg(0,"鏂囦欢涓嶅瓨鍦�");
}
@@ -276,17 +287,13 @@
/**
* @param proNameCode
- * @param proNum
- * @return 瀹為獙鍚嶇О銆佷笂浼犳棩鏈熴�佸綊妗ｆ棩鏈� (鎿嶄綔TODO)
+ * @return 瀹為獙鍚嶇О銆佽瘯楠屾棩鏈熴�佺粨璁哄瓧娈� etc
*/
@GetMapping("archiveExperimentData")
- @ApiOperation(notes = "(鎿嶄綔TODO)",value = "椤圭洰褰掓。绠＄悊-璇曢獙鏁版嵁")
- public Response searchArchiveExperimentData(@ApiParam(value = "椤圭洰鍚嶇О浠ｇ爜", required = true) @RequestParam String proNameCode,
- @ApiParam(value = "椤圭洰缂栧彿", required = true) @RequestParam String proNum) {
- ProjectArchiveManage pam = new ProjectArchiveManage();
- pam.setProNum(proNum);
- pam.setProNameCode(proNameCode);
- return archiveManageService.searchArchiveExperimentData(pam);
+ @ApiOperation(notes = "TODO 鏂囦欢鏍煎紡鍜屼笅杞藉湴鍧�", value = "椤圭洰褰掓。绠＄悊-璇曢獙鏁版嵁")
+ public Response searchArchiveExperimentData(@ApiParam(value = "椤圭洰鍚嶇О浠ｇ爜", required = true) @RequestParam String proNameCode) {
+ //TODO fileName file
+ return archiveManageService.searchArchiveExperimentData(proNameCode);
}
@GetMapping("archiveTechnologicalAchievements")
--
Gitblit v1.9.1