From add402ec68d150cd8b13c231ce991cf49889259c Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期二, 21 十月 2025 14:03:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop_whxrwms' into devlop_whxrwms

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/ReviseLogItemController.java |   35 ++++++++++++++++++++++++++---------
 1 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/ReviseLogItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/ReviseLogItemController.java
index 606d4a6..a14eab1 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/ReviseLogItemController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/ReviseLogItemController.java
@@ -4,14 +4,17 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.vincent.rsf.framework.common.Cools;
 import com.vincent.rsf.framework.common.R;
+import com.vincent.rsf.framework.exception.CoolException;
 import com.vincent.rsf.server.common.utils.ExcelUtil;
 import com.vincent.rsf.server.common.annotation.OperationLog;
 import com.vincent.rsf.server.common.domain.BaseParam;
 import com.vincent.rsf.server.common.domain.KeyValVo;
 import com.vincent.rsf.server.common.domain.PageParam;
+import com.vincent.rsf.server.manager.controller.params.ReviseLogItemParams;
 import com.vincent.rsf.server.manager.entity.ReviseLogItem;
 import com.vincent.rsf.server.manager.service.ReviseLogItemService;
 import com.vincent.rsf.server.system.controller.BaseController;
+import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -19,13 +22,14 @@
 import javax.servlet.http.HttpServletResponse;
 import java.util.*;
 
+@Api("搴撳瓨璋冩暣鍘嗗彶")
 @RestController
 public class ReviseLogItemController extends BaseController {
 
     @Autowired
     private ReviseLogItemService reviseLogItemService;
 
-    @PreAuthorize("hasAuthority('manager:reviseLogItem:list')")
+    @PreAuthorize("hasAuthority('manager:locRevise:list')")
     @PostMapping("/reviseLogItem/page")
     public R page(@RequestBody Map<String, Object> map) {
         BaseParam baseParam = buildParam(map, BaseParam.class);
@@ -33,25 +37,25 @@
         return R.ok().add(reviseLogItemService.page(pageParam, pageParam.buildWrapper(true)));
     }
 
-    @PreAuthorize("hasAuthority('manager:reviseLogItem:list')")
+    @PreAuthorize("hasAuthority('manager:locRevise:list')")
     @PostMapping("/reviseLogItem/list")
     public R list(@RequestBody Map<String, Object> map) {
         return R.ok().add(reviseLogItemService.list());
     }
 
-    @PreAuthorize("hasAuthority('manager:reviseLogItem:list')")
+    @PreAuthorize("hasAuthority('manager:locRevise:list')")
     @PostMapping({"/reviseLogItem/many/{ids}", "/reviseLogItems/many/{ids}"})
     public R many(@PathVariable Long[] ids) {
         return R.ok().add(reviseLogItemService.listByIds(Arrays.asList(ids)));
     }
 
-    @PreAuthorize("hasAuthority('manager:reviseLogItem:list')")
+    @PreAuthorize("hasAuthority('manager:locRevise:list')")
     @GetMapping("/reviseLogItem/{id}")
     public R get(@PathVariable("id") Long id) {
         return R.ok().add(reviseLogItemService.getById(id));
     }
 
-    @PreAuthorize("hasAuthority('manager:reviseLogItem:save')")
+    @PreAuthorize("hasAuthority('manager:locRevise:save')")
     @OperationLog("Create 搴撲綅璋冩暣鍘嗗彶")
     @PostMapping("/reviseLogItem/save")
     public R save(@RequestBody ReviseLogItem reviseLogItem) {
@@ -65,7 +69,20 @@
         return R.ok("Save Success").add(reviseLogItem);
     }
 
-    @PreAuthorize("hasAuthority('manager:reviseLogItem:update')")
+    @PreAuthorize("hasAuthority('manager:locRevise:save')")
+    @OperationLog("Create 搴撲綅璋冩暣鍘嗗彶")
+    @PostMapping("/reviseLogItem/items/save")
+    public R itemSave(@RequestBody ReviseLogItemParams reviseLogItem) {
+        if (Objects.isNull(reviseLogItem.getReviseLogId())) {
+            throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+        }
+        if (Objects.isNull(reviseLogItem.getItems()) || reviseLogItem.getItems().isEmpty()) {
+            throw new CoolException("鏄庣粏鍙傛暟涓嶈兘涓虹┖锛侊紒");
+        }
+        return R.ok().add(reviseLogItemService.itemSave(reviseLogItem, getLoginUserId()));
+    }
+
+    @PreAuthorize("hasAuthority('manager:locRevise:update')")
     @OperationLog("Update 搴撲綅璋冩暣鍘嗗彶")
     @PostMapping("/reviseLogItem/update")
     public R update(@RequestBody ReviseLogItem reviseLogItem) {
@@ -77,7 +94,7 @@
         return R.ok("Update Success").add(reviseLogItem);
     }
 
-    @PreAuthorize("hasAuthority('manager:reviseLogItem:remove')")
+    @PreAuthorize("hasAuthority('manager:locRevise:remove')")
     @OperationLog("Delete 搴撲綅璋冩暣鍘嗗彶")
     @PostMapping("/reviseLogItem/remove/{ids}")
     public R remove(@PathVariable Long[] ids) {
@@ -87,7 +104,7 @@
         return R.ok("Delete Success").add(ids);
     }
 
-    @PreAuthorize("hasAuthority('manager:reviseLogItem:list')")
+    @PreAuthorize("hasAuthority('manager:locRevise:list')")
     @PostMapping("/reviseLogItem/query")
     public R query(@RequestParam(required = false) String condition) {
         List<KeyValVo> vos = new ArrayList<>();
@@ -101,7 +118,7 @@
         return R.ok().add(vos);
     }
 
-    @PreAuthorize("hasAuthority('manager:reviseLogItem:list')")
+    @PreAuthorize("hasAuthority('manager:locRevise:list')")
     @PostMapping("/reviseLogItem/export")
     public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
         ExcelUtil.build(ExcelUtil.create(reviseLogItemService.list(), ReviseLogItem.class), response);

--
Gitblit v1.9.1