From 186f6eb07df6934d2e28330ba39dcfce30c0063a Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期六, 09 十二月 2023 10:55:52 +0800
Subject: [PATCH] 修复库管员角色问题
---
consum-base/src/main/java/com/consum/base/controller/BaseWarehouseManagerController.java | 88 ++++++++++++++++++++++++++++++++------------
1 files changed, 64 insertions(+), 24 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/BaseWarehouseManagerController.java b/consum-base/src/main/java/com/consum/base/controller/BaseWarehouseManagerController.java
index e5021f9..88c1f20 100644
--- a/consum-base/src/main/java/com/consum/base/controller/BaseWarehouseManagerController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/BaseWarehouseManagerController.java
@@ -1,45 +1,85 @@
package com.consum.base.controller;
-import com.consum.base.BaseController;
-import com.consum.base.pojo.BaseCategoryParam;
-import com.consum.base.pojo.BaseWarehouseParam;
-import com.consum.base.service.BaseCategoryServiceImpl;
-import com.consum.base.service.BaseGoodsTemplateServiceImpl;
-import com.consum.base.service.BaseWarehouseManagerServiceImpl;
-import com.consum.model.po.BaseCategory;
-import com.consum.model.po.BaseWarehouseManager;
-import com.iplatform.model.po.S_user_core;
-import com.walker.db.page.GenericPager;
-import com.walker.infrastructure.utils.StringUtils;
-import com.walker.web.ResponseValue;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.*;
-
import java.util.List;
+import java.util.Set;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.consum.base.BaseController;
+import com.consum.base.core.utils.CommonUtil;
+import com.consum.base.pojo.request.WarehouseManagerParam;
+import com.consum.base.service.BaseWarehouseManagerService;
+import com.consum.model.po.BaseWarehouseManager;
+import com.consum.model.po.FinSysTenantUser;
+import com.walker.web.ResponseValue;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
/**
* @Description 搴撶鍛�
* @Author 鍗㈠簡闃�
* @Date 2023/10/26
+ * <p>
*/
+@Api(value = "搴撶鍛�", tags = "搴撶鍛�")
@RestController
@RequestMapping("/pc/base/warehouse/manager")
public class BaseWarehouseManagerController extends BaseController {
@Autowired
- private BaseWarehouseManagerServiceImpl baseWarehouseManagerService;
+ private BaseWarehouseManagerService baseWarehouseManagerService;
/**
* @Description 鏂板
* @Author 鍗㈠簡闃�
* @Date 2023/10/26
*/
- @PostMapping("/add")
- public ResponseValue add(@RequestBody BaseWarehouseManager baseWarehouseManager) {
- int result = this.baseWarehouseManagerService.add(baseWarehouseManager);
- if (result > 0) return ResponseValue.success(1);
- return ResponseValue.error("鏂板澶辫触锛�");
- }
-}
+ @ApiOperation(value = "鏂板", notes = "鏂板")
+ @ApiImplicitParam(name = "warehouseManagerParam", value = "搴撶鍛樹俊鎭�", required = true,
+ dataType = "WarehouseManagerParam", paramType = "body")
+ @PostMapping("/save")
+ public ResponseValue add() throws Exception {
+ WarehouseManagerParam param = CommonUtil.getObjFromReqBody(WarehouseManagerParam.class);
+ WarehouseManagerParam baseWarehouseParam = new WarehouseManagerParam();
+ CommonUtil.copyProperties(param, baseWarehouseParam);
+ param = baseWarehouseParam;
+ FinSysTenantUser sysInfo = this.getSysInfo();
+ if (sysInfo == null) {
+ return ResponseValue.error("璇峰厛鐧诲綍");
+ }
+ Set<Long> userIds = baseWarehouseManagerService.add(param);
+ for (Long userId : userIds) {
+ this.getFinSysTenantUserCache().remove(String.valueOf(userId));
+ this.getUserCacheProvider().removeUser(userId);
+ }
+ return ResponseValue.success();
+ }
+
+ @ApiOperation(value = "鏍规嵁浠撳簱id鏌ヨ搴撶鍛�", notes = "鏍规嵁浠撳簱id鏌ヨ搴撶鍛�")
+ @ApiImplicitParam(name = "warehouseId", value = "浠撳簱id", required = true, dataType = "Long")
+ @GetMapping("/list")
+ public ResponseValue select(Long warehouseId) {
+ List<BaseWarehouseManager> baseWarehouseManagerList =
+ baseWarehouseManagerService.selectWarehouseManager(warehouseId);
+ return ResponseValue.success(baseWarehouseManagerList);
+ }
+
+ @ApiOperation(value = "鏍规嵁浠撳簱,鏈烘瀯id鏌ヨ搴撶鍛�", notes = "鏍规嵁浠撳簱,鏈烘瀯id鏌ヨ搴撶鍛�")
+ @ApiImplicitParams({@ApiImplicitParam(name = "warehouseId", value = "浠撳簱id", required = true, dataType = "Long"),
+ @ApiImplicitParam(name = "agencyId", value = "鏈烘瀯id", required = true, dataType = "Long")})
+ @GetMapping("/query")
+ public ResponseValue selectManagerList(Long warehouseId, Long agencyId) {
+ List<BaseWarehouseManager> baseWarehouseManagerList =
+ baseWarehouseManagerService.selectManagerList(warehouseId, agencyId);
+ return ResponseValue.success(baseWarehouseManagerList);
+ }
+
+}
--
Gitblit v1.9.1