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/LocController.java | 30 +++++++++++++++++-------------
1 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java
index 70342d6..8982b26 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java
@@ -10,12 +10,14 @@
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.common.utils.OptimisticLockUtils;
import com.vincent.rsf.server.manager.controller.params.LocMastInitParam;
import com.vincent.rsf.server.manager.controller.params.LocModifyParams;
import com.vincent.rsf.server.manager.entity.Loc;
import com.vincent.rsf.server.manager.enums.CommonStatus;
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;
@@ -47,20 +49,21 @@
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:loc:list')")
@PostMapping("/loc/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:loc:list')")
@ApiOperation(("鑾峰彇搴撲綅浣跨敤鐜�"))
@PostMapping("/loc/pie/list")
public R locPie() {
- return R.ok().add(locService.getLocPies());
+ return R.ok().add(buildPageRowsUtils.rowsMap(locService.getLocPies()));
}
@PreAuthorize("hasAuthority('manager:loc:list')")
@@ -89,14 +92,14 @@
Page<String> emptyPage = new Page<>(current, pageSize);
emptyPage.setRecords(Collections.emptyList());
emptyPage.setTotal(0L);
- return R.ok().add(emptyPage);
+ return R.ok().add(buildPageRowsUtils.rowsMap(emptyPage));
}
Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, locCode).last("LIMIT 1"));
if (loc == null) {
Page<String> emptyPage = new Page<>(current, pageSize);
emptyPage.setRecords(Collections.emptyList());
emptyPage.setTotal(0L);
- return R.ok().add(emptyPage);
+ return R.ok().add(buildPageRowsUtils.rowsMap(emptyPage));
}
String q = map.get("q") != null ? String.valueOf(map.get("q")).trim() : null;
if (StringUtils.isBlank(q) && map.get("condition") != null) {
@@ -116,19 +119,19 @@
Page<String> pageOut = new Page<>(current, pageSize);
pageOut.setRecords(records);
pageOut.setTotal(result.getTotal());
- return R.ok().add(pageOut);
+ return R.ok().add(buildPageRowsUtils.rowsMap(pageOut));
}
@PreAuthorize("hasAuthority('manager:loc:list')")
@PostMapping({"/loc/many/{ids}", "/locs/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:loc:list')")
@GetMapping("/loc/{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:loc:save')")
@@ -156,7 +159,7 @@
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:loc:update')")
@@ -164,6 +167,7 @@
@PostMapping("/loc/update")
@Transactional(rollbackFor = Exception.class)
public R update(@RequestBody Loc loc) {
+ OptimisticLockUtils.requireVersion("搴撲綅", loc.getVersion());
loc.setUpdateBy(getLoginUserId());
String join = StringUtils.join(loc.getTypeIds(), ",");
if (!Objects.isNull(loc.getTypeIds())) {
@@ -183,7 +187,7 @@
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:loc:remove')")
@@ -193,7 +197,7 @@
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:loc:list')")
@@ -207,7 +211,7 @@
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:loc:list')")
@@ -220,7 +224,7 @@
} 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:loc:update')")
--
Gitblit v1.9.1