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 | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 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 5c18563..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,10 +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.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;
@@ -44,13 +46,14 @@
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("/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')")
@@ -71,13 +74,13 @@
@PreAuthorize("hasAuthority('manager:locPreview:list')")
@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("/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')")
@@ -104,7 +107,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:locPreview:update')")
@@ -112,6 +115,7 @@
@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);
@@ -124,7 +128,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:locPreview:remove')")
@@ -134,7 +138,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:locPreview:list')")
@@ -148,7 +152,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:locPreview:list')")
@@ -161,7 +165,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:locPreview:update')")
--
Gitblit v1.9.1