From 691bee4229856f8bf81c2720092ecee1c9f21509 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 09 四月 2026 19:18:12 +0800
Subject: [PATCH] #getter$摘出entity
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrGroupController.java | 47 ++++++++++++++++++++++++-----------------------
1 files changed, 24 insertions(+), 23 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrGroupController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrGroupController.java
index e65f062..50af40c 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrGroupController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrGroupController.java
@@ -15,6 +15,7 @@
import com.vincent.rsf.server.manager.entity.MatnrGroup;
import com.vincent.rsf.server.manager.entity.Warehouse;
import com.vincent.rsf.server.manager.service.MatnrGroupService;
+import com.vincent.rsf.server.manager.utils.buildPageRowsUtils;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.Api;
import org.apache.commons.lang3.StringUtils;
@@ -22,7 +23,7 @@
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.*;
import java.util.stream.Collectors;
@@ -39,25 +40,26 @@
BaseParam baseParam = buildParam(map, BaseParam.class);
baseParam.setOrderBy("code asc");
PageParam<MatnrGroup, BaseParam> pageParam = new PageParam<>(baseParam, MatnrGroup.class);
- return R.ok().add(matnrGroupService.page(pageParam, pageParam.buildWrapper(true)));
+ PageParam<MatnrGroup, BaseParam> page = matnrGroupService.page(pageParam, pageParam.buildWrapper(true));
+ return R.ok().add(buildPageRowsUtils.rowsMap(page));
}
@PreAuthorize("hasAuthority('manager:matnrGroup:list')")
@PostMapping("/matnrGroup/list")
public R list(@RequestBody Map<String, Object> map) {
- return R.ok().add(matnrGroupService.list());
+ return R.ok().add(buildPageRowsUtils.rowsMap(matnrGroupService.list()));
}
@PreAuthorize("hasAuthority('manager:matnrGroup:list')")
@PostMapping({"/matnrGroup/many/{ids}", "/matnrGroups/many/{ids}"})
public R many(@PathVariable Long[] ids) {
- return R.ok().add(matnrGroupService.listByIds(Arrays.asList(ids)));
+ return R.ok().add(buildPageRowsUtils.rowsMap(matnrGroupService.listByIds(Arrays.asList(ids))));
}
@PreAuthorize("hasAuthority('manager:matnrGroup:list')")
@GetMapping("/matnrGroup/{id}")
public R get(@PathVariable("id") Long id) {
- return R.ok().add(matnrGroupService.getById(id));
+ return R.ok().add(buildPageRowsUtils.rowsMap(matnrGroupService.getById(id)));
}
@PreAuthorize("hasAuthority('manager:matnrGroup:save')")
@@ -65,13 +67,14 @@
@PostMapping("/matnrGroup/save")
public R save(@RequestBody MatnrGroup matnrGroup) {
if (Objects.isNull(matnrGroup)) {
- throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
+
if (Objects.isNull(matnrGroup.getName())) {
- throw new CoolException("鍒嗙粍鍚嶇О涓嶈兘涓虹┖锛侊紒");
+ return R.error("鍒嗙粍鍚嶇О涓嶈兘涓虹┖锛侊紒");
}
if (Objects.isNull(matnrGroup.getCode())) {
- throw new CoolException("鍒嗙粍缂栫爜涓嶈兘涓虹┖锛侊紒");
+ return R.error("鍒嗙粍缂栫爜涓嶈兘涓虹┖锛侊紒");
}
matnrGroup.setCreateBy(getLoginUserId());
matnrGroup.setUpdateBy(getLoginUserId());
@@ -80,12 +83,12 @@
.eq(!Objects.isNull(matnrGroup.getParCode()), MatnrGroup::getParCode, matnrGroup.getParCode())
.eq(MatnrGroup::getCode, matnrGroup.getCode()));
if (!list.isEmpty()) {
- throw new CoolException("鐗╂枡鍒嗙粍缂栫爜涓嶈兘閲嶅锛侊紒");
+ return R.error("鐗╂枡鍒嗙粍缂栫爜涓嶈兘閲嶅锛侊紒");
}
List<MatnrGroup> groups = matnrGroupService.list(new LambdaQueryWrapper<MatnrGroup>()
.eq(MatnrGroup::getName, matnrGroup.getName()));
if (!groups.isEmpty()) {
- throw new CoolException("鍒嗙粍宸插瓨鍦紝璇峰嬁閲嶅娣诲姞锛侊紒");
+ return R.error("鍒嗙粍宸插瓨鍦紝璇峰嬁閲嶅娣诲姞锛侊紒");
}
//鍒ゆ柇涓婄骇缂栫爜鏄惁涓虹┖
if (!Objects.isNull(matnrGroup.getParCode()) && !StringUtils.isBlank(matnrGroup.getParCode())) {
@@ -94,7 +97,7 @@
if (!matnrGroupService.save(matnrGroup)) {
return R.error("Save Fail");
}
- return R.ok("Save Success").add(matnrGroup);
+ return R.ok("Save Success").add(buildPageRowsUtils.rowsMap(matnrGroup));
}
@PreAuthorize("hasAuthority('manager:matnrGroup:update')")
@@ -104,10 +107,13 @@
matnrGroup.setUpdateBy(getLoginUserId());
MatnrGroup matGroup = matnrGroupService.getById(matnrGroup.getId());
+ if (Objects.isNull(matGroup)) {
+ return R.error("鐗╂枡鍒嗙粍涓嶅瓨鍦紒锛�");
+ }
if (!matnrGroup.getName().equals(matGroup.getName())) {
List<MatnrGroup> areasList = matnrGroupService.list(new LambdaQueryWrapper<MatnrGroup>().eq(MatnrGroup::getName, matnrGroup.getName()));
if (!areasList.isEmpty()) {
- throw new CoolException("浠撳簱鍚嶅凡瀛樺湪锛侊紒");
+ return R.error("浠撳簱鍚嶅凡瀛樺湪锛侊紒");
}
}
if (!Objects.isNull(matnrGroup.getCode()) && !matnrGroup.getCode().equals(matGroup.getCode())) {
@@ -115,19 +121,14 @@
.eq(!Objects.isNull(matnrGroup.getParCode()), MatnrGroup::getParCode, matnrGroup.getParCode())
.eq(MatnrGroup::getCode, matnrGroup.getCode()));
if (!areasList.isEmpty()) {
- throw new CoolException("浠撳簱缂栫爜宸插瓨鍦紒锛�");
+ return R.error("浠撳簱缂栫爜宸插瓨鍦紒锛�");
}
- }
-
- //鍒ゆ柇涓婄骇缂栫爜鏄惁涓虹┖
- if (!Objects.isNull(matnrGroup.getParCode()) && !StringUtils.isBlank(matnrGroup.getParCode())) {
- matnrGroup.setCode(matnrGroup.getParCode() + matnrGroup.getCode());
}
if (!matnrGroupService.updateById(matnrGroup)) {
return R.error("Update Fail");
}
- return R.ok("Update Success").add(matnrGroup);
+ return R.ok("Update Success").add(buildPageRowsUtils.rowsMap(matnrGroup));
}
@PreAuthorize("hasAuthority('manager:matnrGroup:remove')")
@@ -137,7 +138,7 @@
if (!matnrGroupService.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:matnrGroup:list')")
@@ -151,7 +152,7 @@
matnrGroupService.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:matnrGroup:list')")
@@ -162,14 +163,14 @@
}
List<MatnrGroup> matnrs = matnrGroupService.getTreeData(map);
- return R.ok().add(matnrs);
+ return R.ok().add(buildPageRowsUtils.rowsMap(matnrs));
}
@PreAuthorize("hasAuthority('manager:matnrGroup:list')")
@PostMapping("/matnrGroup/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ExcelUtil.build(ExcelUtil.create(matnrGroupService.list(), MatnrGroup.class), response);
+ ExcelUtil.build(ExcelUtil.create(buildPageRowsUtils.rowsMap(matnrGroupService.list()), MatnrGroup.class), response);
}
}
--
Gitblit v1.9.1