From b051c20595c8563df49a50092a11468c8a99de46 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 20 三月 2025 14:20:58 +0800
Subject: [PATCH] # 优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java | 76 +++++++++++++++++++++++++++++++++++---
1 files changed, 70 insertions(+), 6 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 8f63e5b..7600aae 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
@@ -1,24 +1,36 @@
package com.vincent.rsf.server.manager.controller;
+import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
+import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.common.utils.ExcelUtil;
import com.vincent.rsf.server.common.annotation.OperationLog;
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.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.service.LocService;
import com.vincent.rsf.server.system.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+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 javax.validation.Valid;
+import javax.validation.constraints.NotNull;
import java.util.*;
+
+@Api(tags = "搴撲綅淇℃伅")
@RestController
public class LocController extends BaseController {
@@ -55,12 +67,26 @@
@OperationLog("Create 搴撲綅淇℃伅琛�")
@PostMapping("/loc/save")
public R save(@RequestBody Loc loc) {
+ if (Objects.isNull(loc.getWarehouseId())) {
+ throw new CoolException("浠撳簱ID涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(loc.getAreaId())) {
+ throw new CoolException("浠撳簱ID涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(loc.getTypeIds())) {
+ throw new CoolException("搴撲綅绫诲瀷涓嶈兘涓虹┖锛侊紒");
+ }
+ String join = StringUtils.join(loc.getTypeIds(), ",");
+ loc.setType(join);
+
loc.setCreateBy(getLoginUserId());
- loc.setCreateTime(new Date());
loc.setUpdateBy(getLoginUserId());
- loc.setUpdateTime(new Date());
if (!locService.save(loc)) {
return R.error("Save Fail");
+ }
+
+ if (!locService.saveType(loc)) {
+ throw new CoolException("搴撲綅绫诲瀷鍏宠仈鍏崇郴淇濆瓨澶辫触锛侊紒");
}
return R.ok("Save Success").add(loc);
}
@@ -70,9 +96,16 @@
@PostMapping("/loc/update")
public R update(@RequestBody Loc loc) {
loc.setUpdateBy(getLoginUserId());
- loc.setUpdateTime(new Date());
+
+ String join = StringUtils.join(loc.getTypeIds(), ",");
+ loc.setType(join);
+
if (!locService.updateById(loc)) {
return R.error("Update Fail");
+ }
+
+ if (!locService.updateLoc(loc)) {
+ throw new CoolException("搴撲綅绫诲瀷鍏宠仈鍏崇郴淇敼澶辫触锛侊紒");
}
return R.ok("Update Success").add(loc);
}
@@ -93,18 +126,49 @@
List<KeyValVo> vos = new ArrayList<>();
LambdaQueryWrapper<Loc> wrapper = new LambdaQueryWrapper<>();
if (!Cools.isEmpty(condition)) {
- wrapper.like(Loc::getName, condition);
+ wrapper.like(Loc::getCode, condition);
}
locService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
- item -> vos.add(new KeyValVo(item.getId(), item.getName()))
+ item -> vos.add(new KeyValVo(item.getId(), item.getCode()))
);
return R.ok().add(vos);
}
@PreAuthorize("hasAuthority('manager:loc:list')")
+ @ApiOperation("搴撲綅瀵煎嚭")
@PostMapping("/loc/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ExcelUtil.build(ExcelUtil.create(locService.list(), Loc.class), response);
+ List<Loc> locs = new ArrayList<>();
+ if (Objects.isNull(map.get("ids"))) {
+ locs = locService.list();
+ } else {
+ locs = locService.list(new LambdaQueryWrapper<Loc>().in(Loc::getId , map.get("ids")).eq(Loc::getStatus, 1));
+ }
+ ExcelUtil.build(ExcelUtil.create(locs, Loc.class), response);
+ }
+
+ @PreAuthorize("hasAuthority('manager:loc:update')")
+ @ApiOperation("搴撲綅鎵归噺淇敼")
+ @PostMapping("/loc/modify")
+ public R batchUpdate(@RequestBody LocModifyParams locs) {
+ if (Objects.isNull(locs)) {
+ throw new CoolException("鍙備负涓嶈兘涓虹┖锛侊紒");
+ }
+ return locService.modifyLocs(locs);
+ }
+
+
+ @PreAuthorize("hasAuthority('manager:loc:update')")
+ @ApiOperation("搴撲綅鍒濆鍖�")
+ @PostMapping("/loc/init")
+ public R initLocInfo(@Valid @RequestBody LocMastInitParam param) {
+ if (Objects.isNull(param)) {
+ throw new CoolException("鍒濆鍖栦俊鎭笉鑳戒负绌猴紒锛�");
+ }
+ if (Objects.isNull(param.getAreaId())) {
+ throw new CoolException("搴撳尯ID涓嶈兘涓虹┖锛侊紒");
+ }
+ return locService.initLocs(param);
}
}
--
Gitblit v1.9.1