From 84682eef9ff055aab6900744d462223881909fc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Mon, 31 May 2021 23:38:51 +0800 Subject: [PATCH] =?UTF-8?q?redis=E8=B0=83=E7=94=A8=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jsh/erp/controller/DepotHeadController.java | 4 ++-- .../com/jsh/erp/controller/DepotItemController.java | 10 +++++----- .../com/jsh/erp/controller/MaterialController.java | 2 +- .../java/com/jsh/erp/controller/UserController.java | 4 +++- .../jsh/erp/service/depotHead/DepotHeadService.java | 2 +- .../java/com/jsh/erp/service/redis/RedisService.java | 8 ++++++++ 6 files changed, 20 insertions(+), 10 deletions(-) diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotHeadController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotHeadController.java index 3d35d219..57be1ece 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotHeadController.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotHeadController.java @@ -325,7 +325,7 @@ public class DepotHeadController { String beanJson = body.getInfo(); String rows = body.getRows(); Long billsNumLimit = Long.parseLong(redisService.getObjectFromSessionByKey(request,"billsNumLimit").toString()); - Long tenantId = Long.parseLong(redisService.getObjectFromSessionByKey(request,"tenantId").toString()); + Long tenantId = redisService.getTenantId(request); Long count = depotHeadService.countDepotHead(null,null,null,null,null,null,null,null); if(count>= billsNumLimit) { throw new BusinessParamCheckingException(ExceptionConstants.DEPOT_HEAD_OVER_LIMIT_FAILED_CODE, @@ -345,7 +345,7 @@ public class DepotHeadController { */ @PutMapping(value = "/updateDepotHeadAndDetail") public Object updateDepotHeadAndDetail(@RequestBody DepotHeadVo4Body body, HttpServletRequest request) throws Exception{ - Long tenantId = Long.parseLong(redisService.getObjectFromSessionByKey(request,"tenantId").toString()); + Long tenantId = redisService.getTenantId(request); JSONObject result = ExceptionConstants.standardSuccess(); String beanJson = body.getInfo(); String rows = body.getRows(); diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java index fbc006bf..7508fcf3 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java @@ -120,7 +120,7 @@ public class DepotItemController { Map map = new HashMap(); try { BigDecimal stock = BigDecimal.ZERO; - Long tenantId = Long.parseLong(redisService.getObjectFromSessionByKey(request,"tenantId").toString()); + Long tenantId = redisService.getTenantId(request); List list = materialService.getMaterialByBarCode(barCode); if(list!=null && list.size()>0) { MaterialVo4Unit materialVo4Unit = list.get(0); @@ -154,7 +154,7 @@ public class DepotItemController { @RequestParam("mpList") String mpList, HttpServletRequest request)throws Exception { BaseResponseInfo res = new BaseResponseInfo(); - Long tenantId = Long.parseLong(redisService.getObjectFromSessionByKey(request,"tenantId").toString()); + Long tenantId = redisService.getTenantId(request); try { List dataList = new ArrayList(); if(headerId != 0) { @@ -264,7 +264,7 @@ public class DepotItemController { HttpServletRequest request)throws Exception { BaseResponseInfo res = new BaseResponseInfo(); Map map = new HashMap(); - Long tenantId = Long.parseLong(redisService.getObjectFromSessionByKey(request,"tenantId").toString()); + Long tenantId = redisService.getTenantId(request); String timeA = monthTime+"-01 00:00:00"; String timeB = Tools.lastDayOfMonth(monthTime)+" 23:59:59"; try { @@ -334,7 +334,7 @@ public class DepotItemController { @RequestParam("monthTime") String monthTime, @RequestParam("materialParam") String materialParam, HttpServletRequest request, HttpServletResponse response) throws Exception { - Long tenantId = Long.parseLong(redisService.getObjectFromSessionByKey(request,"tenantId").toString()); + Long tenantId = redisService.getTenantId(request); String timeA = monthTime+"-01 00:00:00"; String timeB = Tools.lastDayOfMonth(monthTime)+" 23:59:59"; try { @@ -384,7 +384,7 @@ public class DepotItemController { HttpServletRequest request) throws Exception{ BaseResponseInfo res = new BaseResponseInfo(); Map map = new HashMap(); - Long tenantId = Long.parseLong(redisService.getObjectFromSessionByKey(request,"tenantId").toString()); + Long tenantId = redisService.getTenantId(request); String endTime = Tools.lastDayOfMonth(monthTime)+" 23:59:59"; try { List dataList = depotItemService.findByAll(StringUtil.toNull(materialParam), diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java index ef40cb00..212305ce 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java @@ -166,7 +166,7 @@ public class MaterialController { HttpServletRequest request) throws Exception{ JSONObject object = new JSONObject(); try { - Long tenantId = Long.parseLong(redisService.getObjectFromSessionByKey(request,"tenantId").toString()); + Long tenantId = redisService.getTenantId(request); List dataList = materialService.findBySelectWithBarCode(categoryId, q, (currentPage-1)*pageSize, pageSize); String[] mpArr = mpList.split(","); int total = materialService.findBySelectWithBarCodeCount(categoryId, q); 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 159b83de..dd3b05aa 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 @@ -144,7 +144,9 @@ public class UserController { data.put("token", token); data.put("user", user); //用户的按钮权限 - data.put("userBtn", btnStrArr); + if(!"admin".equals(user.getLoginName())){ + data.put("userBtn", btnStrArr); + } data.put("roleType", roleType); } res.code = 200; diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java index 14cba6b2..45972f4d 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java @@ -252,7 +252,7 @@ public class DepotHeadService { //更新当前库存 List list = depotItemService.getListByHeaderId(id); for(DepotItem depotItem: list){ - Long tenantId = Long.parseLong(redisService.getObjectFromSessionByKey(request,"tenantId").toString()); + Long tenantId = redisService.getTenantId(request); depotItemService.updateCurrentStock(depotItem,tenantId); } }catch(Exception e){ diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/redis/RedisService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/redis/RedisService.java index a11bdd86..8062da70 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/redis/RedisService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/redis/RedisService.java @@ -95,4 +95,12 @@ public class RedisService { } } } + + public Long getTenantId(HttpServletRequest request) { + if(getObjectFromSessionByKey(request,"tenantId")!=null) { + return Long.parseLong(getObjectFromSessionByKey(request, "tenantId").toString()); + } else { + return null; + } + } }