From 228b881e5a893ec010a194ac42011a4169d0c590 Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期二, 21 四月 2026 14:24:15 +0800
Subject: [PATCH] 料箱码查询优化
---
rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/TenantServiceImpl.java | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/TenantServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/TenantServiceImpl.java
index c1d7292..fa2c768 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/TenantServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/TenantServiceImpl.java
@@ -4,6 +4,9 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.exception.CoolException;
+import com.vincent.rsf.server.common.domain.BusinessRes;
+import com.vincent.rsf.server.common.exception.BusinessException;
+import com.vincent.rsf.server.common.service.EmailService;
import com.vincent.rsf.server.system.controller.param.TenantInitParam;
import com.vincent.rsf.server.system.entity.*;
import com.vincent.rsf.server.system.enums.StatusType;
@@ -32,22 +35,27 @@
private UserRoleService userRoleService;
@Autowired
private RoleMenuService roleMenuService;
+ @Autowired
+ private EmailService emailService;
@Override
@Transactional
- public Boolean initTenant(TenantInitParam param) {
+ public Long initTenant(TenantInitParam param) {
// valid ----------------------------
if (null == param) {
- return false;
+ return null;
}
if (Cools.isEmpty(param.getName(), param.getFlag(), param.getUsername(), param.getPassword())) {
- return false;
+ return null;
}
if (null != userService.getByUsername(param.getUsername(), null)) {
- throw new CoolException("the username already exist");
+ throw new BusinessException(BusinessRes.USERNAME_EXIST);
}
if (!Cools.isEmpty(param.getEmail())) {
+ if (!emailService.isValid(param.getEmail())) {
+ throw new CoolException("Please enter a valid email address");
+ }
if (null != userService.getByEmail(param.getEmail(), null)) {
throw new CoolException("the email already exist");
}
@@ -114,9 +122,12 @@
throw new CoolException("failed to create userRole");
}
- // save roleMenu
+ // save roleMenu锛圚TTP 瀹¤绫昏彍鍗曚笉榛樿涓嬪彂锛岄渶鍦ㄨ鑹查噷鏄惧紡鍕鹃�夛級
List<Menu> menuList = menuService.list();
for (Menu menu : menuList) {
+ if ("httpAuditLog".equals(menu.getComponent()) || "httpAuditRule".equals(menu.getComponent())) {
+ continue;
+ }
RoleMenu roleMenu = new RoleMenu();
roleMenu.setRoleId(role.getId());
roleMenu.setMenuId(menu.getId());
@@ -125,7 +136,7 @@
}
}
- return true;
+ return tenant.getId();
}
}
--
Gitblit v1.9.1