[Improvement-18249][DAO] Route AlertGroupMapper and AccessTokenMapperaccess through repository Dao

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/AlertGroupAuditOperatorImpl.java

@@ -19,7 +19,7 @@
 
 import org.apache.dolphinscheduler.api.audit.operator.BaseAuditOperator;
 import org.apache.dolphinscheduler.dao.entity.AlertGroup;
-import org.apache.dolphinscheduler.dao.mapper.AlertGroupMapper;
+import org.apache.dolphinscheduler.dao.repository.AlertGroupDao;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -28,7 +28,7 @@
 public class AlertGroupAuditOperatorImpl extends BaseAuditOperator {
 
     @Autowired
-    private AlertGroupMapper alertGroupMapper;
+    private AlertGroupDao alertGroupDao;
 
     @Override
     public String getObjectNameFromIdentity(Object identity) {
@@ -37,7 +37,7 @@ public String getObjectNameFromIdentity(Object identity) {
             return "";
         }
 
-        AlertGroup obj = alertGroupMapper.selectById(objId);
+        AlertGroup obj = alertGroupDao.queryById(objId);
         return obj == null ? "" : obj.getGroupName();
     }
 }

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/TokenAuditOperatorImpl.java

@@ -23,7 +23,7 @@
 import org.apache.dolphinscheduler.dao.entity.AccessToken;
 import org.apache.dolphinscheduler.dao.entity.AuditLog;
 import org.apache.dolphinscheduler.dao.entity.User;
-import org.apache.dolphinscheduler.dao.mapper.AccessTokenMapper;
+import org.apache.dolphinscheduler.dao.repository.AccessTokenDao;
 import org.apache.dolphinscheduler.dao.repository.UserDao;
 
 import java.util.List;
@@ -36,7 +36,7 @@
 public class TokenAuditOperatorImpl extends BaseAuditOperator {
 
     @Autowired
-    private AccessTokenMapper accessTokenMapper;
+    private AccessTokenDao accessTokenDao;
 
     @Autowired
     private UserDao userDao;
@@ -60,7 +60,7 @@ public String getObjectNameFromIdentity(Object identity) {
             return "";
         }
 
-        AccessToken obj = accessTokenMapper.selectById(objId);
+        AccessToken obj = accessTokenDao.queryById(objId);
         return obj == null ? "" : obj.getUserName();
     }
 }

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/permission/ResourcePermissionCheckServiceImpl.java

@@ -32,11 +32,11 @@
 import org.apache.dolphinscheduler.dao.entity.Tenant;
 import org.apache.dolphinscheduler.dao.entity.User;
 import org.apache.dolphinscheduler.dao.entity.WorkerGroup;
-import org.apache.dolphinscheduler.dao.mapper.AccessTokenMapper;
-import org.apache.dolphinscheduler.dao.mapper.AlertGroupMapper;
 import org.apache.dolphinscheduler.dao.mapper.AlertPluginInstanceMapper;
 import org.apache.dolphinscheduler.dao.mapper.EnvironmentMapper;
 import org.apache.dolphinscheduler.dao.mapper.TaskGroupMapper;
+import org.apache.dolphinscheduler.dao.repository.AccessTokenDao;
+import org.apache.dolphinscheduler.dao.repository.AlertGroupDao;
 import org.apache.dolphinscheduler.dao.repository.DataSourceDao;
 import org.apache.dolphinscheduler.dao.repository.K8sNamespaceDao;
 import org.apache.dolphinscheduler.dao.repository.ProjectDao;
