From 66d041ed14b3ed3ed7183a28a5c588e235fc21d0 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期二, 26 五月 2026 11:14:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_鹤壁_强信宇_pro
---
src/main/java/com/ruoyi/warehouse/controller/DocumentationFileController.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/ruoyi/warehouse/controller/DocumentationFileController.java b/src/main/java/com/ruoyi/warehouse/controller/DocumentationFileController.java
index 6ec0e54..9ce000b 100644
--- a/src/main/java/com/ruoyi/warehouse/controller/DocumentationFileController.java
+++ b/src/main/java/com/ruoyi/warehouse/controller/DocumentationFileController.java
@@ -1,10 +1,8 @@
package com.ruoyi.warehouse.controller;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.account.pojo.AccountFile;
-import com.ruoyi.account.service.AccountFileService;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.warehouse.pojo.DocumentationFile;
import com.ruoyi.warehouse.service.DocumentationFileService;
import org.springframework.util.CollectionUtils;
@@ -18,7 +16,7 @@
*/
@RestController
@RequestMapping("/documentation/documentationFile")
-public class DocumentationFileController extends BaseController {
+public class DocumentationFileController {
@Resource
@@ -29,9 +27,10 @@
* @param documentationFile
* @return
*/
+ @Log(title = "鏂板鏂囨。鏂囦欢", businessType = BusinessType.INSERT)
@PostMapping("/add")
- public R<?> add(@RequestBody DocumentationFile documentationFile) {
- return R.ok(documentationFileService.save(documentationFile));
+ public AjaxResult add(@RequestBody DocumentationFile documentationFile) {
+ return AjaxResult.success(documentationFileService.save(documentationFile));
}
/**
@@ -39,13 +38,14 @@
* @param ids
* @return
*/
+ @Log(title = "鍒犻櫎鏂囨。鏂囦欢", businessType = BusinessType.DELETE)
@DeleteMapping("/del")
- public R<?> delDocumentationFile(@RequestBody List<Long> ids) {
+ public AjaxResult delDocumentationFile(@RequestBody List<Long> ids) {
if(CollectionUtils.isEmpty(ids)){
- return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
//鍒犻櫎妫�楠岄檮浠�
- return R.ok(documentationFileService.removeBatchByIds(ids));
+ return AjaxResult.success(documentationFileService.removeBatchByIds(ids));
}
/**
@@ -55,8 +55,8 @@
* @return
*/
@GetMapping("/listPage")
- public R<?> documentationFileListPage(DocumentationFile documentationFile) {
- return R.ok(documentationFileService.documentationFileListPage( documentationFile));
+ public AjaxResult documentationFileListPage(DocumentationFile documentationFile) {
+ return AjaxResult.success(documentationFileService.documentationFileListPage( documentationFile));
}
--
Gitblit v1.9.3