From af2f1450e22d4b65e0013733e08025cdcd075b31 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期三, 23 四月 2025 18:20:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsStandardProcessController.java | 46 ++++++++++++++++++++++++++++++++++++++++------
1 files changed, 40 insertions(+), 6 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsStandardProcessController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsStandardProcessController.java
index b9fd515..412a4f3 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsStandardProcessController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsStandardProcessController.java
@@ -9,9 +9,12 @@
import com.aps.common.security.annotation.RequiresPermissions;
import com.aps.core.domain.ApsStandardProcess;
import com.aps.core.service.IApsStandardProcessService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import java.util.List;
@@ -22,6 +25,8 @@
* @date 2025-04-23
*/
+
+@Tag(name = "鏍囧噯宸ュ簭", description = "鏍囧噯宸ュ簭鎺ュ彛")
@RestController
@RequestMapping("/standardProcess")
public class ApsStandardProcessController extends BaseController
@@ -32,7 +37,9 @@
/**
* 鏌ヨ鏍囧噯宸ュ簭鍒楄〃
*/
- @RequiresPermissions("core:standardProcess:list")
+
+ @Operation(summary = "鏌ヨ鏍囧噯宸ュ簭鍒楄〃", description = "鍒嗛〉鏌ヨ")
+ @RequiresPermissions("aps:standardProcess:list")
@GetMapping("/list")
public TableDataInfo list(ApsStandardProcess apsStandardProcess)
{
@@ -44,7 +51,8 @@
/**
* 瀵煎嚭鏍囧噯宸ュ簭鍒楄〃
*/
- @RequiresPermissions("core:standardProcess:export")
+ @Operation(summary = "瀵煎嚭鏍囧噯宸ュ簭鍒楄〃", description = "瀵煎嚭Excel")
+ @RequiresPermissions("aps:standardProcess:export")
@Log(title = "鏍囧噯宸ュ簭", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, ApsStandardProcess apsStandardProcess)
@@ -57,7 +65,8 @@
/**
* 鑾峰彇鏍囧噯宸ュ簭璇︾粏淇℃伅
*/
- @RequiresPermissions("core:standardProcess:query")
+ @Operation(summary = "鑾峰彇鏍囧噯宸ュ簭璇︾粏淇℃伅", description = "鏍规嵁id鑾峰彇")
+ @RequiresPermissions("aps:standardProcess:query")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
@@ -67,7 +76,8 @@
/**
* 鏂板鏍囧噯宸ュ簭
*/
- @RequiresPermissions("core:standardProcess:add")
+ @Operation(summary = "鏂板鏍囧噯宸ュ簭", description = "鍗曚釜澧炲姞")
+ @RequiresPermissions("aps:standardProcess:add")
@Log(title = "鏍囧噯宸ュ簭", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody ApsStandardProcess apsStandardProcess)
@@ -78,7 +88,8 @@
/**
* 淇敼鏍囧噯宸ュ簭
*/
- @RequiresPermissions("core:standardProcess:edit")
+ @Operation(summary = "淇敼鏍囧噯宸ュ簭", description = "鍗曚釜淇敼")
+ @RequiresPermissions("aps:standardProcess:edit")
@Log(title = "鏍囧噯宸ュ簭", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody ApsStandardProcess apsStandardProcess)
@@ -89,11 +100,34 @@
/**
* 鍒犻櫎鏍囧噯宸ュ簭
*/
- @RequiresPermissions("core:standardProcess:remove")
+ @Operation(summary = "鍒犻櫎鏍囧噯宸ュ簭", description = "鎵归噺鍒犻櫎")
+ @RequiresPermissions("aps:standardProcess:remove")
@Log(title = "鏍囧噯宸ュ簭", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(apsStandardProcessService.deleteApsStandardProcessByIds(ids));
}
+
+ /**
+ * 瀵煎叆鏍囧噯宸ュ簭鏁版嵁
+ */
+ @Operation(summary = "瀵煎叆鏍囧噯宸ュ簭鏁版嵁", description = "澧為噺瀵煎叆")
+ @RequiresPermissions("aps:standardProcess:importData")
+ @PostMapping("/importData")
+ public AjaxResult importData(MultipartFile file) throws Exception {
+ ExcelUtil<ApsStandardProcess> util = new ExcelUtil<>(ApsStandardProcess.class);
+ List<ApsStandardProcess> tempList = util.importExcel(file.getInputStream());
+ //鍒ゆ柇瀵煎叆鏁版嵁鏄惁涓虹┖
+ if (!tempList.isEmpty()) {
+ Boolean res = apsStandardProcessService.importData(tempList);
+ if(res){
+ return AjaxResult.success("瀵煎叆鎴愬姛锛�");
+ }else{
+ return AjaxResult.error("瀵煎叆澶辫触锛�");
+ }
+ } else {
+ return AjaxResult.error("妯℃澘鍐呭涓虹┖");
+ }
+ }
}
--
Gitblit v1.9.3