From f0aac7e028b09aefa2428a8d66fdb81e466a89fe Mon Sep 17 00:00:00 2001
From: fei <791364011@qq.com>
Date: 星期三, 19 十一月 2025 15:35:52 +0800
Subject: [PATCH] 修改了对应代码
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiveCategoryController.java | 51 ++++++++++++++++++++++++++++++++-------------------
1 files changed, 32 insertions(+), 19 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiveCategoryController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiveCategoryController.java
index fe97bf5..9e21b41 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiveCategoryController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiveCategoryController.java
@@ -1,6 +1,7 @@
package com.ruoyi.web.controller.archive;
+import java.util.Collections;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
@@ -11,14 +12,7 @@
import com.ruoyi.service.IArchiveCategoryService;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-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 com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -26,12 +20,13 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.web.multipart.MultipartFile;
import static com.ruoyi.common.core.page.TableSupport.PAGE_NUM;
import static com.ruoyi.common.core.page.TableSupport.PAGE_SIZE;
/**
- * 銆愯濉啓鍔熻兘鍚嶇О銆慍ontroller
+ * 銆愭鍗风被鍒俊鎭�慍ontroller
*
* @author ruoyi
* @date 2025-07-26
@@ -44,7 +39,7 @@
private IArchiveCategoryService archiveCategoryService;
/**
- * 鏌ヨ銆愯濉啓鍔熻兘鍚嶇О銆戝垪琛�
+ * 鏌ヨ銆愭鍗风被鍒俊鎭�戝垪琛�
*/
@PreAuthorize("@ss.hasPermi('system:category:list')")
@GetMapping("/list")
@@ -63,10 +58,10 @@
return success(archiveCategoryService.selectArchiveCategoryList(archiveCategory));
}
/**
- * 瀵煎嚭銆愯濉啓鍔熻兘鍚嶇О銆戝垪琛�
+ * 瀵煎嚭銆愭鍗风被鍒俊鎭�戝垪琛�
*/
@PreAuthorize("@ss.hasPermi('system:category:export')")
- @Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.EXPORT)
+ @Log(title = "銆愭鍗风被鍒俊鎭��", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, ArchiveCategory archiveCategory)
{
@@ -78,7 +73,7 @@
}
/**
- * 鑾峰彇銆愯濉啓鍔熻兘鍚嶇О銆戣缁嗕俊鎭�
+ * 鑾峰彇銆愭鍗风被鍒俊鎭�戣缁嗕俊鎭�
*/
@PreAuthorize("@ss.hasPermi('system:category:query')")
@GetMapping(value = "/{id}")
@@ -88,10 +83,10 @@
}
/**
- * 鏂板銆愯濉啓鍔熻兘鍚嶇О銆�
+ * 鏂板銆愭鍗风被鍒俊鎭��
*/
@PreAuthorize("@ss.hasPermi('system:category:add')")
- @Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.INSERT)
+ @Log(title = "銆愭鍗风被鍒俊鎭��", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody ArchiveCategory archiveCategory)
{
@@ -99,10 +94,10 @@
}
/**
- * 淇敼銆愯濉啓鍔熻兘鍚嶇О銆�
+ * 淇敼銆愭鍗风被鍒俊鎭��
*/
@PreAuthorize("@ss.hasPermi('system:category:edit')")
- @Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.UPDATE)
+ @Log(title = "銆愭鍗风被鍒俊鎭��", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody ArchiveCategory archiveCategory)
{
@@ -110,13 +105,31 @@
}
/**
- * 鍒犻櫎銆愯濉啓鍔熻兘鍚嶇О銆�
+ * 鍒犻櫎銆愭鍗风被鍒俊鎭��
*/
@PreAuthorize("@ss.hasPermi('system:category:remove')")
- @Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.DELETE)
+ @Log(title = "銆愭鍗风被鍒俊鎭��", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(archiveCategoryService.deleteArchiveCategoryByIds(ids));
}
+
+
+ // @PreAuthorize("@ss.hasPermi('system:records:edit')")
+ @Log(title = "妗ｆ绫诲埆璁板綍瀵煎叆", businessType = BusinessType.IMPORT)
+ @PostMapping("/importData")
+ public AjaxResult importData(@RequestParam("file") MultipartFile file) throws Exception
+ {
+ System.out.println(file);
+ return archiveCategoryService.importExcel(file);
+ }
+
+ @PostMapping("/model")
+ public void getExportModel(HttpServletResponse response){
+ List<ArchiveCategory> list = Collections.singletonList(new ArchiveCategory());
+ ExcelUtil<ArchiveCategory> util = new ExcelUtil<>(ArchiveCategory.class);
+ util.exportExcel(response,list,"妗ｆ绫诲埆瀵煎叆妯℃澘");
+ }
+
}
--
Gitblit v1.9.1