From 1dcfa3702505f0c431757312b5304531029f90f6 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 09 四月 2026 18:57:38 +0800
Subject: [PATCH] #getter$摘出entity
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocReviseController.java | 32 +++++++++++++++++++-------------
1 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocReviseController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocReviseController.java
index 4c6f0b6..8bd89f6 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocReviseController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocReviseController.java
@@ -10,14 +10,20 @@
import com.vincent.rsf.server.common.domain.KeyValVo;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.manager.entity.LocRevise;
+import com.vincent.rsf.server.manager.entity.WarehouseAreas;
import com.vincent.rsf.server.manager.service.LocReviseService;
+import com.vincent.rsf.server.manager.service.WarehouseAreasService;
+import com.vincent.rsf.server.manager.service.impl.WarehouseAreasServiceImpl;
+import com.vincent.rsf.server.system.constant.SerialRuleCode;
+import com.vincent.rsf.server.manager.utils.buildPageRowsUtils;
import com.vincent.rsf.server.system.controller.BaseController;
+import com.vincent.rsf.server.system.utils.SerialRuleUtils;
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.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@Api("搴撳瓨璋冩暣鍗�")
@@ -27,30 +33,32 @@
@Autowired
private LocReviseService locReviseService;
+
@PreAuthorize("hasAuthority('manager:locRevise:list')")
@PostMapping("/locRevise/page")
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<LocRevise, BaseParam> pageParam = new PageParam<>(baseParam, LocRevise.class);
- return R.ok().add(locReviseService.page(pageParam, pageParam.buildWrapper(true)));
+ PageParam<LocRevise, BaseParam> page = locReviseService.page(pageParam, pageParam.buildWrapper(true));
+ return R.ok().add(buildPageRowsUtils.rowsMap(page));
}
@PreAuthorize("hasAuthority('manager:locRevise:list')")
@PostMapping("/locRevise/list")
public R list(@RequestBody Map<String, Object> map) {
- return R.ok().add(locReviseService.list());
+ return R.ok().add(buildPageRowsUtils.rowsMap(locReviseService.list()));
}
@PreAuthorize("hasAuthority('manager:locRevise:list')")
@PostMapping({"/locRevise/many/{ids}", "/locRevises/many/{ids}"})
public R many(@PathVariable Long[] ids) {
- return R.ok().add(locReviseService.listByIds(Arrays.asList(ids)));
+ return R.ok().add(buildPageRowsUtils.rowsMap(locReviseService.listByIds(Arrays.asList(ids))));
}
@PreAuthorize("hasAuthority('manager:locRevise:list')")
@GetMapping("/locRevise/{id}")
public R get(@PathVariable("id") Long id) {
- return R.ok().add(locReviseService.getById(id));
+ return R.ok().add(buildPageRowsUtils.rowsMap(locReviseService.getById(id)));
}
@PreAuthorize("hasAuthority('manager:locRevise:save')")
@@ -61,10 +69,8 @@
locRevise.setCreateTime(new Date());
locRevise.setUpdateBy(getLoginUserId());
locRevise.setUpdateTime(new Date());
- if (!locReviseService.save(locRevise)) {
- return R.error("Save Fail");
- }
- return R.ok("Save Success").add(locRevise);
+
+ return R.ok("Save Success").add(buildPageRowsUtils.rowsMap(locReviseService.saveRevise(locRevise)));
}
@PreAuthorize("hasAuthority('manager:locRevise:update')")
@@ -76,7 +82,7 @@
if (!locReviseService.updateById(locRevise)) {
return R.error("Update Fail");
}
- return R.ok("Update Success").add(locRevise);
+ return R.ok("Update Success").add(buildPageRowsUtils.rowsMap(locRevise));
}
@PreAuthorize("hasAuthority('manager:locRevise:remove')")
@@ -86,7 +92,7 @@
if (!locReviseService.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:locRevise:list')")
@@ -100,13 +106,13 @@
locReviseService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
item -> vos.add(new KeyValVo(item.getId(), item.getId()))
);
- return R.ok().add(vos);
+ return R.ok().add(buildPageRowsUtils.rowsMap(vos));
}
@PreAuthorize("hasAuthority('manager:locRevise:list')")
@PostMapping("/locRevise/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ExcelUtil.build(ExcelUtil.create(locReviseService.list(), LocRevise.class), response);
+ ExcelUtil.build(ExcelUtil.create(buildPageRowsUtils.rowsMap(locReviseService.list()), LocRevise.class), response);
}
}
--
Gitblit v1.9.1