From c4d687aacfb4e7b6ee5ce67df93cf2f8d8df80c1 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期日, 26 十一月 2023 14:05:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-ops/ubcs-resource/src/main/java/com/vci/ubcs/resource/controller/FileController.java | 230 +++++++++++++++++++++++++++++----------------------------
1 files changed, 118 insertions(+), 112 deletions(-)
diff --git a/Source/UBCS/ubcs-ops/ubcs-resource/src/main/java/com/vci/ubcs/resource/controller/FileController.java b/Source/UBCS/ubcs-ops/ubcs-resource/src/main/java/com/vci/ubcs/resource/controller/FileController.java
index b81f862..626effe 100644
--- a/Source/UBCS/ubcs-ops/ubcs-resource/src/main/java/com/vci/ubcs/resource/controller/FileController.java
+++ b/Source/UBCS/ubcs-ops/ubcs-resource/src/main/java/com/vci/ubcs/resource/controller/FileController.java
@@ -1,6 +1,7 @@
package com.vci.ubcs.resource.controller;
import com.alibaba.fastjson.JSON;
+import com.alibaba.nacos.common.utils.StringUtils;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.vci.ubcs.resource.dto.FileObjectDTO;
import com.vci.ubcs.resource.dto.FileReleaseDTO;
@@ -24,6 +25,7 @@
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.Collection;
import java.util.List;
@@ -38,36 +40,40 @@
@Slf4j
public class FileController {
- /**
- * 鏂囦欢鏈嶅姟
- */
- @Autowired
- private IFileService fileService;
+ /**
+ * 鏂囦欢鏈嶅姟
+ */
+ @Autowired
+ private IFileService fileService;
- /**
- * 鏍规嵁鏂囦欢涓婚敭涓嬭浇鏂囦欢
- * @param fileOids 鏂囦欢鐨勪富閿�
- * @param response 鍝嶅簲鐨勫璞�
- * @return 鎵ц缁撴灉锛屽彧鏈変笅杞藉け璐ョ殑鏃跺�欐墠浼氳繖鏍�
- */
+ /**
+ * 鏍规嵁鏂囦欢涓婚敭涓嬭浇鏂囦欢
+ * @param fileOids 鏂囦欢鐨勪富閿�
+ * @param response 鍝嶅簲鐨勫璞�
+ * @return 鎵ц缁撴灉锛屽彧鏈変笅杞藉け璐ョ殑鏃跺�欐墠浼氳繖鏍�
+ */
@RequestMapping(value = "/downloadFilesByOids",method = {RequestMethod.GET,RequestMethod.POST})
- public String downloadFilesByOids(@RequestParam String fileOids, HttpServletResponse response){
- try{
+ public void downloadFilesByOids(@RequestParam String fileOids, HttpServletResponse response) throws IOException {
+ try {
+ //ControllerUtil.writeFileToResponse(response,excelName);
FileDownloadUtil.downloadFile(response, fileService.downloadFileByOids(VciBaseUtil.str2List(fileOids)));
- }catch (Throwable e){
- return JSON.toJSONString(R.fail(LangBaseUtil.getErrorMsg(e)));
+ } catch (Throwable e) {
+ //濡傛灉鍑洪敊,鎶婇敊璇俊鎭啓鍒皌ext
+ String msg = LangBaseUtil.getErrorMsg(e);
+ if(StringUtils.isBlank(msg)){
+ msg = "鏈煡閿欒";
+ }
+ ControllerUtil.writeDataToResponse(response,msg.getBytes(StandardCharsets.UTF_8),null);
}
- //鍥犱负璁剧疆浜嗗搷搴攃ontentType,鎵�浠ヨ繖鍎夸笉鑳藉啀鐩存帴杩斿洖R浜嗭紝鍙兘浼氬鑷存姤閿�
- return JSON.toJSONString(R.success("涓嬭浇瀹屾垚")) ;
}
- /**
- * 鏂囦欢鍒犻櫎
- * @param oids 鏂囦欢鐨勪富閿�
- * @return 鏂囦欢鍐呭
- */
- @DeleteMapping("/deleteFile")
- public R deleteFile(@RequestBody Collection<String> oids){
+ /**
+ * 鏂囦欢鍒犻櫎
+ * @param oids 鏂囦欢鐨勪富閿�
+ * @return 鏂囦欢鍐呭
+ */
+ @DeleteMapping("/deleteFile")
+ public R deleteFile(@RequestBody Collection<String> oids){
try {
fileService.deleteFiles(oids);
}catch (Throwable e){
@@ -79,104 +85,104 @@
log.debug(msg);
return R.fail(msg);
}
- return R.success("鍒犻櫎鎴愬姛");
- }
+ return R.success("鍒犻櫎鎴愬姛");
+ }
- /**
- * 鍓嶇椤甸潰鍗曟枃浠朵笂浼犮��(鍏堟暟鎹紝鍚庢枃浠舵ā寮忎笂浼�)
- * @param file 涓婁紶鐨勬枃浠�
- * @param fileObjectDTO 鏂囦欢淇℃伅浼犺緭瀵硅薄
- * @return 鏂囦欢淇℃伅鏄剧ず瀵硅薄
- */
- @PostMapping("/uploadFile")
- public R<FileObjectVO> uploadFile(MultipartFile file, FileObjectDTO fileObjectDTO){
- if (file != null ) {
- return fileService.uploadFile(file, fileObjectDTO);
- } else {
- return R.fail("鏃犱笂浼犵殑鏂囦欢");
- }
- }
+ /**
+ * 鍓嶇椤甸潰鍗曟枃浠朵笂浼犮��(鍏堟暟鎹紝鍚庢枃浠舵ā寮忎笂浼�)
+ * @param file 涓婁紶鐨勬枃浠�
+ * @param fileObjectDTO 鏂囦欢淇℃伅浼犺緭瀵硅薄
+ * @return 鏂囦欢淇℃伅鏄剧ず瀵硅薄
+ */
+ @PostMapping("/uploadFile")
+ public R<FileObjectVO> uploadFile(MultipartFile file, FileObjectDTO fileObjectDTO){
+ if (file != null ) {
+ return fileService.uploadFile(file, fileObjectDTO);
+ } else {
+ return R.fail("鏃犱笂浼犵殑鏂囦欢");
+ }
+ }
- /**
- * 鍦ㄤ笂浼犳枃浠跺悗锛屼繚瀛樻枃浠剁殑淇℃伅
- * @param fileObjectDTO 鏂囦欢淇℃伅浼犺緭瀵硅薄
- * @return 鏂囦欢淇℃伅鏄剧ず瀵硅薄
- */
- @PostMapping("/saveFileAfterUpload")
- public R<FileObjectVO> saveFileAfterUpload( @RequestBody FileObjectDTO fileObjectDTO){
- return fileService.saveFileAfterUpload(fileObjectDTO);
- }
+ /**
+ * 鍦ㄤ笂浼犳枃浠跺悗锛屼繚瀛樻枃浠剁殑淇℃伅
+ * @param fileObjectDTO 鏂囦欢淇℃伅浼犺緭瀵硅薄
+ * @return 鏂囦欢淇℃伅鏄剧ず瀵硅薄
+ */
+ @PostMapping("/saveFileAfterUpload")
+ public R<FileObjectVO> saveFileAfterUpload( @RequestBody FileObjectDTO fileObjectDTO){
+ return fileService.saveFileAfterUpload(fileObjectDTO);
+ }
- /**
- * 灏嗗師鏁版嵁涓嬬殑鎵�鏈夋枃浠跺叡浜埌鍏朵粬鐨勪笟鍔℃暟鎹笅
- * @param shareDTO 鏂囦欢鍒嗕韩
- * @return 鏂囦欢淇℃伅鏄剧ず瀵硅薄,鏄涓�
- */
- @PostMapping("/shareFiles")
- public R<List<FileObjectVO>> shareFiles(@RequestBody FileShareDTO shareDTO){
- return fileService.shareFiles(shareDTO);
- }
+ /**
+ * 灏嗗師鏁版嵁涓嬬殑鎵�鏈夋枃浠跺叡浜埌鍏朵粬鐨勪笟鍔℃暟鎹笅
+ * @param shareDTO 鏂囦欢鍒嗕韩
+ * @return 鏂囦欢淇℃伅鏄剧ず瀵硅薄,鏄涓�
+ */
+ @PostMapping("/shareFiles")
+ public R<List<FileObjectVO>> shareFiles(@RequestBody FileShareDTO shareDTO){
+ return fileService.shareFiles(shareDTO);
+ }
- /**
- * 淇敼鏂囦欢淇℃伅(涓嶅惈鏂囦欢),娉ㄦ剰objectName鍜宖ilePath涓嶄細鍙樺寲
- * @param fileDTOs 鏂囦欢鐨勬暟鎹璞�
- * @return 鎵ц缁撴灉
- */
- @PostMapping("/updateFileInfos")
- public R updateFileInfos(@RequestBody Collection<FileObjectDTO> fileDTOs){
- return fileService.updateFileInfos(fileDTOs);
- }
+ /**
+ * 淇敼鏂囦欢淇℃伅(涓嶅惈鏂囦欢),娉ㄦ剰objectName鍜宖ilePath涓嶄細鍙樺寲
+ * @param fileDTOs 鏂囦欢鐨勬暟鎹璞�
+ * @return 鎵ц缁撴灉
+ */
+ @PostMapping("/updateFileInfos")
+ public R updateFileInfos(@RequestBody Collection<FileObjectDTO> fileDTOs){
+ return fileService.updateFileInfos(fileDTOs);
+ }
- /**
- * 鏂囦欢鐢熸晥
- * @param ids 鏂囦欢鐨勪富閿�
- * @return 鎵ц缁撴灉
- */
- @PutMapping("/releasedFiles")
- public R releasedFiles(@RequestBody Collection<String> ids){
- return fileService.releasedFiles(ids);
- }
+ /**
+ * 鏂囦欢鐢熸晥
+ * @param ids 鏂囦欢鐨勪富閿�
+ * @return 鎵ц缁撴灉
+ */
+ @PutMapping("/releasedFiles")
+ public R releasedFiles(@RequestBody Collection<String> ids){
+ return fileService.releasedFiles(ids);
+ }
- /**
- * 鎵归噺鎸囧畾鏂囦欢涓氬姟鏁版嵁鍚庣敓鏁�
- * @param releaseDTOS 鐢熸晥鐨勭浉鍏充俊鎭�
- * @return 鎵ц缁撴灉
- */
- @PutMapping("/releasedFilesForOwn")
- public R releasedFilesForOwn(@RequestBody Collection<FileReleaseDTO> releaseDTOS){
- return fileService.releasedFilesForOwn(releaseDTOS);
- }
+ /**
+ * 鎵归噺鎸囧畾鏂囦欢涓氬姟鏁版嵁鍚庣敓鏁�
+ * @param releaseDTOS 鐢熸晥鐨勭浉鍏充俊鎭�
+ * @return 鎵ц缁撴灉
+ */
+ @PutMapping("/releasedFilesForOwn")
+ public R releasedFilesForOwn(@RequestBody Collection<FileReleaseDTO> releaseDTOS){
+ return fileService.releasedFilesForOwn(releaseDTOS);
+ }
- /**
- * 浣跨敤涓氬姟绫诲瀷鏌ヨ鏂囦欢鐨勪俊鎭紝鎻愪緵缁欓〉闈㈣皟鐢�
- * @param fileQuery 鏌ヨ瀵硅薄
- * @return 鏂囦欢鐨勬樉绀哄璞�
- */
- @RequestMapping(value = "/listFiles",method = {RequestMethod.GET,RequestMethod.POST})
- public R<IPage<FileObjectVO>> listFiles(FileQuery fileQuery, Query query){
- return R.data(fileService.listFiles(fileQuery,query));
- }
+ /**
+ * 浣跨敤涓氬姟绫诲瀷鏌ヨ鏂囦欢鐨勪俊鎭紝鎻愪緵缁欓〉闈㈣皟鐢�
+ * @param fileQuery 鏌ヨ瀵硅薄
+ * @return 鏂囦欢鐨勬樉绀哄璞�
+ */
+ @RequestMapping(value = "/listFiles",method = {RequestMethod.GET,RequestMethod.POST})
+ public R<IPage<FileObjectVO>> listFiles(FileQuery fileQuery, Query query){
+ return R.data(fileService.listFiles(fileQuery,query));
+ }
- /**
- * 浣跨敤鏂囦欢涓婚敭鑾峰彇瀵硅薄
- * @param oid 涓婚敭
- * @return 鏂囦欢鏄剧ず瀵硅薄
- */
- @GetMapping("/get")
- public FileObjectVO get(String oid){
- return fileService.get(oid);
- }
+ /**
+ * 浣跨敤鏂囦欢涓婚敭鑾峰彇瀵硅薄
+ * @param oid 涓婚敭
+ * @return 鏂囦欢鏄剧ず瀵硅薄
+ */
+ @GetMapping("/get")
+ public FileObjectVO get(String oid){
+ return fileService.get(oid);
+ }
- /**
- * 浣跨敤鏂囦欢鐨勪富閿壒閲忚幏鍙栧璞�
- * @param oids 鏂囦欢鐨勪富閿泦鍚�
- * @return 鏂囦欢鐨勬樉绀轰俊鎭�
- */
- @GetMapping("/listFilesByOids")
- public List<FileObjectVO> listFilesByOids( Collection<String> oids){
- return fileService.listFilesByOids(oids);
- }
+ /**
+ * 浣跨敤鏂囦欢鐨勪富閿壒閲忚幏鍙栧璞�
+ * @param oids 鏂囦欢鐨勪富閿泦鍚�
+ * @return 鏂囦欢鐨勬樉绀轰俊鎭�
+ */
+ @GetMapping("/listFilesByOids")
+ public List<FileObjectVO> listFilesByOids( Collection<String> oids){
+ return fileService.listFilesByOids(oids);
+ }
}
--
Gitblit v1.9.3