From e98e114ff8765ca1ffbd6dda167e35d18b72f5d4 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 24 三月 2025 16:34:07 +0800
Subject: [PATCH] 代码优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaMatRelaController.java | 82 ++++++++++++++++++++++++++++++++++++----
1 files changed, 73 insertions(+), 9 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 9c60d37..cd7a388 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
@@ -16,6 +16,7 @@
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.*;
@@ -60,10 +61,9 @@
@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");
}
@@ -82,10 +82,53 @@
return R.ok("Update Success").add(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("locTypeId").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");
}
@@ -107,6 +150,27 @@
}
@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);
@@ -122,12 +186,12 @@
if (Objects.isNull(param.getAreaId())) {
throw new CoolException("搴撳尯涓嶈兘涓虹┖锛侊紒");
}
-// if (Objects.isNull(param.getTypeId()) || Objects.isNull(param.getLocId()) || param.getLocId().isEmpty() || param.getTypeId().isEmpty()) {
-// throw new CoolException("搴撲綅绫诲瀷鎴栧簱浣嶄笉鑳戒负绌猴紒锛�");
-// }
-// if (Objects.isNull(param.getGroupId()) || Objects.isNull(param.getMatnrId()) || param.getMatnrId().isEmpty()) {
-// 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