purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

多租户数据和无租户数据兼容

Browse Source
This commit is contained in:
qiankunpingtai
2019-06-14 09:17:35 +08:00
parent f4508bfa31
commit cff744d061
3 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/jsh/erp/constants/BusinessConstants.java
View File

@@ -212,7 +212,11 @@ public class BusinessConstants {
* 默认管理员账号
*/
public static final String DEFAULT_MANAGER = "admin";
/**
* 测试用户的基础数据设定
* */
public static final String TEST_USER_NUM_LIMIT="2000";
public static final String TEST_BILLS_NUM_LIMIT="200000";

38
src/main/java/com/jsh/erp/controller/UserController.java
View File

@@ -107,20 +107,34 @@ public class UserController {
msgTip = "user can login";
request.getSession().setAttribute("user",user);
if(("open").equals(mybatisPlusStatus)) {
String url = HTTP + manageIp + ":" + managePort + "/tenant/getTenant?tenantId=" + user.getTenantId();
JSONObject obj = HttpClient.httpGet(url);
if(obj!=null && obj.getString("code").equals(CODE_OK)) {
JSONObject dataObj = obj.getJSONObject("data");
if(dataObj!=null) {
String tenantId = dataObj.getString("tenantId");
String userNumLimit = dataObj.getString("userNumLimit");
String billsNumLimit = dataObj.getString("billsNumLimit");
if(tenantId!=null) {
request.getSession().setAttribute("tenantId",tenantId); //租户tenantId
request.getSession().setAttribute("userNumLimit",userNumLimit); //用户限制数
request.getSession().setAttribute("billsNumLimit",billsNumLimit); //单据限制数
String tenantId = null;
String userNumLimit = null;
String billsNumLimit = null;
if(user.getTenantId()==null){
msgTip="用户数据错误，请联系管理员！";
break;
}
JSONObject obj=null;
if(user.getTenantId()!=-1){
String url = HTTP + manageIp + ":" + managePort + "/tenant/getTenant?tenantId=" + user.getTenantId();
obj = HttpClient.httpGet(url);
if(obj!=null && obj.getString("code").equals(CODE_OK)) {
JSONObject dataObj = obj.getJSONObject("data");
if(dataObj!=null) {
tenantId = dataObj.getString("tenantId");
userNumLimit = dataObj.getString("userNumLimit");
billsNumLimit = dataObj.getString("billsNumLimit");
}
}
}else{
tenantId=user.getTenantId().toString();
userNumLimit=BusinessConstants.TEST_USER_NUM_LIMIT;
billsNumLimit=BusinessConstants.TEST_BILLS_NUM_LIMIT;
}
if(tenantId!=null) {
request.getSession().setAttribute("tenantId",tenantId); //租户tenantId
request.getSession().setAttribute("userNumLimit",userNumLimit); //用户限制数
request.getSession().setAttribute("billsNumLimit",billsNumLimit); //单据限制数
}
}
request.getSession().setAttribute("mybatisPlusStatus",mybatisPlusStatus); //开启状态

2
src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java
View File

@@ -833,7 +833,7 @@ public class DepotItemService {
Object tenantIdO = request.getSession().getAttribute("tenantId");
if(tenantIdO!=null){
//多租户模式，租户id从当前用户获取
tenantId=Long.valueOf(tenantId.toString());
tenantId=Long.valueOf(tenantIdO.toString());
} else {
//无租户模式，租户id为-1
tenantId=Long.valueOf(-1);