From 48e850f8721a5562c2d0c23f9281f92ec1ba947a Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期一, 13 一月 2025 15:18:30 +0800
Subject: [PATCH] DNC平移航宇救生修改
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/DocInfoController.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/DocInfoController.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/DocInfoController.java
index d79d6de..34d77c7 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/DocInfoController.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/DocInfoController.java
@@ -15,6 +15,7 @@
import org.jeecg.modules.dnc.response.QueryPageResponseResult;
import org.jeecg.modules.dnc.response.ResponseResult;
import org.jeecg.modules.dnc.service.IDocInfoService;
+import org.jeecg.modules.dnc.utils.ValidateUtil;
import org.jeecg.modules.dnc.utils.file.FileUtilS;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -139,9 +140,9 @@
@GetMapping("/preview/{id}")
public QueryListResponseResult previewDocFile(@PathVariable("id") String id) {
DocFile docFile = docInfoService.previewDocFile(id);
- if(!StrUtil.isEmpty(docFile.getFilePath()) || !StrUtil.isEmpty(docFile.getFileName())
-// || !StrUtil.isEmpty(docFile.getFileSuffix())
- || !StrUtil.isEmpty(docFile.getFileEncodeName()))
+ if(!ValidateUtil.validateString(docFile.getFilePath()) || !ValidateUtil.validateString(docFile.getFileName())
+// || !ValidateUtil.validateString(docFile.getFileSuffix())
+ || !ValidateUtil.validateString(docFile.getFileEncodeName()))
return new QueryListResponseResult(CommonCode.FAIL, null);
String filePath = docFile.getFilePath();
String fileEncodeName = docFile.getFileEncodeName();
@@ -156,11 +157,11 @@
@GetMapping("/preview/pdf/{id}")
public ResponseResult previewPdfDocFile(HttpServletRequest request, HttpServletResponse response, @PathVariable("id") String id) {
DocFile docFile = docInfoService.previewDocFile(id);
- if(!StrUtil.isEmpty(docFile.getFilePath()) || !StrUtil.isEmpty(docFile.getFileName()) ||
- /*!StrUtil.isEmpty(docFile.getFileSuffix()) ||*/ !StrUtil.isEmpty(docFile.getFileEncodeName()))
+ if(!ValidateUtil.validateString(docFile.getFilePath()) || !ValidateUtil.validateString(docFile.getFileName()) ||
+ /*!ValidateUtil.validateString(docFile.getFileSuffix()) ||*/ !ValidateUtil.validateString(docFile.getFileEncodeName()))
return new ResponseResult(CommonCode.FAIL);
String fileName;
- if(StrUtil.isEmpty(docFile.getFileSuffix())) {
+ if(ValidateUtil.validateString(docFile.getFileSuffix())) {
fileName = docFile.getFileName() + "." + docFile.getFileSuffix();
}else {
fileName = docFile.getFileName();
--
Gitblit v1.9.3