feat: add tanant API

Author: lu-yg

app/src/main/resources/sql/h2/create_permission_table_ddl_2025_1029.sql

@@ -20,7 +20,7 @@ create table `r_auth_users_units_roles`
     `id`                int          not null auto_increment comment '主键id',
     `user_id`           int          not null comment '用户',
     `unit_id`           int          not null comment '业务单元',
-    `unit_type`         int          not null comment '业务单元类型',
+    `unit_type`         varchar(60)  not null comment '业务单元类型',
     `tenant_id`         int          not null comment '组织id',
     `role_id`           int          not null comment '角色id',
     `expired_time`      timestamp  comment '过期时间',

base/src/main/java/com/tinyengine/it/common/context/LoginUserContext.java

@@ -41,7 +41,7 @@ public interface LoginUserContext {
 
     /**
      * 设置当前组织信息
-     * @praam tenants
+     * @param tenants
      */
     void setTenants(List<Tenant> tenants);
 }

base/src/main/java/com/tinyengine/it/common/handler/MyMetaObjectHandler.java

@@ -41,7 +41,13 @@ public void insertFill(MetaObject metaObject) {
         this.setFieldValByName("createdBy", loginUserContext.getLoginUserId(), metaObject);
         this.setFieldValByName("lastUpdatedBy", loginUserContext.getLoginUserId(), metaObject);
         this.setFieldValByName("platformId", loginUserContext.getPlatformId(), metaObject);
-        this.setFieldValByName("tenantId", loginUserContext.getTenants().get(0).getId(), metaObject);
+
+        if (loginUserContext.getTenants() != null && loginUserContext.getTenants().isEmpty()) {
+            Integer tenant = Integer.valueOf(loginUserContext.getTenants().get(0).getId());
+            if (tenant != null) {
+                this.setFieldValByName("tenantId", tenant, metaObject);
+            }
+        }
     }
 
     @Override

base/src/main/java/com/tinyengine/it/controller/TenantController.java

@@ -14,6 +14,7 @@
 import jakarta.validation.Valid;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -111,20 +112,21 @@ public Result<Tenant> updateTenant(@RequestBody Tenant tenant) {
      */
     @Operation(summary = "删除单个组织", description = "删除单个组织",
         parameters = {
-            @Parameter(name = "id", description = "TenantId")
+            @Parameter(name = "id", description = "id")
         }, responses = {
             @ApiResponse(responseCode = "200", description = "返回信息",
                 content = @Content(mediaType = "application/json",
                 schema = @Schema(implementation = Tenant.class))),
             @ApiResponse(responseCode = "400", description = "请求失败")
     })
     @SystemControllerLog(description = "删除单个组织")
-    @GetMapping("/tenant/delete")
+    @DeleteMapping("/tenant/delete")
     public Result<Tenant> deleteTenant(@RequestParam Integer id) {
+        Tenant tenant = tenantService.findTenantById(id);
         int result = tenantService.deleteTenantById(id);
         if (result != 1) {
             return Result.failed(ExceptionEnum.CM009);
         }
-        return Result.success(tenantService.findTenantById(id));
+        return Result.success(tenant);
     }
 }

base/src/main/java/com/tinyengine/it/controller/UserController.java

@@ -14,6 +14,7 @@
 
 import com.tinyengine.it.common.base.Result;
 import com.tinyengine.it.common.context.LoginUserContext;
+import com.tinyengine.it.common.exception.ExceptionEnum;
 import com.tinyengine.it.common.log.SystemControllerLog;
 import com.tinyengine.it.mapper.AuthUsersUnitsRolesMapper;
 import com.tinyengine.it.model.entity.Tenant;
@@ -75,14 +76,20 @@ public class UserController {
     @GetMapping("/user/me")
     public Result<User> me() {
         String loginUserId = loginUserContext.getLoginUserId();
+        if (loginUserId == null) {
+            return Result.failed(ExceptionEnum.CM009);
+        }
+        Integer userId = Integer.valueOf(loginUserId);
+        List<Tenant> tenants = authUsersUnitsRolesMapper.queryAllTenantByUserId(userId);
         User user = userService.queryUserById(loginUserId);
-        List<Tenant> tenants = authUsersUnitsRolesMapper.queryAllTenantByUserId(Integer.valueOf(loginUserId));
-        user.setTenant(tenants);
         if (user == null) {
             user = new User();
             user.setId(loginUserContext.getLoginUserId());
             user.setUsername(loginUserContext.getLoginUserId());
         }
+        user.setTenant(tenants);
+
         return Result.success(user);
     }
+
 }

base/src/main/java/com/tinyengine/it/login/config/SSOInterceptor.java

