From 6c8427bd89dbfaeaf94d71514b16eb756774b46f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Sun, 23 Oct 2022 18:48:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8E=A5=E5=8F=A3=EF=BC=9A?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=BD=93=E5=89=8D=E7=94=A8=E6=88=B7=E7=9A=84?= =?UTF-8?q?=E4=BB=B7=E6=A0=BC=E5=B1=8F=E8=94=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsh/erp/controller/RoleController.java | 3 --- .../jsh/erp/controller/UserController.java | 22 +++++++++++++++++++ .../com/jsh/erp/service/role/RoleService.java | 5 +++++ 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/RoleController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/RoleController.java index 5ae067cd..eac6e17f 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/controller/RoleController.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/RoleController.java @@ -2,11 +2,8 @@ package com.jsh.erp.controller; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.jsh.erp.constants.ExceptionConstants; import com.jsh.erp.datasource.entities.Role; -import com.jsh.erp.exception.BusinessRunTimeException; import com.jsh.erp.service.role.RoleService; -import com.jsh.erp.service.user.UserService; import com.jsh.erp.service.userBusiness.UserBusinessService; import com.jsh.erp.utils.ErpInfo; import io.swagger.annotations.Api; diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/UserController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/UserController.java index 2bac706e..68103f5e 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/controller/UserController.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/UserController.java @@ -13,6 +13,7 @@ import com.jsh.erp.datasource.vo.TreeNodeEx; import com.jsh.erp.exception.BusinessParamCheckingException; import com.jsh.erp.service.log.LogService; import com.jsh.erp.service.redis.RedisService; +import com.jsh.erp.service.role.RoleService; import com.jsh.erp.service.tenant.TenantService; import com.jsh.erp.service.user.UserService; import com.jsh.erp.utils.*; @@ -51,6 +52,9 @@ public class UserController { @Resource private UserService userService; + @Resource + private RoleService roleService; + @Resource private TenantService tenantService; @@ -382,6 +386,24 @@ public class UserController { return arr; } + @GetMapping(value = "/getCurrentPriceLimit") + @ApiOperation(value = "查询当前用户的价格屏蔽") + public BaseResponseInfo getCurrentPriceLimit(HttpServletRequest request)throws Exception { + BaseResponseInfo res = new BaseResponseInfo(); + try { + Map data = new HashMap<>(); + String priceLimit = roleService.getCurrentPriceLimit(request); + data.put("priceLimit", priceLimit); + res.code = 200; + res.data = data; + } catch(Exception e){ + e.printStackTrace(); + res.code = 500; + res.data = "获取session失败"; + } + return res; + } + /** * 获取当前用户的角色类型 * @param request diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/role/RoleService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/role/RoleService.java index 15b30f67..20a112e0 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/role/RoleService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/role/RoleService.java @@ -240,4 +240,9 @@ public class RoleService { } return price; } + + public String getCurrentPriceLimit(HttpServletRequest request) throws Exception { + Long userId = userService.getUserId(request); + return userService.getRoleTypeByUserId(userId).getPriceLimit(); + } }