From e146bc181625aee75624f8364654721cfd886254 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 30 六月 2023 17:39:53 +0800
Subject: [PATCH] 修改部分空指针报错
---
Source/UBCS/ubcs-ops/ubcs-resource/src/main/java/com/vci/ubcs/resource/controller/FileController.java | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 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 e2ba9d5..eecdaa7 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,5 +1,6 @@
package com.vci.ubcs.resource.controller;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.vci.ubcs.resource.dto.FileObjectDTO;
import com.vci.ubcs.resource.dto.FileReleaseDTO;
@@ -8,16 +9,22 @@
import com.vci.ubcs.resource.service.IFileService;
import com.vci.ubcs.resource.utils.FileDownloadUtil;
import com.vci.ubcs.resource.vo.FileObjectVO;
+import com.vci.ubcs.starter.exception.VciBaseException;
+import com.vci.ubcs.starter.web.util.ControllerUtil;
import com.vci.ubcs.starter.web.util.LangBaseUtil;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
+import lombok.extern.java.Log;
+import lombok.extern.slf4j.Slf4j;
import org.springblade.core.mp.support.Query;
import org.springblade.core.oss.MinioTemplate;
import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
+import java.nio.charset.StandardCharsets;
import java.util.Collection;
import java.util.List;
@@ -28,6 +35,7 @@
*/
@RestController()
@RequestMapping("/fileController")
+@Slf4j
public class FileController {
/**
@@ -44,15 +52,15 @@
* @return 鎵ц缁撴灉锛屽彧鏈変笅杞藉け璐ョ殑鏃跺�欐墠浼氳繖鏍�
*/
@RequestMapping(value = "/downloadFilesByOids",method = {RequestMethod.GET,RequestMethod.POST})
- public R downloadFilesByOids(@RequestParam String fileOids, HttpServletResponse response){
+ public String downloadFilesByOids(@RequestParam String fileOids, HttpServletResponse response){
try{
FileDownloadUtil.downloadFile(response, fileService.downloadFileByOids(VciBaseUtil.str2List(fileOids)));
}catch (Throwable e){
- return R.fail(LangBaseUtil.getErrorMsg(e));
+ return JSON.toJSONString(R.fail(LangBaseUtil.getErrorMsg(e)));
}
- return R.success("涓嬭浇瀹屾垚");
+ //鍥犱负璁剧疆浜嗗搷搴攃ontentType,鎵�浠ヨ繖鍎夸笉鑳藉啀鐩存帴杩斿洖R浜嗭紝鍙兘浼氬鑷存姤閿�
+ return JSON.toJSONString(R.success("涓嬭浇瀹屾垚")) ;
}
-
/**
* 鏂囦欢鍒犻櫎
@@ -61,7 +69,17 @@
*/
@DeleteMapping("/deleteFile")
public R deleteFile(@RequestBody Collection<String> oids){
- fileService.deleteFiles(oids);
+ try {
+ fileService.deleteFiles(oids);
+ }catch (Throwable e){
+ //濡傛灉鍑洪敊,鎶婇敊璇俊鎭啓鍒皌ext
+ String msg = LangBaseUtil.getErrorMsg(e);
+ if(StringUtil.isBlank(msg)){
+ msg = "鏈煡閿欒";
+ }
+ log.debug(msg);
+ return R.fail(msg);
+ }
return R.success("鍒犻櫎鎴愬姛");
}
--
Gitblit v1.9.3