From 54aff4794f199c40323e8704f660819b73fea768 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期日, 28 九月 2025 16:32:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentListController.java | 37 ++++++++++++++++---------------------
1 files changed, 16 insertions(+), 21 deletions(-)
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentListController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentListController.java
index 4cba7e9..876496f 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentListController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentListController.java
@@ -1,19 +1,20 @@
package com.ruoyi.manage.controller;
import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.read.builder.ExcelReaderBuilder;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.manage.annotation.CustomClazzName;
-import com.ruoyi.manage.annotation.ValueClassify;
+
+
+import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.utils.JackSonUtil;
import com.ruoyi.manage.excel.ManageDocumentListListener;
import com.ruoyi.manage.pojo.ManageDocumentList;
import com.ruoyi.manage.service.ManageDocumentListService;
-import com.ruoyi.manage.utils.JackSonUtil;
-import com.ruoyi.manage.vo.Result;
+import com.deepoove.poi.data.style.*;
+import com.deepoove.poi.data.style.*;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
@@ -26,52 +27,46 @@
鍓嶇鎺у埗鍣�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-08 11:08:11
*/
+@Api(tags = "绠＄悊浣撶郴鏂囦欢鐨勬帶鍒�")
@RestController
@RequestMapping("/manageDocumentList")
-@CustomClazzName(name = "浣撶郴绠＄悊瑕佹眰",index = 10)
public class ManageDocumentListController {
@Resource
private ManageDocumentListService manageDocumentListService;
- @ValueClassify(value = "绠＄悊浣撶郴鏂囦欢鐨勬帶鍒�")
@ApiOperation(value = "鍒嗛〉鏌ヨ鏂囦欢娓呭崟")
- @PostMapping("/pageManageDocumentList")
- public Result pageManageDocumentList(@RequestBody Map<String, Object> data) throws Exception {
- Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
- ManageDocumentList manageDocumentList = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), ManageDocumentList.class);
+ @GetMapping("/pageManageDocumentList")
+ public Result pageManageDocumentList(Page page,ManageDocumentList manageDocumentList) throws Exception {
return Result.success(manageDocumentListService.pageManageDocumentList(page, manageDocumentList));
}
- @ValueClassify(value = "绠＄悊浣撶郴鏂囦欢鐨勬帶鍒�")
@ApiOperation(value = "缂栬緫鏂囦欢娓呭崟")
@PostMapping("/doManageDocumentList")
public Result doManageDocumentList(@RequestBody ManageDocumentList manageDocumentList) {
return Result.success(manageDocumentListService.updateById(manageDocumentList));
}
- @ValueClassify(value = "绠＄悊浣撶郴鏂囦欢鐨勬帶鍒�")
- @ApiOperation(value = "缂栬緫鏂囦欢娓呭崟")
- @PostMapping("/delManageDocumentList")
+ @ApiOperation(value = "鍒犻櫎鏂囦欢娓呭崟")
+ @DeleteMapping("/delManageDocumentList")
public Result delManageDocumentList(Integer id) {
return Result.success(manageDocumentListService.removeById(id));
}
- @ValueClassify(value = "绠＄悊浣撶郴鏂囦欢鐨勬帶鍒�")
@ApiOperation(value = "涓婁紶闄勪欢-鏂囦欢娓呭崟")
@PostMapping("/uploadFileManageDocumentList")
public Result uploadFileManageDocumentList(Integer id, MultipartFile file) {
return Result.success(manageDocumentListService.uploadFile(id,file));
}
- @ValueClassify(value = "绠＄悊浣撶郴鏂囦欢鐨勬帶鍒�")
@ApiOperation(value = "瀵煎叆鏂囦欢娓呭崟鍒楄〃")
@PostMapping("/exportManageDocumentList")
public Result exportManageDocumentList(MultipartFile file) {
try {
+ // 琛ㄥご鏍￠獙妯℃澘鏄惁姝ｇ‘
EasyExcel.read(file.getInputStream(), ManageDocumentList.class, new ManageDocumentListListener(manageDocumentListService)).sheet().doRead();
} catch (IOException e) {
e.printStackTrace();
--
Gitblit v1.9.3