From d14792cac723257b9a997da58adb67733fdca5f6 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Wed, 30 Oct 2019 15:42:22 +0800 Subject: [PATCH] =?UTF-8?q?[PO][=E4=BF=AE=E6=94=B9]:=E9=9B=86=E5=9B=A2?= =?UTF-8?q?=E7=89=88=E9=A2=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/base/BaseController.java | 21 ++++++++++++++++++ .../controller/basic/WxBrandController.java | 4 ++-- .../iformall/controller/BaseController.java | 16 +++++++++++++- .../iformall/controller/BaseController.java | 19 +++++++++++++++- .../domain/po/base/BaseTenantEntity.java | 4 ++-- .../iformall/domain/po/base/TenantEntity.java | 4 ++-- .../domain/po/invest/InvestBaseEntity.java | 2 ++ .../controller/sys/SysMenuController.java | 22 +++++++++---------- 8 files changed, 73 insertions(+), 19 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java b/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java index 2767ffb3b..8f174cbe4 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java @@ -6,9 +6,11 @@ import java.text.SimpleDateFormat; import java.util.Date; import com.iformall.domain.po.MallUserInfo; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.shiro.UserSession; import com.iformall.utils.IPUtil; import org.apache.shiro.SecurityUtils; +import org.apache.shiro.session.Session; import org.springframework.web.bind.WebDataBinder; import org.springframework.web.bind.annotation.InitBinder; import org.springframework.web.bind.annotation.RestController; @@ -51,11 +53,30 @@ public class BaseController { return userId; } + @Deprecated public String getTenantId(){ String tenantId = (String)SecurityUtils.getSubject().getSession().getAttribute(UserSession.tenantId); return tenantId; } + /** + * 返回租户信息 + * @return + */ + public TenantEntity getTenantInfo(){ + Session session = SecurityUtils.getSubject().getSession(); + String tenantId = (String)session.getAttribute(UserSession.tenantId); + + TenantEntity tenantEntity = new TenantEntity(){{ + setTenantId(tenantId); + }}; + return tenantEntity; + } + + public void setTenantInfo(TenantEntity dest, TenantEntity source) { + dest.setTenantId(source.getTenantId()); + } + public String getIpAddr() { HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); String ipaddress = IPUtil.getIpAddr(request); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java index ca52a78f0..d8c1752e4 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java @@ -65,12 +65,12 @@ public class WxBrandController extends BaseController { @SystemControllerLog(description = "品牌-更新") public ResultData update(@RequestBody WxBrand wxBrand) { logger.debug("[" + getIpAddr() + "] WxBrandController::update"); - wxBrand.setTenantId(getTenantId()); + wxBrand.updateTenantInfo(getTenantInfo()); if(EnumDelFlag.YES.getCode().equals(wxBrand.getIsDel())){ //判断是否解绑商户 WxMerchant wxMerchant = new WxMerchant(); - wxMerchant.setTenantId(wxBrand.getTenantId()); + wxMerchant.updateTenantInfo(wxBrand); wxMerchant.setIsDel(0); wxMerchant.setBrand(wxBrand.getId()); List merchantList = wxMerchantService.findList(wxMerchant); diff --git a/mallinkBApi/src/main/java/com/iformall/controller/BaseController.java b/mallinkBApi/src/main/java/com/iformall/controller/BaseController.java index 4bd571436..c4927eb1c 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/BaseController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/BaseController.java @@ -2,6 +2,7 @@ package com.iformall.controller; import cn.binarywang.wx.miniapp.api.WxMaService; import com.iformall.common.ErrorCode; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.WxAppinfo; import com.iformall.domain.po.WxBuser; import com.iformall.domain.po.WxMerchantBUser; @@ -88,13 +89,26 @@ public class BaseController { return user; } - + @Deprecated public String getTenantId() { HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); String tenantId = (String) request.getAttribute(Constant.TENANT_ID); return tenantId; } + public TenantEntity getTenantInfo() { + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String tenantId = (String) request.getAttribute(Constant.TENANT_ID); + TenantEntity tenantEntity = new TenantEntity() {{ + setTenantId(tenantId); + }}; + return tenantEntity; + } + + public void setTenantInfo(TenantEntity dest, TenantEntity source) { + dest.setTenantId(source.getTenantId()); + } + public WxAppinfo getAppInfo(String appId) { return wxAppinfoService.getByAppId(appId); } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java b/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java index cfe444b2f..2a1153cf7 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java @@ -2,6 +2,7 @@ package com.iformall.controller; import cn.binarywang.wx.miniapp.api.WxMaService; import com.iformall.common.ErrorCode; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.WxAppinfo; import com.iformall.domain.po.WxCUser; import com.iformall.domain.po.WxCUserBasicInfo; @@ -68,12 +69,26 @@ public class BaseController { }); } + @Deprecated public String getTenantId() { HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); String tenantId = (String) request.getAttribute(Constant.TENANT_ID); return tenantId; } + public TenantEntity getTenantInfo() { + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String tenantId = (String) request.getAttribute(Constant.TENANT_ID); + TenantEntity tenantEntity = new TenantEntity() {{ + setTenantId(tenantId); + }}; + return tenantEntity; + } + + public void setTenantInfo(TenantEntity dest, TenantEntity source) { + dest.setTenantId(source.getTenantId()); + } + public Long getUserId() { HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); Long cUserId = (Long) request.getAttribute(Constant.LOGIN_USER_KEY); @@ -86,8 +101,10 @@ public class BaseController { public WxCUser getUser() { Long cUserId = getUserId(); WxCUser user = wxCUserService.getById(cUserId); - if (user == null) + if (user == null) { throw new MallinkException(ErrorCode.USER_IS_EMPTY); + } + user.updateTenantInfo(getTenantInfo()); return user; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/base/BaseTenantEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/base/BaseTenantEntity.java index 5bd778d7a..7ff55f22c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/base/BaseTenantEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/base/BaseTenantEntity.java @@ -13,11 +13,11 @@ public class BaseTenantEntity extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; - public void setTenantInfo(TenantEntity info) { + public void updateTenantInfo(TenantEntity info) { setTenantId(info.getTenantId()); } - public void setTenantInfo(BaseTenantEntity info) { + public void updateTenantInfo(BaseTenantEntity info) { setTenantId(info.getTenantId()); } } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java index 120b3285f..7e5e27b04 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java @@ -13,11 +13,11 @@ public class TenantEntity extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; - public void setTenantInfo(TenantEntity info) { + public void updateTenantInfo(TenantEntity info) { setTenantId(info.getTenantId()); } - public void setTenantInfo(BaseTenantEntity info) { + public void updateTenantInfo(BaseTenantEntity info) { setTenantId(info.getTenantId()); } } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/invest/InvestBaseEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/invest/InvestBaseEntity.java index 66433fa4c..b7c51e115 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/invest/InvestBaseEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/invest/InvestBaseEntity.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.*; import com.iformall.domain.po.base.TenantEntity; import lombok.Data; +import lombok.EqualsAndHashCode; import java.util.*; @@ -13,6 +14,7 @@ import java.util.*; * @date 2019/4/24 14:32 */ @Data +@EqualsAndHashCode(callSuper = true) public class InvestBaseEntity extends TenantEntity { public static final String COLUMN_TYPE = "json"; diff --git a/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java index 8c835b710..63c136265 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java @@ -183,7 +183,7 @@ public class SysMenuController extends BaseController { // 3.1 添加到mall_role_permission try { mallRolePermissionService.saveOrUpdate(new MallRolePermission(){{ - setTenantId(mallRole.getTenantId()); + updateTenantInfo(mallRole); setPermissionId(mp.getId()); setRoleId(mallRole.getId()); }}); @@ -234,7 +234,7 @@ public class SysMenuController extends BaseController { }}); for(MallRolePermission mallRolePermission: mallRolePermissions) { List mallRolePermissionList = mallRolePermissionService.getList(new MallRolePermission(){{ - setTenantId(mallRolePermission.getTenantId()); + updateTenantInfo(mallRolePermission); setRoleId(mallRolePermission.getRoleId()); setPermissionId(menuId_XiTong); }}); @@ -242,7 +242,7 @@ public class SysMenuController extends BaseController { // update 7L->50L try { mallRolePermissionService.saveOrUpdate(new MallRolePermission(){{ - setTenantId(mallRolePermission.getTenantId()); + updateTenantInfo(mallRolePermission); setId(mallRolePermission.getId()); setPermissionId(menuId_XiTong); setRoleId(mallRolePermission.getRoleId()); @@ -342,14 +342,14 @@ public class SysMenuController extends BaseController { }}); for(MallRolePermission mallRolePermission: mallRolePermissions) { List mallRolePermissionList = mallRolePermissionService.getList(new MallRolePermission(){{ - setTenantId(mallRolePermission.getTenantId()); + updateTenantInfo(mallRolePermission); setRoleId(mallRolePermission.getRoleId()); setPermissionId(menuId_Shop); }}); if (mallRolePermissionList.size() <= 0) { try { mallRolePermissionService.saveOrUpdate(new MallRolePermission(){{ - setTenantId(mallRolePermission.getTenantId()); + updateTenantInfo(mallRolePermission); setPermissionId(menuId_Shop); setRoleId(mallRolePermission.getRoleId()); }}); @@ -368,14 +368,14 @@ public class SysMenuController extends BaseController { }}); for(MallRolePermission mallRolePermission: mallRolePermissions) { List mallRolePermissionList = mallRolePermissionService.getList(new MallRolePermission(){{ - setTenantId(mallRolePermission.getTenantId()); + updateTenantInfo(mallRolePermission); setRoleId(mallRolePermission.getRoleId()); setPermissionId(menuId_Duojing); }}); if (mallRolePermissionList.size() <= 0) { try { mallRolePermissionService.saveOrUpdate(new MallRolePermission(){{ - setTenantId(mallRolePermission.getTenantId()); + updateTenantInfo(mallRolePermission); setPermissionId(menuId_Duojing); setRoleId(mallRolePermission.getRoleId()); }}); @@ -440,14 +440,14 @@ public class SysMenuController extends BaseController { }}); for(MallRolePermission mallRolePermission: mallRolePermissions) { List mallRolePermissionList = mallRolePermissionService.getList(new MallRolePermission(){{ - setTenantId(mallRolePermission.getTenantId()); + updateTenantInfo(mallRolePermission); setRoleId(mallRolePermission.getRoleId()); setPermissionId(menuId_Zhangdanliebiao); }}); if (mallRolePermissionList.size() <= 0) { try { mallRolePermissionService.saveOrUpdate(new MallRolePermission(){{ - setTenantId(mallRolePermission.getTenantId()); + updateTenantInfo(mallRolePermission); setPermissionId(menuId_Zhangdanliebiao); setRoleId(mallRolePermission.getRoleId()); }}); @@ -494,14 +494,14 @@ public class SysMenuController extends BaseController { }}); for(MallRolePermission mallRolePermission: mallRolePermissions) { List mallRolePermissionList = mallRolePermissionService.getList(new MallRolePermission(){{ - setTenantId(mallRolePermission.getTenantId()); + updateTenantInfo(mallRolePermission); setRoleId(mallRolePermission.getRoleId()); setPermissionId(menuId_ZhangdanMan); }}); if (mallRolePermissionList.size() <= 0) { try { mallRolePermissionService.saveOrUpdate(new MallRolePermission(){{ - setTenantId(mallRolePermission.getTenantId()); + updateTenantInfo(mallRolePermission); setPermissionId(menuId_ZhangdanMan); setRoleId(mallRolePermission.getRoleId()); }});