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/ArchiveProjectNameController.java | 57 ++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 36 insertions(+), 21 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiveProjectNameController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiveProjectNameController.java
index bce72ca..a413ddf 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiveProjectNameController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiveProjectNameController.java
@@ -2,6 +2,7 @@
+import java.util.Collections;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
@@ -12,14 +13,7 @@
import com.ruoyi.service.IArchiveProjectNameService;
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;
@@ -27,12 +21,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-08-08
@@ -45,7 +40,7 @@
private IArchiveProjectNameService archiveProjectNameService;
/**
- * 鏌ヨ銆愯濉啓鍔熻兘鍚嶇О銆戝垪琛�
+ * 鏌ヨ銆愭浠堕」鐩俊鎭�戝垪琛�
*/
@PreAuthorize("@ss.hasPermi('system:projectName:list')")
@GetMapping("/list")
@@ -56,22 +51,28 @@
return archiveProjectNameService.selectDataList(archiveProjectName, pageNum, pageSize);
}
-
+ @PreAuthorize("@ss.hasPermi('system:projectName:list')")
+ @GetMapping("/listAll")
+ public AjaxResult getAllProjectName()
+ {
+ ArchiveProjectName archivePlaceName = new ArchiveProjectName();
+ return success(archiveProjectNameService.selectArchiveProjectNameList(archivePlaceName));
+ }
/**
- * 瀵煎嚭銆愯濉啓鍔熻兘鍚嶇О銆戝垪琛�
+ * 瀵煎嚭銆愭浠堕」鐩俊鎭�戝垪琛�
*/
@PreAuthorize("@ss.hasPermi('system:projectName:export')")
- @Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.EXPORT)
+ @Log(title = "銆愭浠堕」鐩俊鎭��", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, ArchiveProjectName archiveProjectName)
{
List<ArchiveProjectName> list = archiveProjectNameService.selectArchiveProjectNameList(archiveProjectName);
ExcelUtil<ArchiveProjectName> util = new ExcelUtil<ArchiveProjectName>(ArchiveProjectName.class);
- util.exportExcel(response, list, "銆愯濉啓鍔熻兘鍚嶇О銆戞暟鎹�");
+ util.exportExcel(response, list, "銆愭浠堕」鐩俊鎭�戞暟鎹�");
}
/**
- * 鑾峰彇銆愯濉啓鍔熻兘鍚嶇О銆戣缁嗕俊鎭�
+ * 鑾峰彇銆愭浠堕」鐩俊鎭�戣缁嗕俊鎭�
*/
@PreAuthorize("@ss.hasPermi('system:projectName:query')")
@GetMapping(value = "/{id}")
@@ -81,10 +82,10 @@
}
/**
- * 鏂板銆愯濉啓鍔熻兘鍚嶇О銆�
+ * 鏂板銆愭浠堕」鐩俊鎭��
*/
@PreAuthorize("@ss.hasPermi('system:projectName:add')")
- @Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.INSERT)
+ @Log(title = "銆愭浠堕」鐩俊鎭��", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody ArchiveProjectName archiveProjectName)
{
@@ -93,10 +94,10 @@
}
/**
- * 淇敼銆愯濉啓鍔熻兘鍚嶇О銆�
+ * 淇敼銆愭浠堕」鐩俊鎭��
*/
@PreAuthorize("@ss.hasPermi('system:projectName:edit')")
- @Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.UPDATE)
+ @Log(title = "銆愭浠堕」鐩俊鎭��", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody ArchiveProjectName archiveProjectName)
{
@@ -104,13 +105,27 @@
}
/**
- * 鍒犻櫎銆愯濉啓鍔熻兘鍚嶇О銆�
+ * 鍒犻櫎銆愭浠堕」鐩俊鎭��
*/
@PreAuthorize("@ss.hasPermi('system:projectName:remove')")
- @Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.DELETE)
+ @Log(title = "銆愭浠堕」鐩俊鎭��", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(archiveProjectNameService.deleteArchiveProjectNameByIds(ids));
}
+ @PostMapping("/model")
+ public void getExportModel(HttpServletResponse response){
+ List<ArchiveProjectName> list = Collections.singletonList(new ArchiveProjectName());
+ ExcelUtil<ArchiveProjectName> util = new ExcelUtil<>(ArchiveProjectName.class);
+ util.exportExcel(response,list,"妗堝嵎椤圭洰瀵煎叆妯℃澘");
+ }
+
+ @Log(title = "妗ｆ绫诲埆璁板綍瀵煎叆", businessType = BusinessType.IMPORT)
+ @PostMapping("/importData")
+ public AjaxResult importData(@RequestParam("file") MultipartFile file) throws Exception
+ {
+ System.out.println(file);
+ return archiveProjectNameService.importExcel(file);
+ }
}
--
Gitblit v1.9.1