|
@@ -3,9 +3,11 @@ package com.xuqm.server.appmanager.controller.sys.v1;
|
|
import cn.org.bjca.trust.java.imserver.common.TimeHelper;
|
|
import cn.org.bjca.trust.java.imserver.common.TimeHelper;
|
|
import com.xuqm.server.appmanager.entitys.sys.v1.ApplicationEntity;
|
|
import com.xuqm.server.appmanager.entitys.sys.v1.ApplicationEntity;
|
|
import com.xuqm.server.appmanager.entitys.sys.v1.TenantEntity;
|
|
import com.xuqm.server.appmanager.entitys.sys.v1.TenantEntity;
|
|
|
|
+import com.xuqm.server.appmanager.entitys.sys.v1.TenantUserEntity;
|
|
import com.xuqm.server.appmanager.http.HttpResult;
|
|
import com.xuqm.server.appmanager.http.HttpResult;
|
|
import com.xuqm.server.appmanager.repository.sys.v1.ApplicationRepository;
|
|
import com.xuqm.server.appmanager.repository.sys.v1.ApplicationRepository;
|
|
import com.xuqm.server.appmanager.repository.sys.v1.TenantRepository;
|
|
import com.xuqm.server.appmanager.repository.sys.v1.TenantRepository;
|
|
|
|
+import com.xuqm.server.appmanager.repository.sys.v1.TenantUserRepository;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.web.bind.annotation.PostMapping;
|
|
import org.springframework.web.bind.annotation.PostMapping;
|
|
import org.springframework.web.bind.annotation.RequestBody;
|
|
import org.springframework.web.bind.annotation.RequestBody;
|
|
@@ -21,27 +23,31 @@ public class TenantV1Controller {
|
|
@Autowired
|
|
@Autowired
|
|
private TenantRepository tenantRepository;
|
|
private TenantRepository tenantRepository;
|
|
@Autowired
|
|
@Autowired
|
|
|
|
+ private TenantUserRepository tenantUserRepository;
|
|
|
|
+ @Autowired
|
|
private ApplicationRepository applicationRepository;
|
|
private ApplicationRepository applicationRepository;
|
|
|
|
|
|
@PostMapping("/tenant/create")
|
|
@PostMapping("/tenant/create")
|
|
- public HttpResult<String> tenantCreate(@RequestBody TenantEntity tenant) throws Exception {
|
|
|
|
- if (null == tenant.getTenantName() ||
|
|
|
|
- null == tenant.getUserPhone() ||
|
|
|
|
|
|
+ public HttpResult<String> tenantCreate(@RequestBody TenantUserEntity tenant) throws Exception {
|
|
|
|
+ if (null == tenant.getUserPhone() ||
|
|
null == tenant.getUserEmail() ||
|
|
null == tenant.getUserEmail() ||
|
|
- null == tenant.getUserName()) {
|
|
|
|
- return new HttpResult<>(201, "参数错误", "");
|
|
|
|
|
|
+ null == tenant.getUserPwd()) {
|
|
|
|
+ return new HttpResult<>(201, "参数错误", null);
|
|
} else {
|
|
} else {
|
|
- TenantEntity t = tenantRepository.findFirstByUserEmailOrUserPhone(tenant.getUserEmail(), tenant.getUserPhone());
|
|
|
|
- if (null != t) return new HttpResult<>(201, "当前联系人已注册", "");
|
|
|
|
- t = new TenantEntity();
|
|
|
|
- t.setTenantName(tenant.getTenantName());
|
|
|
|
- t.setUserEmail(tenant.getUserEmail());
|
|
|
|
- t.setUserName(tenant.getUserName());
|
|
|
|
- t.setUserPhone(tenant.getUserPhone());
|
|
|
|
- t.setTenantNo(TimeHelper.getTimeString("yyyyMMddHHmm") + (new Random().nextInt(899999999) + 100000000));
|
|
|
|
|
|
+ TenantUserEntity u = tenantUserRepository.findFirstByUserEmailOrUserPhone(tenant.getUserEmail(), tenant.getUserPhone());
|
|
|
|
+ if (null != u) return new HttpResult<>(201, "邮箱或手机号重复", null);
|
|
|
|
+ u = new TenantUserEntity();
|
|
|
|
+ u.setUserEmail(tenant.getUserEmail());
|
|
|
|
+ u.setUserPhone(tenant.getUserPhone());
|
|
|
|
+ u.setUserPwd(tenant.getUserPwd());
|
|
|
|
+ u.setUserId(TimeHelper.getTimeString("yyyyMMddHHmm") + (new Random().nextInt(899999999) + 100000000));
|
|
|
|
+ u.setTenantNo(TimeHelper.getTimeString("yyyyMMddHHmm") + (new Random().nextInt(899999999) + 100000000));
|
|
|
|
+ tenantUserRepository.save(u);
|
|
|
|
+ TenantEntity t = new TenantEntity();
|
|
|
|
+ t.setUserId(u.getUserId());
|
|
|
|
+ t.setTenantNo(u.getTenantNo());
|
|
tenantRepository.save(t);
|
|
tenantRepository.save(t);
|
|
|
|
|
|
-// RabbitMQHelper.requestByGetAndParams("http://114.115.203.60:15672/api/vhosts/" + appid, "");
|
|
|
|
return new HttpResult<>(200, "创建成功", "创建成功");
|
|
return new HttpResult<>(200, "创建成功", "创建成功");
|
|
}
|
|
}
|
|
|
|
|
|
@@ -51,10 +57,10 @@ public class TenantV1Controller {
|
|
public HttpResult<String> appCreate(@RequestBody ApplicationEntity application) throws Exception {
|
|
public HttpResult<String> appCreate(@RequestBody ApplicationEntity application) throws Exception {
|
|
if (null == application.getAppName() ||
|
|
if (null == application.getAppName() ||
|
|
null == application.getTenantNo()) {
|
|
null == application.getTenantNo()) {
|
|
- return new HttpResult<>(201, "参数错误", "");
|
|
|
|
|
|
+ return new HttpResult<>(201, "参数错误", null);
|
|
} else {
|
|
} else {
|
|
ApplicationEntity app = applicationRepository.findFirstByAppNameAndTenantNo(application.getAppName(), application.getTenantNo());
|
|
ApplicationEntity app = applicationRepository.findFirstByAppNameAndTenantNo(application.getAppName(), application.getTenantNo());
|
|
- if (null != app) return new HttpResult<>(201, "已创建相关类型的同名应用", "");
|
|
|
|
|
|
+ if (null != app) return new HttpResult<>(201, "已创建相关类型的同名应用", null);
|
|
app = new ApplicationEntity();
|
|
app = new ApplicationEntity();
|
|
app.setTenantNo(application.getTenantNo());
|
|
app.setTenantNo(application.getTenantNo());
|
|
app.setAppName(application.getAppName());
|
|
app.setAppName(application.getAppName());
|