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 | 57 +++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 37 insertions(+), 20 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 3ff82a0..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,27 +1,32 @@
package com.consum.base.controller;
-import com.consum.base.BaseController;
-import com.consum.base.core.utils.CommonUtil;
-import com.consum.base.pojo.request.WarehouseManagerParam;
-import com.consum.base.service.BaseWarehouseManagerServiceImpl;
-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.ApiOperation;
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>
+ * <p>
*/
@Api(value = "搴撶鍛�", tags = "搴撶鍛�")
@RestController
@@ -29,7 +34,7 @@
public class BaseWarehouseManagerController extends BaseController {
@Autowired
- private BaseWarehouseManagerServiceImpl baseWarehouseManagerService;
+ private BaseWarehouseManagerService baseWarehouseManagerService;
/**
* @Description 鏂板
@@ -37,7 +42,8 @@
* @Date 2023/10/26
*/
@ApiOperation(value = "鏂板", notes = "鏂板")
- @ApiImplicitParam(name = "warehouseManagerParam", value = "搴撶鍛樹俊鎭�", required = true, dataType = "WarehouseManagerParam", paramType = "body")
+ @ApiImplicitParam(name = "warehouseManagerParam", value = "搴撶鍛樹俊鎭�", required = true,
+ dataType = "WarehouseManagerParam", paramType = "body")
@PostMapping("/save")
public ResponseValue add() throws Exception {
WarehouseManagerParam param = CommonUtil.getObjFromReqBody(WarehouseManagerParam.class);
@@ -49,20 +55,31 @@
if (sysInfo == null) {
return ResponseValue.error("璇峰厛鐧诲綍");
}
- this.baseWarehouseManagerService.add(param);
+ 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 = "鏌ヨ", notes = "鏌ヨ")
+ @ApiOperation(value = "鏍规嵁浠撳簱id鏌ヨ搴撶鍛�", notes = "鏍规嵁浠撳簱id鏌ヨ搴撶鍛�")
@ApiImplicitParam(name = "warehouseId", value = "浠撳簱id", required = true, dataType = "Long")
@GetMapping("/list")
public ResponseValue select(Long warehouseId) {
- BaseWarehouseManager baseWarehouseManager = new BaseWarehouseManager();
- baseWarehouseManager.setBaseWarehouseId(warehouseId);
- List<BaseWarehouseManager> select = this.baseWarehouseManagerService.select(baseWarehouseManager);
- return ResponseValue.success(select);
+ 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