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/LocAreaMatRelaController.java | 108 +++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 87 insertions(+), 21 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaMatRelaController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaMatRelaController.java
index be23646..8d0bebc 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaMatRelaController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaMatRelaController.java
@@ -13,14 +13,16 @@
import com.vincent.rsf.server.manager.controller.params.LocAreaMatsParam;
import com.vincent.rsf.server.manager.entity.LocAreaMatRela;
import com.vincent.rsf.server.manager.service.LocAreaMatRelaService;
+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;
+import org.apache.commons.lang3.StringUtils;
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(tags = "搴撳尯鐗╂枡鍏崇郴缁戝畾")
@@ -35,39 +37,39 @@
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<LocAreaMatRela, BaseParam> pageParam = new PageParam<>(baseParam, LocAreaMatRela.class);
- return R.ok().add(locAreaMatRelaService.page(pageParam, pageParam.buildWrapper(true)));
+ PageParam<LocAreaMatRela, BaseParam> page = locAreaMatRelaService.page(pageParam, pageParam.buildWrapper(true));
+ return R.ok().add(buildPageRowsUtils.rowsMap(page));
}
@PreAuthorize("hasAuthority('manager:locAreaMatRela:list')")
@PostMapping("/locAreaMatRela/list")
public R list(@RequestBody Map<String, Object> map) {
- return R.ok().add(locAreaMatRelaService.list());
+ return R.ok().add(buildPageRowsUtils.rowsMap(locAreaMatRelaService.list()));
}
@PreAuthorize("hasAuthority('manager:locAreaMatRela:list')")
@PostMapping({"/locAreaMatRela/many/{ids}", "/locAreaMatRelas/many/{ids}"})
public R many(@PathVariable Long[] ids) {
- return R.ok().add(locAreaMatRelaService.listByIds(Arrays.asList(ids)));
+ return R.ok().add(buildPageRowsUtils.rowsMap(locAreaMatRelaService.listByIds(Arrays.asList(ids))));
}
@PreAuthorize("hasAuthority('manager:locAreaMatRela:list')")
@GetMapping("/locAreaMatRela/{id}")
public R get(@PathVariable("id") Long id) {
- return R.ok().add(locAreaMatRelaService.getById(id));
+ return R.ok().add(buildPageRowsUtils.rowsMap(locAreaMatRelaService.getById(id)));
}
@PreAuthorize("hasAuthority('manager:locAreaMatRela:save')")
@OperationLog("Create loc areas mats rela")
@PostMapping("/locAreaMatRela/save")
public R save(@RequestBody LocAreaMatRela locAreaMatRela) {
+
locAreaMatRela.setCreateBy(getLoginUserId());
- locAreaMatRela.setCreateTime(new Date());
locAreaMatRela.setUpdateBy(getLoginUserId());
- locAreaMatRela.setUpdateTime(new Date());
if (!locAreaMatRelaService.save(locAreaMatRela)) {
return R.error("Save Fail");
}
- return R.ok("Save Success").add(locAreaMatRela);
+ return R.ok("Save Success").add(buildPageRowsUtils.rowsMap(locAreaMatRela));
}
@PreAuthorize("hasAuthority('manager:locAreaMatRela:update')")
@@ -79,17 +81,60 @@
if (!locAreaMatRelaService.updateById(locAreaMatRela)) {
return R.error("Update Fail");
}
- return R.ok("Update Success").add(locAreaMatRela);
+ return R.ok("Update Success").add(buildPageRowsUtils.rowsMap(locAreaMatRela));
}
- @PreAuthorize("hasAuthority('manager:locAreaMatRela:remove')")
+ @ApiOperation("鍒犻櫎鐗╂枡鍒嗙粍")
+ @GetMapping("/locAreaMatRela/group")
+ @PreAuthorize("hasAuthority('manager:locAreaMatRela:update')")
+ public R remByGroup(@RequestBody Map<String, Object> map) {
+ if (Objects.isNull(map)) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ if (!StringUtils.isBlank(map.get("groupId").toString())) {
+ throw new CoolException("搴撲綅绫诲瀷涓嶈兘涓虹┖锛侊紒");
+ }
+ if (!StringUtils.isBlank(map.get("areaMatId").toString())) {
+ throw new CoolException("涓诲崟ID涓嶈兘涓虹┖锛侊紒");
+ }
+ if (locAreaMatRelaService.removeByGroupId(map)) {
+ return R.ok();
+ } else {
+ return R.error("鍒犻櫎澶辫触锛侊紒");
+ }
+ }
+
+ @ApiOperation("鍒犻櫎搴撲綅绫诲瀷")
+ @GetMapping("/locAreaMatRela/locType/remove")
+ @PreAuthorize("hasAuthority('manager:locAreaMatRela:update')")
+ public R removByLocType(@RequestBody Map<String, Object> param) {
+ if (Objects.isNull(param)) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒锛�");
+ }
+ if (!StringUtils.isBlank(param.get("typeId").toString())) {
+ throw new CoolException("搴撲綅绫诲瀷涓嶈兘涓虹┖锛侊紒");
+ }
+ if (!StringUtils.isBlank(param.get("areaMatId").toString())) {
+ throw new CoolException("涓诲崟ID涓嶈兘涓虹┖锛侊紒");
+ }
+ if (locAreaMatRelaService.removeByLocType(param)) {
+ return R.ok();
+ } else {
+ return R.ok("鍒犻櫎澶辫触锛侊紒");
+ }
+ }
+
+ @PreAuthorize("hasAuthority('manager:locAreaMatRela:list')")
@OperationLog("Delete loc areas mats rela")
@PostMapping("/locAreaMatRela/remove/{ids}")
public R remove(@PathVariable Long[] ids) {
+ if (Objects.isNull(ids)) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
if (!locAreaMatRelaService.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:locAreaMatRela:list')")
@@ -103,13 +148,34 @@
locAreaMatRelaService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
item -> vos.add(new KeyValVo(item.getId(), item.getAreaId()))
);
- return R.ok().add(vos);
+ return R.ok().add(buildPageRowsUtils.rowsMap(vos));
}
+
+ @PreAuthorize("hasAuthority('manager:locAreaMatRela:list')")
+ @ApiOperation("鑾峰彇搴撳尯鐗╂枡鍒嗙粍")
+ @GetMapping("/locAreaMatRela/groups/{id}")
+ public R getAreaMatGroup(@PathVariable Long id) {
+ if (Objects.isNull(id)) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return R.ok(locAreaMatRelaService.getAllGroups(id));
+ }
+
+ @PreAuthorize("hasAuthority('manager:locAreaMatRela:list')")
+ @ApiOperation("鑾峰彇搴撳尯搴撲綅绫诲瀷")
+ @GetMapping("/locAreaMatRela/locType/{id}")
+ public R getAreaMatLocType(@PathVariable Long id) {
+ if (Objects.isNull(id)) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return R.ok(locAreaMatRelaService.getAllLocType(id));
+ }
+
@PreAuthorize("hasAuthority('manager:locAreaMatRela:list')")
@PostMapping("/locAreaMatRela/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ExcelUtil.build(ExcelUtil.create(locAreaMatRelaService.list(), LocAreaMatRela.class), response);
+ ExcelUtil.build(ExcelUtil.create(buildPageRowsUtils.rowsMap(locAreaMatRelaService.list()), LocAreaMatRela.class), response);
}
@PreAuthorize("hasAuthority('manager:locAreaMatRela:update')")
@@ -119,14 +185,14 @@
if (Objects.isNull(param)) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- if (Objects.isNull(param.getAreaId())) {
- throw new CoolException("搴撳尯涓嶈兘涓虹┖锛侊紒");
- }
- if (param.getLocId().isEmpty() || param.getTypeId().isEmpty()) {
- throw new CoolException("搴撲綅绫诲瀷鎴栧簱浣嶄笉鑳戒负绌猴紒锛�");
- }
- if (Objects.isNull(param.getGroupId()) || param.getMatnrId().isEmpty()) {
- throw new CoolException("鐗╂枡鎴栫墿鏂欏垎绫讳笉鑳戒负绌猴紒锛�");
+// if (Objects.isNull(param.getAreaId())) {
+// throw new CoolException("搴撳尯涓嶈兘涓虹┖锛侊紒");
+// }
+// if (Objects.isNull(param.getWarehouseId())) {
+// throw new CoolException("浠撳簱涓嶈兘涓虹┖锛侊紒");
+// }
+ if (Objects.isNull(param.getAreaMatId())) {
+ throw new CoolException("涓诲崟ID涓嶈兘涓虹┖锛侊紒");
}
return locAreaMatRelaService.binMatnrs(param);
}
--
Gitblit v1.9.1