[Fix-18304][API] Remove dead code after t_ds_relation_user_alertgroup table dropped (#18316)

det101 · web-flow · commit c9e373e30bda · 2026-06-07T12:20:37.000+08:00
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/UsersController.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/UsersController.java
@@ -17,7 +17,6 @@
 
 package org.apache.dolphinscheduler.api.controller;
 
-import static org.apache.dolphinscheduler.api.enums.Status.AUTHORIZED_USER_ERROR;
 import static org.apache.dolphinscheduler.api.enums.Status.CREATE_USER_ERROR;
 import static org.apache.dolphinscheduler.api.enums.Status.DELETE_USER_BY_ID_ERROR;
 import static org.apache.dolphinscheduler.api.enums.Status.GET_USER_INFO_ERROR;
@@ -26,7 +25,6 @@
 import static org.apache.dolphinscheduler.api.enums.Status.GRANT_PROJECT_ERROR;
 import static org.apache.dolphinscheduler.api.enums.Status.QUERY_USER_LIST_PAGING_ERROR;
 import static org.apache.dolphinscheduler.api.enums.Status.REVOKE_PROJECT_ERROR;
-import static org.apache.dolphinscheduler.api.enums.Status.UNAUTHORIZED_USER_ERROR;
 import static org.apache.dolphinscheduler.api.enums.Status.UPDATE_USER_ERROR;
 import static org.apache.dolphinscheduler.api.enums.Status.USER_LIST_ERROR;
 import static org.apache.dolphinscheduler.api.enums.Status.VERIFY_USERNAME_ERROR;
@@ -314,30 +312,6 @@ public Result verifyUserName(@Parameter(hidden = true) @RequestAttribute(value =
         return usersService.verifyUserName(userName);
     }
 
-    @Operation(summary = "unauthorizedUser", description = "UNAUTHORIZED_USER_NOTES")
-    @Parameters({
-            @Parameter(name = "alertgroupId", description = "ALERT_GROUP_ID", required = true, schema = @Schema(implementation = String.class))
-    })
-    @GetMapping(value = "/unauth-user")
-    @ResponseStatus(HttpStatus.OK)
-    @ApiException(UNAUTHORIZED_USER_ERROR)
-    public Result<List<User>> unauthorizedUser(@Parameter(hidden = true) @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
-                                               @RequestParam("alertgroupId") Integer alertgroupId) {
-        return Result.success(usersService.unauthorizedUser(loginUser, alertgroupId));
-    }
-
-    @Operation(summary = "authorizedUser", description = "AUTHORIZED_USER_NOTES")
-    @Parameters({
-            @Parameter(name = "alertgroupId", description = "ALERT_GROUP_ID", required = true, schema = @Schema(implementation = String.class))
-    })
-    @GetMapping(value = "/authed-user")
-    @ResponseStatus(HttpStatus.OK)
-    @ApiException(AUTHORIZED_USER_ERROR)
-    public Result<List<User>> authorizedUser(@Parameter(hidden = true) @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
-                                             @RequestParam("alertgroupId") Integer alertgroupId) {
-        return Result.success(usersService.authorizedUser(loginUser, alertgroupId));
-    }
-
     @Operation(summary = "registerUser", description = "REGISTER_USER_NOTES")
     @Parameters({
             @Parameter(name = "userName", description = "USER_NAME", required = true, schema = @Schema(implementation = String.class)),
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/Status.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/Status.java
@@ -63,7 +63,6 @@ public enum Status {
     LIST_PAGING_ALERT_GROUP_ERROR(10029, "list paging alert group error", "分页查询告警组错误"),
     UPDATE_ALERT_GROUP_ERROR(10030, "update alert group error", "更新告警组错误"),
     DELETE_ALERT_GROUP_ERROR(10031, "delete alert group error", "删除告警组错误"),
-    ALERT_GROUP_GRANT_USER_ERROR(10032, "alert group grant user error", "告警组授权用户错误"),
     CREATE_DATASOURCE_ERROR(10033, "create datasource error", "创建数据源错误"),
     UPDATE_DATASOURCE_ERROR(10034, "update datasource error", "更新数据源错误"),
     QUERY_DATASOURCE_ERROR(10035, "query datasource error", "查询数据源错误"),
@@ -123,8 +122,6 @@ public enum Status {
     GET_USER_INFO_ERROR(10098, "get user info error", "获取用户信息错误"),
     USER_LIST_ERROR(10099, "user list error", "查询用户列表错误"),
     VERIFY_USERNAME_ERROR(10100, "verify username error", "用户名验证错误"),
-    UNAUTHORIZED_USER_ERROR(10101, "unauthorized user error", "查询未授权用户错误"),
-    AUTHORIZED_USER_ERROR(10102, "authorized user error", "查询授权用户错误"),
     QUERY_TASK_INSTANCE_LOG_ERROR(10103, "view task instance log error: {0}", "查询任务实例日志错误: {0}"),
     DOWNLOAD_TASK_INSTANCE_LOG_FILE_ERROR(10104, "download task instance log file error", "下载任务日志文件错误"),
     CREATE_WORKFLOW_DEFINITION_ERROR(10105, "create workflow definition error", "创建工作流错误"),
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/UsersService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/UsersService.java
@@ -154,16 +154,6 @@ User updateUser(User loginUser,
      */
     Result<Object> verifyUserName(String userName);
 
-    /**
-     * users not yet authorized to the given alert group
-     */
-    List<User> unauthorizedUser(User loginUser, Integer alertGroupId);
-
-    /**
-     * users authorized to the given alert group
-     */
-    List<User> authorizedUser(User loginUser, Integer alertGroupId);
-
     /**
      * registry user, default state is 0, default tenant_id is 1, no phone, no queue
      */
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/UsersServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/UsersServiceImpl.java
@@ -56,11 +56,9 @@
 import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Set;
 import java.util.stream.Collectors;
 
 import lombok.extern.slf4j.Slf4j;
@@ -830,55 +828,6 @@ public Result<Object> verifyUserName(String userName) {
         return result;
     }
 
-    /**
-     * unauthorized user
-     *
-     * @param loginUser    login user
-     * @param alertgroupId alert group id
-     * @return unauthorize result code
-     */
-    @Override
-    public List<User> unauthorizedUser(User loginUser, Integer alertgroupId) {
-        // only admin can operate
-        if (!isAdmin(loginUser)) {
-            log.warn("Only admin can deauthorize user.");
-            throw new ServiceException(Status.USER_NO_OPERATION_PERM);
-        }
-
-        List<User> userList = userDao.queryAll();
-        List<User> resultUsers = new ArrayList<>();
-        Set<User> userSet;
-        if (userList != null && !userList.isEmpty()) {
-            userSet = new HashSet<>(userList);
-
-            List<User> authedUserList = userDao.queryUserListByAlertGroupId(alertgroupId);
-
-            if (authedUserList != null && !authedUserList.isEmpty()) {
-                Set<User> authedUserSet = new HashSet<>(authedUserList);
-                userSet.removeAll(authedUserSet);
-            }
-            resultUsers = new ArrayList<>(userSet);
-        }
-        return resultUsers;
-    }
-
-    /**
-     * authorized user
-     *
-     * @param loginUser    login user
-     * @param alertGroupId alert group id
-     * @return authorized result code
-     */
-    @Override
-    public List<User> authorizedUser(User loginUser, Integer alertGroupId) {
-        // only admin can operate
-        if (!isAdmin(loginUser)) {
-            log.warn("Only admin can authorize user.");
-            throw new ServiceException(Status.USER_NO_OPERATION_PERM);
-        }
-        return userDao.queryUserListByAlertGroupId(alertGroupId);
-    }
-
     /**
      * @param tenantId tenant id
      * @return true if tenant exists, otherwise return false
diff --git a/dolphinscheduler-api/src/main/resources/i18n/messages.properties b/dolphinscheduler-api/src/main/resources/i18n/messages.properties
@@ -189,10 +189,8 @@ PROJECT_CODE=project code
 GET_USER_INFO_NOTES=get user info
 LIST_USER_NOTES=list user
 VERIFY_USER_NAME_NOTES=verify user name
-UNAUTHORIZED_USER_NOTES=cancel authorization
 ALERT_GROUP_ID=alert group id
 ALERT_INSTANCE_IDS=alert instance ids(string format, multiple instances separated by ",")
-AUTHORIZED_USER_NOTES=authorized user
 GRANT_DATASOURCE_NOTES=grant datasource
 DATASOURCE_IDS=datasource ids(string format, multiple datasources separated by ",")
 QUERY_PARENT_WORKFLOW_INSTANCE_BY_SUB_WORKFLOW_INSTANCE_ID_NOTES=query parent workflow instance info by sub workflow instance id
diff --git a/dolphinscheduler-api/src/main/resources/i18n/messages_en_US.properties b/dolphinscheduler-api/src/main/resources/i18n/messages_en_US.properties
@@ -220,10 +220,8 @@ PROJECT_CODE=project code
 GET_USER_INFO_NOTES=get user info
 LIST_USER_NOTES=list user
 VERIFY_USER_NAME_NOTES=verify user name
-UNAUTHORIZED_USER_NOTES=cancel authorization
 ALERT_GROUP_ID=alert group id
 ALERT_INSTANCE_IDS=alert instance ids(string format, multiple instances separated by ",")
-AUTHORIZED_USER_NOTES=authorized user
 RESOURCE_CURRENTDIR=dir of the current resource
 RESOURCE_FULL_NAME=resource full name
 GRANT_DATASOURCE_NOTES=grant datasource
diff --git a/dolphinscheduler-api/src/main/resources/i18n/messages_zh_CN.properties b/dolphinscheduler-api/src/main/resources/i18n/messages_zh_CN.properties
@@ -205,10 +205,8 @@ GET_USER_INFO_NOTES=\u83B7\u53D6\u7528\u6237\u4FE1\u606F
 QUERY_WORKFLOW_DEFINITION_BY_NAME_NOTES=\u901A\u8FC7\u540D\u79F0\u67E5\u8BE2\u6D41\u7A0B\u5B9A\u4E49
 LIST_USER_NOTES=\u7528\u6237\u5217\u8868
 VERIFY_USER_NAME_NOTES=\u9A8C\u8BC1\u7528\u6237\u540D
-UNAUTHORIZED_USER_NOTES=\u53D6\u6D88\u6388\u6743
 ALERT_GROUP_ID=\u544A\u8B66\u7EC4ID
 ALERT_INSTANCE_IDS=\u544A\u8B66\u5B9E\u4F8BID\u5217\u8868(\u5B57\u7B26\u4E32\u683C\u5F0F\uFF0C\u591A\u4E2A\u544A\u8B66\u5B9E\u4F8BID\u4EE5","\u5206\u5272)
-AUTHORIZED_USER_NOTES=\u6388\u6743\u7528\u6237
 GRANT_DATASOURCE_NOTES=\u6388\u6743\u6570\u636E\u6E90
 DATASOURCE_IDS=\u6570\u636E\u6E90ID\u5217\u8868(\u5B57\u7B26\u4E32\u683C\u5F0F\uFF0C\u591A\u4E2A\u6570\u636E\u6E90ID\u4EE5","\u5206\u5272)
 QUERY_PARENT_WORKFLOW_INSTANCE_BY_SUB_WORKFLOW_INSTANCE_ID_NOTES=\u901A\u8FC7\u5B50\u6D41\u7A0B\u5B9E\u4F8BID\u67E5\u8BE2\u7236\u6D41\u7A0B\u5B9E\u4F8B\u4FE1\u606F
diff --git a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/UsersControllerTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/UsersControllerTest.java
@@ -190,44 +190,6 @@ public void testListAll() throws Exception {
         logger.info(mvcResult.getResponse().getContentAsString());
     }
 
-    // todo: there is a sql error, the table t_ds_relation_user_alertgroup has already been dropped
-    @Disabled
-    @Test
-    public void testAuthorizedUser() throws Exception {
-        MultiValueMap<String, String> paramsMap = new LinkedMultiValueMap<>();
-        paramsMap.add("alertgroupId", "1");
-
-        MvcResult mvcResult = mockMvc.perform(get("/users/authed-user")
-                .header(SESSION_ID, sessionId)
-                .params(paramsMap))
-                .andExpect(status().isOk())
-                .andExpect(content().contentType(MediaType.APPLICATION_JSON))
-                .andReturn();
-
-        Result result = JSONUtils.parseObject(mvcResult.getResponse().getContentAsString(), Result.class);
-        Assertions.assertEquals(Status.SUCCESS.getCode(), result.getCode().intValue());
-        logger.info(mvcResult.getResponse().getContentAsString());
-    }
-
-    // todo: t_ds_relation_user_alertgroup has already been dropped
-    @Disabled
-    @Test
-    public void testUnauthorizedUser() throws Exception {
-        MultiValueMap<String, String> paramsMap = new LinkedMultiValueMap<>();
-        paramsMap.add("alertgroupId", "1");
-
-        MvcResult mvcResult = mockMvc.perform(get("/users/unauth-user")
-                .header(SESSION_ID, sessionId)
-                .params(paramsMap))
-                .andExpect(status().isOk())
-                .andExpect(content().contentType(MediaType.APPLICATION_JSON))
-                .andReturn();
-
-        Result result = JSONUtils.parseObject(mvcResult.getResponse().getContentAsString(), Result.class);
-        Assertions.assertEquals(Status.SUCCESS.getCode(), result.getCode().intValue());
-        logger.info(mvcResult.getResponse().getContentAsString());
-    }
-
     @Test
     public void testVerifyUserName() throws Exception {
         MultiValueMap<String, String> paramsMap = new LinkedMultiValueMap<>();
diff --git a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/UsersServiceTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/UsersServiceTest.java
@@ -577,33 +577,6 @@ public void testVerifyUserName() {
         Assertions.assertEquals(Status.USER_NAME_EXIST.getMsg(), result.getMsg());
     }
 
-    @Test
-    public void testUnauthorizedUser() {
-        User loginUser = new User();
-        when(userDao.queryAll()).thenReturn(getUserList());
-        when(userDao.queryUserListByAlertGroupId(2)).thenReturn(getUserList());
-        // no operate
-        assertThrowsServiceException(Status.USER_NO_OPERATION_PERM,
-                () -> usersService.unauthorizedUser(loginUser, 2));
-        // success
-        loginUser.setUserType(UserType.ADMIN_USER);
-        List<User> users = usersService.unauthorizedUser(loginUser, 2);
-        Assertions.assertNotNull(users);
-    }
-
-    @Test
-    public void testAuthorizedUser() {
-        User loginUser = new User();
-        when(userDao.queryUserListByAlertGroupId(2)).thenReturn(getUserList());
-        // no operate
-        assertThrowsServiceException(Status.USER_NO_OPERATION_PERM,
-                () -> usersService.authorizedUser(loginUser, 2));
-        // success
-        loginUser.setUserType(UserType.ADMIN_USER);
-        List<User> users = usersService.authorizedUser(loginUser, 2);
-        Assertions.assertFalse(users.isEmpty());
-    }
-
     @Test
     public void testRegisterUser() {
         String userName = "userTest0002~";
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/UserMapper.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/UserMapper.java
@@ -88,14 +88,6 @@ IPage<User> queryUserPaging(Page page,
      */
     User queryDetailsById(@Param("userId") int userId);
 
-    /**
-     * query user list by alertgroupId
-     *
-     * @param alertgroupId alertgroupId
-     * @return user list
-     */
-    List<User> queryUserListByAlertGroupId(@Param("alertgroupId") int alertgroupId);
-
     /**
      * query user list by tenantId
      *
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/repository/UserDao.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/repository/UserDao.java
@@ -38,8 +38,6 @@ public interface UserDao extends IDao<User> {
 
     User queryDetailsById(int userId);
 
-    List<User> queryUserListByAlertGroupId(int alertGroupId);
-
     List<User> queryUserListByTenant(int tenantId);
 
     User queryTenantCodeByUserId(int userId);
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/repository/impl/UserDaoImpl.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/repository/impl/UserDaoImpl.java
@@ -65,11 +65,6 @@ public User queryDetailsById(int userId) {
         return mybatisMapper.queryDetailsById(userId);
     }
 
-    @Override
-    public List<User> queryUserListByAlertGroupId(int alertGroupId) {
-        return mybatisMapper.queryUserListByAlertGroupId(alertGroupId);
-    }
-
     @Override
     public List<User> queryUserListByTenant(int tenantId) {
         return mybatisMapper.queryUserListByTenant(tenantId);
diff --git a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/UserMapper.xml b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/UserMapper.xml
@@ -72,14 +72,6 @@
         left join t_ds_queue q on t.queue_id = q.id
         WHERE u.id = #{userId}
     </select>
-    <select id="queryUserListByAlertGroupId" resultType="org.apache.dolphinscheduler.dao.entity.User">
-        select
-        <include refid="baseSqlV2">
-            <property name="alias" value="u"/>
-        </include>
-        from t_ds_user u, t_ds_relation_user_alertgroup rel
-        where u.id = rel.user_id AND rel.alertgroup_id = #{alertgroupId}
-    </select>
     <select id="queryUserListByTenant" resultType="org.apache.dolphinscheduler.dao.entity.User">
         select
         <include refid="baseSql"/>
diff --git a/dolphinscheduler-ui/src/service/modules/users/index.ts b/dolphinscheduler-ui/src/service/modules/users/index.ts
@@ -19,7 +19,6 @@ import { axios } from '@/service/service'
 import {
   UserNameReq,
   UserNamesReq,
-  AlertGroupIdReq,
   UserReq,
   IdReq,
   UserIdReq,
@@ -41,14 +40,6 @@ export function activateUser(data: UserNameReq): any {
   })
 }
 
-export function authorizedUser(params: AlertGroupIdReq): any {
-  return axios({
-    url: '/users/authed-user',
-    method: 'get',
-    params
-  })
-}
-
 export function batchActivateUser(data: UserNamesReq): any {
   return axios({
     url: '/users/batch/activate',
@@ -175,14 +166,6 @@ export function revokeProject(data: ProjectCodeReq & UserIdReq): any {
   })
 }
 
-export function unauthorizedUser(params: AlertGroupIdReq): any {
-  return axios({
-    url: '/users/unauth-user',
-    method: 'get',
-    params
-  })
-}
-
 export function updateUser(data: IdReq & UserReq) {
   return axios({
     url: '/users/update',
diff --git a/dolphinscheduler-ui/src/service/modules/users/types.ts b/dolphinscheduler-ui/src/service/modules/users/types.ts
@@ -23,10 +23,6 @@ interface UserNamesReq {
   userNames?: string
 }
 
-interface AlertGroupIdReq {
-  alertgroupId: string
-}
-
 interface UserReq {
   email: string
   tenantId: number | null
@@ -118,7 +114,6 @@ interface UserListRes {
 export {
   UserNameReq,
   UserNamesReq,
-  AlertGroupIdReq,
   UserReq,
   IdReq,
   UserIdReq,
