From 029559f7cedded183bd1fbd09a5ebb576a9fa21d Mon Sep 17 00:00:00 2001
From: zhou zhou <zozhouo3o@gmail.com>
Date: 星期五, 17 四月 2026 12:34:23 +0800
Subject: [PATCH] #条码自定义

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocTypeController.java |   40 +++++++++++++++++++++-------------------
 1 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocTypeController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocTypeController.java
index b273c77..9830429 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocTypeController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocTypeController.java
@@ -13,6 +13,7 @@
 import com.vincent.rsf.server.manager.entity.LocType;
 import com.vincent.rsf.server.manager.entity.MatnrGroup;
 import com.vincent.rsf.server.manager.service.LocTypeService;
+import com.vincent.rsf.server.manager.utils.buildPageRowsUtils;
 import com.vincent.rsf.server.system.controller.BaseController;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,7 +21,7 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import java.util.*;
 
 @Api(tags = "搴撲綅绫诲瀷")
@@ -30,33 +31,34 @@
     @Autowired
     private LocTypeService locTypeService;
 
-    @PreAuthorize("hasAuthority('manager:locType:list')")
+    @PreAuthorize("hasAuthority('manager:loc:list')")
     @PostMapping("/locType/page")
     public R page(@RequestBody Map<String, Object> map) {
         BaseParam baseParam = buildParam(map, BaseParam.class);
         PageParam<LocType, BaseParam> pageParam = new PageParam<>(baseParam, LocType.class);
-        return R.ok().add(locTypeService.page(pageParam, pageParam.buildWrapper(true)));
+        PageParam<LocType, BaseParam> page = locTypeService.page(pageParam, pageParam.buildWrapper(true));
+        return R.ok().add(buildPageRowsUtils.rowsMap(page));
     }
 
-    @PreAuthorize("hasAuthority('manager:locType:list')")
+    @PreAuthorize("hasAuthority('manager:loc:list')")
     @PostMapping("/locType/list")
     public R list(@RequestBody Map<String, Object> map) {
-        return R.ok().add(locTypeService.list());
+        return R.ok().add(buildPageRowsUtils.rowsMap(locTypeService.list()));
     }
 
-    @PreAuthorize("hasAuthority('manager:locType:list')")
+    @PreAuthorize("hasAuthority('manager:loc:list')")
     @PostMapping({"/locType/many/{ids}", "/locTypes/many/{ids}"})
     public R many(@PathVariable Long[] ids) {
-        return R.ok().add(locTypeService.listByIds(Arrays.asList(ids)));
+        return R.ok().add(buildPageRowsUtils.rowsMap(locTypeService.listByIds(Arrays.asList(ids))));
     }
 
-    @PreAuthorize("hasAuthority('manager:locType:list')")
+    @PreAuthorize("hasAuthority('manager:loc:list')")
     @GetMapping("/locType/{id}")
     public R get(@PathVariable("id") Long id) {
-        return R.ok().add(locTypeService.getById(id));
+        return R.ok().add(buildPageRowsUtils.rowsMap(locTypeService.getById(id)));
     }
 
-    @PreAuthorize("hasAuthority('manager:locType:save')")
+    @PreAuthorize("hasAuthority('manager:loc:save')")
     @OperationLog("Create loc type")
     @PostMapping("/locType/save")
     public R save(@RequestBody LocType locType) {
@@ -86,10 +88,10 @@
         if (!locTypeService.save(locType)) {
             return R.error("Save Fail");
         }
-        return R.ok("Save Success").add(locType);
+        return R.ok("Save Success").add(buildPageRowsUtils.rowsMap(locType));
     }
 
-    @PreAuthorize("hasAuthority('manager:locType:update')")
+    @PreAuthorize("hasAuthority('manager:loc:update')")
     @OperationLog("Update loc type")
     @PostMapping("/locType/update")
     @Transactional(rollbackFor = Exception.class)
@@ -121,20 +123,20 @@
         if (!locTypeService.updateById(locType)) {
             return R.error("Update Fail");
         }
-        return R.ok("Update Success").add(locType);
+        return R.ok("Update Success").add(buildPageRowsUtils.rowsMap(locType));
     }
 
-    @PreAuthorize("hasAuthority('manager:locType:remove')")
+    @PreAuthorize("hasAuthority('manager:loc:remove')")
     @OperationLog("Delete loc type")
     @PostMapping("/locType/remove/{ids}")
     public R remove(@PathVariable Long[] ids) {
         if (!locTypeService.removeByIds(Arrays.asList(ids))) {
             return R.error("Delete Fail");
         }
-        return R.ok("Delete Success").add(ids);
+        return R.ok("Delete Success").add(buildPageRowsUtils.rowsMap(ids));
     }
 
-    @PreAuthorize("hasAuthority('manager:locType:list')")
+    @PreAuthorize("hasAuthority('manager:loc:list')")
     @PostMapping("/locType/query")
     public R query(@RequestParam(required = false) String condition) {
         List<KeyValVo> vos = new ArrayList<>();
@@ -145,13 +147,13 @@
         locTypeService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
                 item -> vos.add(new KeyValVo(item.getId(), item.getName()))
         );
-        return R.ok().add(vos);
+        return R.ok().add(buildPageRowsUtils.rowsMap(vos));
     }
 
-    @PreAuthorize("hasAuthority('manager:locType:list')")
+    @PreAuthorize("hasAuthority('manager:loc:list')")
     @PostMapping("/locType/export")
     public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
-        ExcelUtil.build(ExcelUtil.create(locTypeService.list(), LocType.class), response);
+        ExcelUtil.build(ExcelUtil.create(buildPageRowsUtils.rowsMap(locTypeService.list()), LocType.class), response);
     }
 
 }

--
Gitblit v1.9.1