From cb703ae5b5afdd4a7d614a948ee4d4c457b77185 Mon Sep 17 00:00:00 2001
From: fei <791364011@qq.com>
Date: 星期三, 21 一月 2026 09:07:42 +0800
Subject: [PATCH] 增加了签名和注解接口
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiveSignatureController.java | 54 ++++++++++++++++++++++++++++++++++++------------------
1 files changed, 36 insertions(+), 18 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiveSignatureController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiveSignatureController.java
index c4f2f81..bc8dec4 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiveSignatureController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiveSignatureController.java
@@ -1,23 +1,18 @@
package com.ruoyi.web.controller.archive;
+import java.util.ArrayList;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.domain.ArchiveAnnotation;
import com.ruoyi.domain.ArchiveSignature;
import com.ruoyi.service.IArchiveSignatureService;
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;
@@ -25,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 2026-01-19
@@ -43,7 +39,7 @@
private IArchiveSignatureService archiveSignatureService;
/**
- * 鏌ヨ銆愯濉啓鍔熻兘鍚嶇О銆戝垪琛�
+ * 鏌ヨ绛惧悕鍒楄〃
*/
@PreAuthorize("@ss.hasPermi('system:signature:list')")
@GetMapping("/list")
@@ -55,22 +51,44 @@
// return archiveCategoryService.selectDataList(archiveCategory, pageNum, pageSize);
}
-
+ @PreAuthorize("@ss.hasPermi('system:signature:edit')")
+ @Log(title = "绛惧悕璁板綍瀵煎叆", businessType = BusinessType.IMPORT)
+ @PostMapping("/importData")
+ public AjaxResult importData(@RequestParam("excelImport") MultipartFile file) throws Exception {
+ return archiveSignatureService.importExcel(file);
+ }
+ @PreAuthorize("@ss.hasPermi('system:signature:list')")
+ @GetMapping("/listAll")
+ public AjaxResult selectAllSignature(ArchiveSignature archiveSignature)
+ {
+ List<ArchiveSignature> list = archiveSignatureService.selectArchiveSignatureList(archiveSignature);
+ return new AjaxResult(200, "",list);
+ }
/**
- * 瀵煎嚭銆愯濉啓鍔熻兘鍚嶇О銆戝垪琛�
+ * 瀵煎嚭绛惧悕鍒楄〃
*/
@PreAuthorize("@ss.hasPermi('system:signature:export')")
@Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, ArchiveSignature archiveSignature)
+ public void export(HttpServletResponse response, ArchiveSignature archiveSignature, @RequestParam(value = "ids", required = false) Long[] ids)
{
- List<ArchiveSignature> list = archiveSignatureService.selectArchiveSignatureList(archiveSignature);
+
+
+ List<ArchiveSignature> list = new ArrayList<>();
+ // 濡傛灉鎻愪緵浜唅ds鍙傛暟锛屽垯鏍规嵁ids瀵煎嚭鎸囧畾璁板綍
+ if (ids != null && ids.length > 0) {
+ list = archiveSignatureService.selectArchiveSignatureByIds(ids);
+ } else {
+ // 鍚﹀垯鏍规嵁鏌ヨ鏉′欢瀵煎嚭
+ list = archiveSignatureService.selectArchiveSignatureList(archiveSignature);
+ }
+
ExcelUtil<ArchiveSignature> util = new ExcelUtil<ArchiveSignature>(ArchiveSignature.class);
util.exportExcel(response, list, "銆愯濉啓鍔熻兘鍚嶇О銆戞暟鎹�");
}
/**
- * 鑾峰彇銆愯濉啓鍔熻兘鍚嶇О銆戣缁嗕俊鎭�
+ * 鑾峰彇绛惧悕璇︾粏淇℃伅
*/
@PreAuthorize("@ss.hasPermi('system:signature:query')")
@GetMapping(value = "/{id}")
@@ -80,7 +98,7 @@
}
/**
- * 鏂板銆愯濉啓鍔熻兘鍚嶇О銆�
+ * 鏂板绛惧悕
*/
@PreAuthorize("@ss.hasPermi('system:signature:add')")
@Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.INSERT)
@@ -91,7 +109,7 @@
}
/**
- * 淇敼銆愯濉啓鍔熻兘鍚嶇О銆�
+ * 淇敼绛惧悕
*/
@PreAuthorize("@ss.hasPermi('system:signature:edit')")
@Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.UPDATE)
@@ -102,7 +120,7 @@
}
/**
- * 鍒犻櫎銆愯濉啓鍔熻兘鍚嶇О銆�
+ * 鍒犻櫎绛惧悕
*/
@PreAuthorize("@ss.hasPermi('system:signature:remove')")
@Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.DELETE)
--
Gitblit v1.9.1