@@ -48,9 +48,7 @@ public boolean preHandle(HttpServletRequest request,
 
         // 如果没有token，重定向到登录页
         if (token == null || token.isEmpty()) {
-            String redirectUrl = SSO_SERVER;
-            log.info("No token, redirecting to: {}", redirectUrl);
-            response.sendRedirect(redirectUrl);
+            log.info("No token, redirecting to: {}", SSO_SERVER);
             response.sendRedirect(SSO_SERVER);
             return false;
         }

base/src/main/java/com/tinyengine/it/login/controller/LoginController.java

@@ -239,12 +239,18 @@ public Result<ValidationResult> validateToken(@RequestParam String token) {
     @GetMapping("/user/tenant")
     public Result<SSOTicket> setTenant(@RequestParam Integer tenantId) {
         List<Tenant> tenants = loginUserContext.getTenants();
+        if (tenants == null || tenants.isEmpty()) {
+            return Result.failed(ExceptionEnum.CM009);
+        }
         List<Tenant> currentTenant = new ArrayList<>();
         for (Tenant tenant : tenants) {
             if (tenant.getId().equals(tenantId.toString())) {
                 currentTenant.add(tenant);
             }
         }
+        if (currentTenant.isEmpty()) {
+            return Result.failed(ExceptionEnum.CM009);
+        }
         // 通过 RequestContextHolder 获取请求
         HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.currentRequestAttributes())
             .getRequest();

base/src/main/java/com/tinyengine/it/login/service/impl/LoginServiceImpl.java

@@ -55,7 +55,7 @@ public User createUser(User user) throws Exception {
         List<User> users = baseMapper.queryUserByCondition(userParam);
         if (!users.isEmpty()) {
             throw new ServiceException(ExceptionEnum.CM003.getResultCode(),
-                    ExceptionEnum.CM003.getResultMsg());
+                ExceptionEnum.CM003.getResultMsg());
         }
         KeyPair keyPair = generateSM2KeyPair();
         PublicKey publicKey = keyPair.getPublic();
@@ -92,7 +92,7 @@ public Result forgotPassword(User user) throws Exception {
         userParam.setUsername(user.getUsername());
         List<User> users = baseMapper.queryUserByCondition(userParam);
         if (users.isEmpty()) {
-            Result.failed(ExceptionEnum.CM002);
+            return Result.failed(ExceptionEnum.CM002);
         }
         User userResult = users.get(0);
         PublicKey publicKey = getPublicKeyFromBase64(user.getPublicKey());
@@ -107,7 +107,7 @@ public Result forgotPassword(User user) throws Exception {
         baseMapper.updateUserById(user);
         User result = baseMapper.queryUserById(user.getId());
         result.setPrivateKey(null);
-        if (result.getSalt().isEmpty()) {
+        if (result.getSalt() == null || result.getSalt().isEmpty()) {
             return Result.failed(ExceptionEnum.CM335);
         }
         return Result.success(ExceptionEnum.CM334.getResultCode(), ExceptionEnum.CM334.getResultMsg());

base/src/main/resources/mappers/AuthUsersUnitsRolesMapper.xml

@@ -31,16 +31,16 @@
             AND expired_time = #{expiredTime}
         </if>
         <if test="createdBy!=null and createdBy!=''">
-            AND A.created_by = #{createdBy}
+            AND created_by = #{createdBy}
         </if>
         <if test="lastUpdatedBy!=null and lastUpdatedBy!=''">
-            AND A.last_updated_by = #{lastUpdatedBy}
+            AND last_updated_by = #{lastUpdatedBy}
         </if>
         <if test="createdTime!=null">
-            AND A.created_time = #{createdTime}
+            AND created_time = #{createdTime}
         </if>
         <if test="lastUpdatedTime!=null">
-            AND A.last_updated_time = #{lastUpdatedTime}
+            AND last_updated_time = #{lastUpdatedTime}
         </if>
     </sql>
 
@@ -65,16 +65,16 @@
             expired_time = #{expiredTime},
         </if>
         <if test="createdBy!=null and createdBy!=''">
-            A.created_by = #{createdBy},
+            created_by = #{createdBy},
         </if>
         <if test="lastUpdatedBy!=null and lastUpdatedBy!=''">
-            A.last_updated_by = #{lastUpdatedBy},
+            last_updated_by = #{lastUpdatedBy},
         </if>
         <if test="createdTime!=null">
-            A.created_time = #{createdTime},
+            created_time = #{createdTime},
         </if>
         <if test="lastUpdatedTime!=null">
-            A.last_updated_time = #{lastUpdatedTime},
+            last_updated_time = #{lastUpdatedTime},
         </if>
     </sql>
 

base/src/test/java/com/tinyengine/it/common/handler/MockUserContext.java

@@ -12,40 +12,50 @@
 package com.tinyengine.it.common.handler;
 
 import com.tinyengine.it.common.context.LoginUserContext;
+import com.tinyengine.it.model.entity.Tenant;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Mock user context
  *
  * @since 2025-04-14
  */
 public class MockUserContext implements LoginUserContext {
+    /**
+     * 返回当前用户所诉的业务租户信息
+     *
+     * @return 租户ID
+     */
     @Override
-    public String getTenantId() {
-        return "1";
-    }
-
-    @Override
-    public Integer getLoginUserId() {
-        return "1";
+    public List<Tenant> getTenants() {
+        Tenant tenant = new Tenant();
+        tenant.setId("1");
+        List<Tenant> tenantList = new ArrayList<>();
+        tenantList.add(tenant);
+        return tenantList;
     }
 
     @Override
-    public String getRenterId() {
+    public String getLoginUserId() {
         return "1";
     }
 
-    @Override
-    public int getAppId() {
-        return 1;
-    }
 
     @Override
     public int getPlatformId() {
         return 1;
     }
 
+    /**
+     * 设置当前组织信息
+     *
+     * @param tenants
+     */
     @Override
-    public String getSiteId() {
-        return "1";
+    public void setTenants(List<Tenant> tenants) {
+
     }
+
 }