From ea704e018a27c26ef6deeaea4adc8a28b4d0b27e Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 17 一月 2025 17:15:29 +0800
Subject: [PATCH] 修改指派设备
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/DocInfoController.java | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 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..7971464 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
@@ -4,6 +4,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.modules.dnc.entity.DocFile;
@@ -15,6 +16,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.*;
@@ -123,15 +125,15 @@
@AutoLog(value = "鏂囨。琛�-鍒嗛〉鏌ヨ鎺ュ彛")
@ApiOperation(value = "鏂囨。琛�-鍒嗛〉鏌ヨ鎺ュ彛", notes = "鏂囨。琛�-鍒嗛〉鏌ヨ鎺ュ彛")
@GetMapping("/find/page/{page}/{size}")
- public QueryPageResponseResult<DocInfo> findPageList(@PathVariable("page") int page, @PathVariable("size") int size, DocInfoQueryRequest docQuery) {
+ public Result<?> findPageList(@PathVariable("page") int page, @PathVariable("size") int size, DocInfoQueryRequest docQuery) {
return docInfoService.findPageList(page, size, docQuery);
}
@AutoLog(value = "鏂囨。琛�-鏌ヨ璁惧鍙戦�佺洰褰曠殑鏂囨。鐘舵��")
@ApiOperation(value = "鏂囨。琛�-鏌ヨ璁惧鍙戦�佺洰褰曠殑鏂囨。鐘舵��", notes = "鏂囨。琛�-鏌ヨ璁惧鍙戦�佺洰褰曠殑鏂囨。鐘舵��")
@GetMapping("/find/page/device/{page}/{size}")
- public QueryPageResponseResult<DocInfo> findPageListByDevice(@PathVariable("page") int page, @PathVariable("size") int size, DocInfoQueryRequest docQuery) {
- return docInfoService.findPageListByDevice(page, size, docQuery);
+ public Result<?> findPageListByDevice(@PathVariable("page") int page, @PathVariable("size") int size, DocInfoQueryRequest docQuery) {
+ return Result.ok(docInfoService.findPageListByDevice(page, size, docQuery));
}
@AutoLog(value = "鏂囨。琛�-鏂囨。鏂囦欢棰勮")
@@ -139,9 +141,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 +158,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