From ebeecf61232967a9c21ca4aa63ccec8e269b8c0e Mon Sep 17 00:00:00 2001
From: fei <791364011@qq.com>
Date: 星期一, 29 九月 2025 09:13:58 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/archiveSystem
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchivePlaceNameController.java | 32 +++++++++++++++++++-------------
1 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchivePlaceNameController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchivePlaceNameController.java
index 8932a97..c600cbd 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchivePlaceNameController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchivePlaceNameController.java
@@ -27,7 +27,7 @@
import static com.ruoyi.common.core.page.TableSupport.PAGE_SIZE;
/**
- * 銆愯濉啓鍔熻兘鍚嶇О銆慍ontroller
+ * 銆愭浠跺湴鍖轰俊鎭�慍ontroller
*
* @author ruoyi
* @date 2025-08-08
@@ -40,7 +40,7 @@
private IArchivePlaceNameService archivePlaceNameService;
/**
- * 鏌ヨ銆愯濉啓鍔熻兘鍚嶇О銆戝垪琛�
+ * 鏌ヨ銆愭浠跺湴鍖轰俊鎭�戝垪琛�
*/
@PreAuthorize("@ss.hasPermi('system:placeName:list')")
@GetMapping("/list")
@@ -51,22 +51,28 @@
return archivePlaceNameService.selectDataList(archivePlaceName, pageNum, pageSize);
}
-
+ @PreAuthorize("@ss.hasPermi('system:placeName:list')")
+ @GetMapping("/listAll")
+ public AjaxResult getAllPlaceName()
+ {
+ ArchivePlaceName archivePlaceName = new ArchivePlaceName();
+ return success(archivePlaceNameService.selectArchivePlaceNameList(archivePlaceName));
+ }
/**
- * 瀵煎嚭銆愯濉啓鍔熻兘鍚嶇О銆戝垪琛�
+ * 瀵煎嚭銆愭浠跺湴鍖轰俊鎭�戝垪琛�
*/
@PreAuthorize("@ss.hasPermi('system:name:export')")
- @Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.EXPORT)
+ @Log(title = "銆愭浠跺湴鍖轰俊鎭��", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, ArchivePlaceName archivePlaceName)
{
List<ArchivePlaceName> list = archivePlaceNameService.selectArchivePlaceNameList(archivePlaceName);
ExcelUtil<ArchivePlaceName> util = new ExcelUtil<ArchivePlaceName>(ArchivePlaceName.class);
- util.exportExcel(response, list, "銆愯濉啓鍔熻兘鍚嶇О銆戞暟鎹�");
+ util.exportExcel(response, list, "銆愭浠跺湴鍖轰俊鎭�戞暟鎹�");
}
/**
- * 鑾峰彇銆愯濉啓鍔熻兘鍚嶇О銆戣缁嗕俊鎭�
+ * 鑾峰彇銆愭浠跺湴鍖轰俊鎭�戣缁嗕俊鎭�
*/
@PreAuthorize("@ss.hasPermi('system:name:query')")
@GetMapping(value = "/{id}")
@@ -76,10 +82,10 @@
}
/**
- * 鏂板銆愯濉啓鍔熻兘鍚嶇О銆�
+ * 鏂板銆愭浠跺湴鍖轰俊鎭��
*/
@PreAuthorize("@ss.hasPermi('system:name:add')")
- @Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.INSERT)
+ @Log(title = "銆愭浠跺湴鍖轰俊鎭��", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody ArchivePlaceName archivePlaceName)
{
@@ -87,10 +93,10 @@
}
/**
- * 淇敼銆愯濉啓鍔熻兘鍚嶇О銆�
+ * 淇敼銆愭浠跺湴鍖轰俊鎭��
*/
@PreAuthorize("@ss.hasPermi('system:name:edit')")
- @Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.UPDATE)
+ @Log(title = "銆愭浠跺湴鍖轰俊鎭��", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody ArchivePlaceName archivePlaceName)
{
@@ -98,10 +104,10 @@
}
/**
- * 鍒犻櫎銆愯濉啓鍔熻兘鍚嶇О銆�
+ * 鍒犻櫎銆愭浠跺湴鍖轰俊鎭��
*/
@PreAuthorize("@ss.hasPermi('system:name:remove')")
- @Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.DELETE)
+ @Log(title = "銆愭浠跺湴鍖轰俊鎭��", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
--
Gitblit v1.9.1