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/LocPreviewController.java | 51 +++++++++++++++++++++++++++------------------------
1 files changed, 27 insertions(+), 24 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocPreviewController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocPreviewController.java
index f9d4673..1d1cb88 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocPreviewController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocPreviewController.java
@@ -10,11 +10,12 @@
import com.vincent.rsf.server.common.domain.KeyValVo;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.common.utils.ExcelUtil;
-import com.vincent.rsf.server.manager.controller.params.LocMastInitParam;
+import com.vincent.rsf.server.common.utils.OptimisticLockUtils;
import com.vincent.rsf.server.manager.controller.params.LocModifyParams;
import com.vincent.rsf.server.manager.entity.Loc;
import com.vincent.rsf.server.manager.enums.LocStsType;
import com.vincent.rsf.server.manager.service.LocService;
+import com.vincent.rsf.server.manager.utils.buildPageRowsUtils;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -24,8 +25,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
import java.util.stream.Collectors;
@@ -38,7 +38,7 @@
private LocService locService;
@PreAuthorize("hasAuthority('manager:locPreview:list')")
- @PostMapping("/loc/preview/page")
+ @PostMapping("/locPreview/page")
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<Loc, BaseParam> pageParam = new PageParam<>(baseParam, Loc.class);
@@ -46,20 +46,22 @@
list.add("row");
list.add("col");
list.add("lev");
- return R.ok().add(locService.page(pageParam, pageParam.buildWrapper(true,list)));
+ PageParam<Loc, BaseParam> page = locService.page(pageParam, pageParam.buildWrapper(true, list));
+ return R.ok().add(buildPageRowsUtils.rowsMap(page));
}
@PreAuthorize("hasAuthority('manager:locPreview:list')")
- @PostMapping("/loc/preview/list")
+ @PostMapping("/locPreview/list")
public R list(@RequestBody Map<String, Object> map) {
- return R.ok().add(locService.list());
+ return R.ok().add(buildPageRowsUtils.rowsMap(locService.list()));
}
@PreAuthorize("hasAuthority('manager:locPreview:list')")
- @PostMapping("/loc/preview/areaNoUse/list")
+ @PostMapping("/locPreview/areaNoUse/list")
public R areaNoUselist(@RequestBody Map<String, Object> map) {
String locCode = map.get("locCode").toString();
- Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, locCode),false);
+ Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, locCode)
+ .last("LIMIT 1"));
List<Loc> list = locService.list(new LambdaQueryWrapper<Loc>()
.eq(Loc::getAreaId, loc.getAreaId())
.eq(Loc::getChannel,loc.getChannel())
@@ -70,20 +72,20 @@
}
@PreAuthorize("hasAuthority('manager:locPreview:list')")
- @PostMapping({"/loc/preview/many/{ids}", "/loc/preview/many/{ids}"})
+ @PostMapping({"/locPreview/many/{ids}", "/locPreview/many/{ids}"})
public R many(@PathVariable Long[] ids) {
- return R.ok().add(locService.listByIds(Arrays.asList(ids)));
+ return R.ok().add(buildPageRowsUtils.rowsMap(locService.listByIds(Arrays.asList(ids))));
}
@PreAuthorize("hasAuthority('manager:locPreview:list')")
- @GetMapping("/loc/preview/{id}")
+ @GetMapping("/locPreview/{id}")
public R get(@PathVariable("id") Long id) {
- return R.ok().add(locService.getById(id));
+ return R.ok().add(buildPageRowsUtils.rowsMap(locService.getById(id)));
}
@PreAuthorize("hasAuthority('manager:locPreview:save')")
@OperationLog("Create 搴撲綅淇℃伅琛�")
- @PostMapping("/loc/preview/save")
+ @PostMapping("/locPreview/save")
public R save(@RequestBody Loc loc) {
if (Objects.isNull(loc.getWarehouseId())) {
throw new CoolException("浠撳簱ID涓嶈兘涓虹┖锛侊紒");
@@ -105,14 +107,15 @@
if (!locService.saveType(loc)) {
throw new CoolException("搴撲綅绫诲瀷鍏宠仈鍏崇郴淇濆瓨澶辫触锛侊紒");
}
- return R.ok("Save Success").add(loc);
+ return R.ok("Save Success").add(buildPageRowsUtils.rowsMap(loc));
}
@PreAuthorize("hasAuthority('manager:locPreview:update')")
@OperationLog("Update 搴撲綅淇℃伅琛�")
- @PostMapping("/loc/preview/update")
+ @PostMapping("/locPreview/update")
@Transactional(rollbackFor = Exception.class)
public R update(@RequestBody Loc loc) {
+ OptimisticLockUtils.requireVersion("搴撲綅", loc.getVersion());
loc.setUpdateBy(getLoginUserId());
String join = StringUtils.join(loc.getTypeIds(), ",");
loc.setType(join);
@@ -125,21 +128,21 @@
if (!locService.updateLoc(loc)) {
throw new CoolException("搴撲綅绫诲瀷鍏宠仈鍏崇郴淇敼澶辫触!锛�");
}
- return R.ok("Update Success").add(loc);
+ return R.ok("Update Success").add(buildPageRowsUtils.rowsMap(loc));
}
@PreAuthorize("hasAuthority('manager:locPreview:remove')")
@OperationLog("Delete 搴撲綅淇℃伅琛�")
- @PostMapping("/loc/preview/remove/{ids}")
+ @PostMapping("/locPreview/remove/{ids}")
public R remove(@PathVariable Long[] ids) {
if (!locService.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:locPreview:list')")
- @PostMapping("/loc/preview/query")
+ @PostMapping("/locPreview/query")
public R query(@RequestParam(required = false) String condition) {
List<KeyValVo> vos = new ArrayList<>();
LambdaQueryWrapper<Loc> wrapper = new LambdaQueryWrapper<>();
@@ -149,12 +152,12 @@
locService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
item -> vos.add(new KeyValVo(item.getId(), item.getCode()))
);
- return R.ok().add(vos);
+ return R.ok().add(buildPageRowsUtils.rowsMap(vos));
}
@PreAuthorize("hasAuthority('manager:locPreview:list')")
@ApiOperation("搴撲綅瀵煎嚭")
- @PostMapping("/loc/preview/export")
+ @PostMapping("/locPreview/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
List<Loc> locs = new ArrayList<>();
if (Objects.isNull(map.get("ids"))) {
@@ -162,12 +165,12 @@
} else {
locs = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getStatus, 1));
}
- ExcelUtil.build(ExcelUtil.create(locs, Loc.class), response);
+ ExcelUtil.build(ExcelUtil.create(buildPageRowsUtils.rowsMap(locs), Loc.class), response);
}
@PreAuthorize("hasAuthority('manager:locPreview:update')")
@ApiOperation("搴撲綅鎵归噺淇敼")
- @PostMapping("/loc/preview/modify")
+ @PostMapping("/locPreview/modify")
public R batchUpdate(@RequestBody LocModifyParams locs) {
if (Objects.isNull(locs)) {
throw new CoolException("鍙備负涓嶈兘涓虹┖锛侊紒");
--
Gitblit v1.9.1