From 831b13fee1bd510ea53758727d873ae0222c0e29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Fri, 30 Apr 2021 17:48:40 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E5=AE=A2=E6=88=B7=E5=92=8C=E4=BB=93?= =?UTF-8?q?=E5=BA=93=E5=A2=9E=E5=8A=A0=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsh/erp/controller/DepotController.java | 28 ++++++++++++------- .../erp/controller/SupplierController.java | 8 +++--- .../controller/SystemConfigController.java | 23 +++++++++++++++ 3 files changed, 45 insertions(+), 14 deletions(-) diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotController.java index 11f6d87c..780698fe 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotController.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotController.java @@ -10,6 +10,7 @@ import com.jsh.erp.exception.BusinessRunTimeException; import com.jsh.erp.service.depot.DepotService; import com.jsh.erp.service.material.MaterialService; import com.jsh.erp.service.systemConfig.SystemConfigService; +import com.jsh.erp.service.user.UserService; import com.jsh.erp.service.userBusiness.UserBusinessService; import com.jsh.erp.utils.*; import org.slf4j.Logger; @@ -36,6 +37,9 @@ public class DepotController { @Resource private DepotService depotService; + @Resource + private UserService userService; + @Resource private UserBusinessService userBusinessService; @@ -113,18 +117,18 @@ public class DepotController { } /** - * 获取用户拥有权限的仓库列表 - * @param type - * @param keyId + * 获取当前用户拥有权限的仓库列表 * @param request * @return * @throws Exception */ - @GetMapping(value = "/findDepotByUserId") - public JSONArray findDepotByUserId(@RequestParam("UBType") String type, @RequestParam("UBKeyId") String keyId, - HttpServletRequest request) throws Exception{ - JSONArray arr = new JSONArray(); + @GetMapping(value = "/findDepotByCurrentUser") + public BaseResponseInfo findDepotByCurrentUser(HttpServletRequest request) throws Exception{ + BaseResponseInfo res = new BaseResponseInfo(); try { + JSONArray arr = new JSONArray(); + String type = "UserDepot"; + Long userId = userService.getUserId(request); List dataList = depotService.findUserDepot(); //开始拼接json数据 if (null != dataList) { @@ -134,9 +138,9 @@ public class DepotController { //勾选判断1 Boolean flag = false; try { - flag = userBusinessService.checkIsUserBusinessExist(type, keyId, "[" + depot.getId().toString() + "]"); + flag = userBusinessService.checkIsUserBusinessExist(type, userId.toString(), "[" + depot.getId().toString() + "]"); } catch (DataAccessException e) { - logger.error(">>>>>>>>>>>>>>>>>查询用户对应的仓库：类型" + type + " KeyId为： " + keyId + " 存在异常！"); + logger.error(">>>>>>>>>>>>>>>>>查询用户对应的仓库：类型" + type + " KeyId为： " + userId + " 存在异常！"); } if (!depotFlag || flag) { item.put("id", depot.getId()); @@ -145,10 +149,14 @@ public class DepotController { } } } + res.code = 200; + res.data = arr; } catch (Exception e) { e.printStackTrace(); + res.code = 500; + res.data = "获取数据失败"; } - return arr; + return res; } @PostMapping(value = "/updateIsDefault") diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/SupplierController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/SupplierController.java index 5797a3fa..598dba7b 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/controller/SupplierController.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/SupplierController.java @@ -78,11 +78,11 @@ public class SupplierController { * @return */ @PostMapping(value = "/findBySelect_cus") - public JSONArray findBySelectCus(@RequestParam(value = "UBType", required = false) String ubType, - @RequestParam(value = "UBKeyId", required = false) String ubKeyId, - HttpServletRequest request) { + public JSONArray findBySelectCus(HttpServletRequest request) { JSONArray arr = new JSONArray(); try { + String type = "UserCustomer"; + Long userId = userService.getUserId(request); List supplierList = supplierService.findBySelectCus(); JSONArray dataArray = new JSONArray(); if (null != supplierList) { @@ -92,7 +92,7 @@ public class SupplierController { //勾选判断1 Boolean flag = false; try { - flag = userBusinessService.checkIsUserBusinessExist(ubType, ubKeyId, "[" + supplier.getId().toString() + "]"); + flag = userBusinessService.checkIsUserBusinessExist(type, userId.toString(), "[" + supplier.getId().toString() + "]"); } catch (DataAccessException e) { logger.error(">>>>>>>>>>>>>>>>>查询用户对应的客户：存在异常！"); } diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/SystemConfigController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/SystemConfigController.java index fd5ee177..ed2475c9 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/controller/SystemConfigController.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/SystemConfigController.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.jsh.erp.constants.ExceptionConstants; import com.jsh.erp.datasource.entities.Depot; +import com.jsh.erp.datasource.entities.SystemConfig; import com.jsh.erp.exception.BusinessRunTimeException; import com.jsh.erp.service.depot.DepotService; import com.jsh.erp.service.systemConfig.SystemConfigService; @@ -84,4 +85,26 @@ public class SystemConfigController { } return res; } + + /** + * 获取当前租户的配置信息 + * @param request + * @return + */ + @GetMapping(value = "/getCurrentInfo") + public BaseResponseInfo getCurrentInfo(HttpServletRequest request) throws Exception { + BaseResponseInfo res = new BaseResponseInfo(); + try{ + List list = systemConfigService.getSystemConfig(); + if(list.size()>0) { + res.code = 200; + res.data = list.get(0); + } + } catch(Exception e){ + e.printStackTrace(); + res.code = 500; + res.data = "获取数据失败"; + } + return res; + } }