@@ -326,10 +326,10 @@ public Set<Integer> listAuthorizedResourceIds(int userId, Logger logger) {
     @Component
     public static class AlertGroupResourcePermissionCheck implements ResourceAcquisitionAndPermissionCheck<Integer> {
 
-        private final AlertGroupMapper alertGroupMapper;
+        private final AlertGroupDao alertGroupDao;
 
-        public AlertGroupResourcePermissionCheck(AlertGroupMapper alertGroupMapper) {
-            this.alertGroupMapper = alertGroupMapper;
+        public AlertGroupResourcePermissionCheck(AlertGroupDao alertGroupDao) {
+            this.alertGroupDao = alertGroupDao;
         }
 
         @Override
@@ -344,7 +344,7 @@ public boolean permissionCheck(int userId, String url, Logger logger) {
 
         @Override
         public Set<Integer> listAuthorizedResourceIds(int userId, Logger logger) {
-            List<AlertGroup> alertGroupList = alertGroupMapper.queryAllGroupList();
+            List<AlertGroup> alertGroupList = alertGroupDao.queryAllGroupList();
             return alertGroupList.stream().map(AlertGroup::getId).collect(toSet());
         }
     }
@@ -413,10 +413,10 @@ public Set<Integer> listAuthorizedResourceIds(int userId, Logger logger) {
     @Component
     public static class AccessTokenResourcePermissionCheck implements ResourceAcquisitionAndPermissionCheck<Integer> {
 
-        private final AccessTokenMapper accessTokenMapper;
+        private final AccessTokenDao accessTokenDao;
 
-        public AccessTokenResourcePermissionCheck(AccessTokenMapper accessTokenMapper) {
-            this.accessTokenMapper = accessTokenMapper;
+        public AccessTokenResourcePermissionCheck(AccessTokenDao accessTokenDao) {
+            this.accessTokenDao = accessTokenDao;
         }
 
         @Override
@@ -431,7 +431,7 @@ public boolean permissionCheck(int userId, String url, Logger logger) {
 
         @Override
         public Set<Integer> listAuthorizedResourceIds(int userId, Logger logger) {
-            return accessTokenMapper.listAuthorizedAccessToken(userId, null).stream().map(AccessToken::getId)
+            return accessTokenDao.listAuthorizedAccessToken(userId, null).stream().map(AccessToken::getId)
                     .collect(toSet());
         }
     }

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/AccessTokenServiceImpl.java

@@ -31,7 +31,7 @@
 import org.apache.dolphinscheduler.common.utils.EncryptionUtils;
 import org.apache.dolphinscheduler.dao.entity.AccessToken;
 import org.apache.dolphinscheduler.dao.entity.User;
-import org.apache.dolphinscheduler.dao.mapper.AccessTokenMapper;
+import org.apache.dolphinscheduler.dao.repository.AccessTokenDao;
 
 import org.apache.commons.lang3.StringUtils;
 
@@ -51,7 +51,7 @@
 public class AccessTokenServiceImpl extends BaseServiceImpl implements AccessTokenService {
 
     @Autowired
-    private AccessTokenMapper accessTokenMapper;
+    private AccessTokenDao accessTokenDao;
 
     /**
      * query access token list
@@ -71,7 +71,7 @@ public PageInfo<AccessToken> queryAccessTokenList(User loginUser, String searchV
         if (loginUser.getUserType() == UserType.ADMIN_USER) {
             userId = 0;
         }
-        IPage<AccessToken> accessTokenList = accessTokenMapper.selectAccessTokenPage(page, searchVal, userId);
+        IPage<AccessToken> accessTokenList = accessTokenDao.queryAccessTokenPage(page, searchVal, userId);
         pageInfo.setTotal((int) accessTokenList.getTotal());
         pageInfo.setTotalList(accessTokenList.getRecords());
         return pageInfo;
@@ -92,7 +92,7 @@ public List<AccessToken> queryAccessTokenByUser(User loginUser, Integer userId)
         }
         userId = loginUser.getUserType().equals(UserType.ADMIN_USER) ? 0 : userId;
         // query access token for specified user
-        List<AccessToken> accessTokenList = this.accessTokenMapper.queryAccessTokenByUser(userId);
+        List<AccessToken> accessTokenList = this.accessTokenDao.queryAccessTokenByUser(userId);
         return accessTokenList;
     }
 
@@ -134,7 +134,7 @@ public AccessToken createToken(User loginUser, int userId, String expireTime, St
         accessToken.setCreateTime(new Date());
         accessToken.setUpdateTime(new Date());
 
-        int insert = accessTokenMapper.insert(accessToken);
+        int insert = accessTokenDao.insert(accessToken);
 
         if (insert > 0) {
             return accessToken;
@@ -168,7 +168,7 @@ public void deleteAccessTokenById(User loginUser, int id) {
             throw new ServiceException(Status.USER_NO_OPERATION_PERM);
         }
 
-        AccessToken accessToken = accessTokenMapper.selectById(id);
+        AccessToken accessToken = accessTokenDao.queryById(id);
         if (accessToken == null) {
             throw new ServiceException(Status.ACCESS_TOKEN_NOT_EXIST, id);
         }
@@ -177,7 +177,7 @@ public void deleteAccessTokenById(User loginUser, int id) {
         if (accessToken.getUserId() != loginUser.getId() && !loginUser.getUserType().equals(UserType.ADMIN_USER)) {
             throw new ServiceException(Status.USER_NO_OPERATION_PERM);
         }
-        accessTokenMapper.deleteById(id);
+        accessTokenDao.deleteById(id);
     }
 
     /**
@@ -198,7 +198,7 @@ public AccessToken updateToken(User loginUser, int id, int userId, String expire
         }
 
         // 2. check if token is existed
-        AccessToken accessToken = accessTokenMapper.selectById(id);
+        AccessToken accessToken = accessTokenDao.queryById(id);
         if (accessToken == null) {
             log.error("Access token does not exist, accessTokenId:{}.", id);
             throw new ServiceException(Status.ACCESS_TOKEN_NOT_EXIST, id);
@@ -219,8 +219,7 @@ public AccessToken updateToken(User loginUser, int id, int userId, String expire
         accessToken.setToken(token);
         accessToken.setUpdateTime(new Date());
 
-        int i = accessTokenMapper.updateById(accessToken);
-        if (i <= 0) {
+        if (!accessTokenDao.updateById(accessToken)) {
             throw new ServiceException(Status.ACCESS_TOKEN_NOT_EXIST, id);
         }
         return accessToken;

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/AlertGroupServiceImpl.java

@@ -30,7 +30,7 @@
 import org.apache.dolphinscheduler.common.enums.UserType;
 import org.apache.dolphinscheduler.dao.entity.AlertGroup;
 import org.apache.dolphinscheduler.dao.entity.User;
-import org.apache.dolphinscheduler.dao.mapper.AlertGroupMapper;
+import org.apache.dolphinscheduler.dao.repository.AlertGroupDao;
 
 import org.apache.commons.lang3.StringUtils;
 
@@ -57,7 +57,7 @@
 public class AlertGroupServiceImpl extends BaseServiceImpl implements AlertGroupService {
 
     @Autowired
-    private AlertGroupMapper alertGroupMapper;
+    private AlertGroupDao alertGroupDao;
 
     /**
      * query alert group list
@@ -68,14 +68,14 @@ public class AlertGroupServiceImpl extends BaseServiceImpl implements AlertGroup
     @Override
     public List<AlertGroup> queryAllAlertGroup(User loginUser) {
         if (loginUser.getUserType().equals(UserType.ADMIN_USER)) {
-            return alertGroupMapper.queryAllGroupList();
+            return alertGroupDao.queryAllGroupList();
         }
         Set<Integer> ids = resourcePermissionCheckService.userOwnedResourceIdsAcquisition(AuthorizationType.ALERT_GROUP,
                 loginUser.getId(), log);
         if (ids.isEmpty()) {
             return Collections.emptyList();
         }
-        return alertGroupMapper.selectBatchIds(ids);
+        return alertGroupDao.queryByIds(ids);
     }
 
     /**
@@ -93,7 +93,7 @@ public AlertGroup queryAlertGroupById(User loginUser, Integer id) {
             throw new ServiceException(Status.USER_NO_OPERATION_PERM);
         }
         // check if exist
-        AlertGroup alertGroup = alertGroupMapper.selectById(id);
+        AlertGroup alertGroup = alertGroupDao.queryById(id);
         if (alertGroup == null) {
             throw new ServiceException(Status.ALERT_GROUP_NOT_EXIST, id);
         }
@@ -113,7 +113,7 @@ public AlertGroup queryAlertGroupById(User loginUser, Integer id) {
     public PageInfo<AlertGroup> listPaging(User loginUser, String searchVal, Integer pageNo, Integer pageSize) {
         Page<AlertGroup> page = new Page<>(pageNo, pageSize);
         if (loginUser.getUserType().equals(UserType.ADMIN_USER)) {
-            IPage<AlertGroup> alertGroupIPage = alertGroupMapper.queryAlertGroupPage(page, searchVal);
+            IPage<AlertGroup> alertGroupIPage = alertGroupDao.queryAlertGroupPage(page, searchVal);
             return PageInfo.of(alertGroupIPage);
         }
 
@@ -124,7 +124,7 @@ public PageInfo<AlertGroup> listPaging(User loginUser, String searchVal, Integer
         }
 
         IPage<AlertGroup> alertGroupIPage =
-                alertGroupMapper.queryAlertGroupPageByIds(page, new ArrayList<>(ids), searchVal);
+                alertGroupDao.queryAlertGroupPageByIds(page, new ArrayList<>(ids), searchVal);
         return PageInfo.of(alertGroupIPage);
     }
 
@@ -161,7 +161,7 @@ public AlertGroup createAlertGroup(User loginUser, String groupName, String desc
 
         // insert
         try {
-            int insert = alertGroupMapper.insert(alertGroup);
+            int insert = alertGroupDao.insert(alertGroup);
             if (insert > 0) {
                 log.info("Create alert group complete, groupName:{}", alertGroup.getGroupName());
                 return alertGroup;
@@ -193,7 +193,7 @@ public AlertGroup updateAlertGroupById(User loginUser, int id, String groupName,
         if (checkDescriptionLength(desc)) {
             throw new ServiceException(Status.DESCRIPTION_TOO_LONG_ERROR);
         }
-        AlertGroup alertGroup = alertGroupMapper.selectById(id);
+        AlertGroup alertGroup = alertGroupDao.queryById(id);
 
         if (alertGroup == null) {
             throw new ServiceException(Status.ALERT_GROUP_NOT_EXIST);
@@ -209,7 +209,7 @@ public AlertGroup updateAlertGroupById(User loginUser, int id, String groupName,
         alertGroup.setCreateUserId(loginUser.getId());
         alertGroup.setAlertInstanceIds(alertInstanceIds);
         try {
-            alertGroupMapper.updateById(alertGroup);
+            alertGroupDao.updateById(alertGroup);
             log.info("Update alert group complete, groupName:{}", alertGroup.getGroupName());
             return alertGroup;
         } catch (DuplicateKeyException ex) {
@@ -240,12 +240,12 @@ public void deleteAlertGroupById(User loginUser, int id) {
         }
 
         // check exist
-        AlertGroup alertGroup = alertGroupMapper.selectById(id);
+        AlertGroup alertGroup = alertGroupDao.queryById(id);
         if (alertGroup == null) {
             throw new ServiceException(Status.ALERT_GROUP_NOT_EXIST);
         }
 
-        alertGroupMapper.deleteById(id);
+        alertGroupDao.deleteById(id);
         log.info("Delete alert group complete, groupId:{}", id);
     }
 
@@ -257,6 +257,6 @@ public void deleteAlertGroupById(User loginUser, int id) {
      */
     @Override
     public boolean existGroupName(String groupName) {
-        return alertGroupMapper.existGroupName(groupName) == Boolean.TRUE;
+        return alertGroupDao.existGroupName(groupName);
     }
 }

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/AlertPluginInstanceServiceImpl.java

@@ -33,9 +33,9 @@
 import org.apache.dolphinscheduler.dao.entity.AlertPluginInstance;
 import org.apache.dolphinscheduler.dao.entity.PluginDefine;
 import org.apache.dolphinscheduler.dao.entity.User;
-import org.apache.dolphinscheduler.dao.mapper.AlertGroupMapper;
 import org.apache.dolphinscheduler.dao.mapper.AlertPluginInstanceMapper;
 import org.apache.dolphinscheduler.dao.mapper.PluginDefineMapper;
+import org.apache.dolphinscheduler.dao.repository.AlertGroupDao;
 import org.apache.dolphinscheduler.extract.alert.IAlertOperator;
 import org.apache.dolphinscheduler.extract.alert.request.AlertSendResponse;
 import org.apache.dolphinscheduler.extract.alert.request.AlertTestSendRequest;
@@ -78,7 +78,7 @@ public class AlertPluginInstanceServiceImpl extends BaseServiceImpl implements A
     private PluginDefineMapper pluginDefineMapper;
 
     @Autowired
-    private AlertGroupMapper alertGroupMapper;
+    private AlertGroupDao alertGroupDao;
 
     @Autowired
     private RegistryClient registryClient;
@@ -271,7 +271,7 @@ private String parseToPluginUiParams(String pluginParamsMapString, String plugin
     }
 
     private boolean checkHasAssociatedAlertGroup(String id) {
-        List<String> idsList = alertGroupMapper.queryInstanceIdsList();
+        List<String> idsList = alertGroupDao.queryInstanceIdsList();
         if (CollectionUtils.isEmpty(idsList)) {
             return false;
         }

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/UsersServiceImpl.java

@@ -39,9 +39,9 @@
 import org.apache.dolphinscheduler.dao.entity.ProjectUser;
 import org.apache.dolphinscheduler.dao.entity.Tenant;
 import org.apache.dolphinscheduler.dao.entity.User;
-import org.apache.dolphinscheduler.dao.mapper.AccessTokenMapper;
-import org.apache.dolphinscheduler.dao.mapper.AlertGroupMapper;
 import org.apache.dolphinscheduler.dao.mapper.K8sNamespaceUserMapper;
+import org.apache.dolphinscheduler.dao.repository.AccessTokenDao;
+import org.apache.dolphinscheduler.dao.repository.AlertGroupDao;
 import org.apache.dolphinscheduler.dao.repository.DataSourceUserDao;
 import org.apache.dolphinscheduler.dao.repository.ProjectDao;
 import org.apache.dolphinscheduler.dao.repository.ProjectUserDao;
@@ -77,7 +77,7 @@
 public class UsersServiceImpl extends BaseServiceImpl implements UsersService {
 
     @Autowired
-    private AccessTokenMapper accessTokenMapper;
+    private AccessTokenDao accessTokenDao;
 
     @Autowired
     private UserDao userDao;
@@ -92,7 +92,7 @@ public class UsersServiceImpl extends BaseServiceImpl implements UsersService {
     private DataSourceUserDao datasourceUserDao;
 
     @Autowired
-    private AlertGroupMapper alertGroupMapper;
+    private AlertGroupDao alertGroupDao;
 
     @Autowired
     private ProjectDao projectDao;
@@ -448,7 +448,7 @@ public void deleteUserById(User loginUser, int id) throws IOException {
         // delete user
         userDao.queryTenantCodeByUserId(id);
 
-        accessTokenMapper.deleteAccessTokenByUserId(id);
+        accessTokenDao.deleteByUserId(id);
         sessionService.expireSession(id);
 
         if (!userDao.deleteById(id)) {
@@ -751,7 +751,7 @@ public User getUserInfo(User loginUser) {
         } else {
             user = userDao.queryDetailsById(loginUser.getId());
 
-            List<AlertGroup> alertGroups = alertGroupMapper.queryByUserId(loginUser.getId());
+            List<AlertGroup> alertGroups = alertGroupDao.queryByUserId(loginUser.getId());
 
             StringBuilder sb = new StringBuilder();