From c06fab29ca7826a6dc9736c1ba8ce1e26a11c829 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 06 三月 2025 15:57:08 +0800
Subject: [PATCH] 新增层级结构工艺规程版本、结构树表、新权限表 修改原有权限验证 删除原有代码
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/DocFileController.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/DocFileController.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/DocFileController.java
index cf3da58..f3c7b3a 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/DocFileController.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/DocFileController.java
@@ -9,6 +9,7 @@
import org.jeecg.modules.dnc.entity.DocFile;
import org.jeecg.modules.dnc.response.*;
import org.jeecg.modules.dnc.service.IDocFileService;
+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.*;
@@ -61,8 +62,8 @@
@GetMapping("/preview/{id}")
public QueryListResponseResult previewDocFile(@PathVariable("id") String id) {
DocFile docFile = docFileService.getById(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();
@@ -77,11 +78,11 @@
@GetMapping("/preview/pdf/{id}")
public ResponseResult previewPdfDocFile(HttpServletRequest request, HttpServletResponse response, @PathVariable("id") String id) {
DocFile docFile = docFileService.getById(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();
@@ -97,12 +98,12 @@
@GetMapping("/comparison/{firstFileId}/{secondFileId}")
public DataResponseResult<ComparisonFilesResponse> comparisonFileDiff(@PathVariable("firstFileId") String firstFileId, @PathVariable("secondFileId") String secondFileId) {
DocFile firstFile = docFileService.getById(firstFileId);
- if(firstFile == null || !StrUtil.isEmpty(firstFile.getFilePath()) || !StrUtil.isEmpty(firstFile.getFileName()) ||
- /*!StrUtil.isEmpty(firstFile.getFileSuffix()) ||*/ !StrUtil.isEmpty(firstFile.getFileEncodeName()))
+ if(firstFile == null || !ValidateUtil.validateString(firstFile.getFilePath()) || !ValidateUtil.validateString(firstFile.getFileName()) ||
+ /*!ValidateUtil.validateString(firstFile.getFileSuffix()) ||*/ !ValidateUtil.validateString(firstFile.getFileEncodeName()))
return new DataResponseResult(CommonCode.FAIL, null);
DocFile secondFile = docFileService.getById(secondFileId);
- if(secondFile == null || !StrUtil.isEmpty(secondFile.getFilePath()) || !StrUtil.isEmpty(secondFile.getFileName()) ||
- /*!StrUtil.isEmpty(secondFile.getFileSuffix()) ||*/ !StrUtil.isEmpty(secondFile.getFileEncodeName()))
+ if(secondFile == null || !ValidateUtil.validateString(secondFile.getFilePath()) || !ValidateUtil.validateString(secondFile.getFileName()) ||
+ /*!ValidateUtil.validateString(secondFile.getFileSuffix()) ||*/ !ValidateUtil.validateString(secondFile.getFileEncodeName()))
return new DataResponseResult(CommonCode.FAIL, null);
ComparisonFilesResponse comp = new ComparisonFilesResponse();
List<String> firstList = FileUtilS.readFile(firstFile.getFileEncodeName(), firstFile.getFilePath());
--
Gitblit v1.9.3