Merge branch 'DataLinkDC:dev' into dev

DataLinkDC · Nov 17, 2023 · 60a9c41 · 60a9c41
2 parents 78936be + 9dcf9ec
commit 60a9c41
Show file tree

Hide file tree

Showing 24 changed files with 187 additions and 137 deletions.
diff --git a/dinky-admin/src/main/java/org/dinky/controller/GitController.java b/dinky-admin/src/main/java/org/dinky/controller/GitController.java
@@ -22,11 +22,11 @@
 import org.dinky.data.annotations.Log;
 import org.dinky.data.constant.PermissionConstants;
 import org.dinky.data.dto.GitProjectDTO;
+import org.dinky.data.dto.GitProjectSortJarDTO;
 import org.dinky.data.dto.TreeNodeDTO;
 import org.dinky.data.enums.BusinessType;
 import org.dinky.data.enums.Status;
 import org.dinky.data.model.GitProject;
-import org.dinky.data.params.GitProjectSortJarParams;
 import org.dinky.data.result.ProTableResult;
 import org.dinky.data.result.Result;
 import org.dinky.service.GitProjectService;
@@ -129,26 +129,26 @@ public Result<Void> dragendSortProject(@RequestBody Map sortList) {
     /**
      * drag sort jar level
      *
-     * @param gitProjectSortJarParams
+     * @param gitProjectSortJarDTO
      * @return {@link Result}<{@link Void}>
      */
     @PostMapping("/dragendSortJar")
     @Log(title = "GitProject Jar Sort", businessType = BusinessType.UPDATE)
     @ApiOperation("GitProject Jar Sort")
     @ApiImplicitParam(
-            name = "gitProjectSortJarParams",
+            name = "gitProjectSortJarDTO",
             value = "after sorter data",
             required = true,
-            dataType = "GitProjectSortJarParams",
+            dataType = "GitProjectSortJarDTO",
             paramType = "body",
-            dataTypeClass = GitProjectSortJarParams.class)
+            dataTypeClass = GitProjectSortJarDTO.class)
     @SaCheckPermission(PermissionConstants.REGISTRATION_GIT_PROJECT_EDIT)
-    public Result<Void> dragendSortJar(@RequestBody GitProjectSortJarParams gitProjectSortJarParams) {
-        GitProject gitProjectServiceById = gitProjectService.getById(gitProjectSortJarParams.getProjectId());
+    public Result<Void> dragendSortJar(@RequestBody GitProjectSortJarDTO gitProjectSortJarDTO) {
+        GitProject gitProjectServiceById = gitProjectService.getById(gitProjectSortJarDTO.getProjectId());
         if (gitProjectServiceById == null) {
             return Result.failed(Status.GIT_PROJECT_NOT_FOUND);
         } else {
-            if (gitProjectService.dragendSortJar(gitProjectSortJarParams)) {
+            if (gitProjectService.dragendSortJar(gitProjectSortJarDTO)) {
                 return Result.succeed(Status.GIT_SORT_SUCCESS);
             } else {
                 return Result.failed(Status.GIT_SORT_FAILED);

diff --git a/dinky-admin/src/main/java/org/dinky/controller/TaskController.java b/dinky-admin/src/main/java/org/dinky/controller/TaskController.java
@@ -158,7 +158,13 @@ public Result<List<SqlExplainResult>> explainSql(@RequestBody TaskDTO taskDTO) t
     @ApiOperation("Get Job Plan")
     @ExecuteProcess(type = ProcessType.FLINK_JOB_PLAN)
     public Result<ObjectNode> getJobPlan(@ProcessId @RequestBody TaskDTO taskDTO) {
-        return Result.succeed(taskService.getJobPlan(taskDTO), Status.EXECUTE_SUCCESS);
+        ObjectNode jobPlan = null;
+        try {
+            jobPlan = taskService.getJobPlan(taskDTO);
+        } catch (Exception e) {
+            return Result.failed(e.getMessage());
+        }
+        return Result.succeed(jobPlan, Status.EXECUTE_SUCCESS);
     }
 
     @PutMapping

diff --git a/dinky-admin/src/main/java/org/dinky/controller/TenantController.java b/dinky-admin/src/main/java/org/dinky/controller/TenantController.java
@@ -21,10 +21,10 @@
 
 import org.dinky.data.annotations.Log;
 import org.dinky.data.constant.PermissionConstants;
+import org.dinky.data.dto.AssignUserToTenantDTO;
 import org.dinky.data.enums.BusinessType;
 import org.dinky.data.model.rbac.Tenant;
 import org.dinky.data.model.rbac.User;
-import org.dinky.data.params.AssignUserToTenantParams;
 import org.dinky.data.result.ProTableResult;
 import org.dinky.data.result.Result;
 import org.dinky.service.TenantService;
@@ -122,21 +122,21 @@ public ProTableResult<Tenant> listTenants(@RequestBody JsonNode para) {
     /**
      * assign user to tenant
      *
-     * @param assignUserToTenantParams {@link AssignUserToTenantParams}
+     * @param assignUserToTenantDTO {@link AssignUserToTenantDTO}
      * @return {@link Result} of {@link Void}
      */
     @PutMapping(value = "/assignUserToTenant")
     @ApiOperation("Assign User To Tenant")
     @ApiImplicitParam(
-            name = "assignUserToTenantParams",
+            name = "assignUserToTenantDTO",
             value = "assign user to tenant params",
             required = true,
-            dataType = "AssignUserToTenantParams",
+            dataType = "AssignUserToTenantDTO",
             paramType = "body")
     @Log(title = "Assign User To Tenant", businessType = BusinessType.INSERT)
     @SaCheckPermission(value = PermissionConstants.AUTH_TENANT_ASSIGN_USER)
-    public Result<Void> assignUserToTenant(@RequestBody AssignUserToTenantParams assignUserToTenantParams) {
-        return tenantService.assignUserToTenant(assignUserToTenantParams);
+    public Result<Void> assignUserToTenant(@RequestBody AssignUserToTenantDTO assignUserToTenantDTO) {
+        return tenantService.assignUserToTenant(assignUserToTenantDTO);
     }
 
     /**

diff --git a/dinky-admin/src/main/java/org/dinky/controller/UserController.java b/dinky-admin/src/main/java/org/dinky/controller/UserController.java
@@ -22,11 +22,11 @@
 import org.dinky.assertion.Asserts;
 import org.dinky.data.annotations.Log;
 import org.dinky.data.constant.PermissionConstants;
+import org.dinky.data.dto.AssignRoleDTO;
 import org.dinky.data.dto.ModifyPasswordDTO;
 import org.dinky.data.enums.BusinessType;
 import org.dinky.data.enums.Status;
 import org.dinky.data.model.rbac.User;
-import org.dinky.data.params.AssignRoleParams;
 import org.dinky.data.result.ProTableResult;
 import org.dinky.data.result.Result;
 import org.dinky.data.vo.UserVo;
@@ -194,22 +194,22 @@ public Result<Void> modifyPassword(@RequestBody ModifyPasswordDTO modifyPassword
     /**
      * give user assign role
      *
-     * @param assignRoleParams {@link AssignRoleParams}
+     * @param assignRoleDTO {@link AssignRoleDTO}
      * @return {@link Result} with {@link Void}
      */
     @PostMapping(value = "/assignRole")
     @ApiOperation("Assign Role")
     @Log(title = "Assign Role", businessType = BusinessType.UPDATE)
     @ApiImplicitParam(
-            name = "assignRoleParams",
-            value = "assignRoleParams",
+            name = "assignRoleDTO",
+            value = "assignRoleDTO",
             required = true,
-            dataType = "AssignRoleParams",
+            dataType = "AssignRoleDTO",
             paramType = "body",
-            dataTypeClass = AssignRoleParams.class)
+            dataTypeClass = AssignRoleDTO.class)
     @SaCheckPermission(PermissionConstants.AUTH_USER_ASSIGN_ROLE)
-    public Result<Void> assignRole(@RequestBody AssignRoleParams assignRoleParams) {
-        return userService.assignRole(assignRoleParams);
+    public Result<Void> assignRole(@RequestBody AssignRoleDTO assignRoleDTO) {
+        return userService.assignRole(assignRoleDTO);
     }
 
     /**

diff --git a/dinky-admin/src/main/java/org/dinky/data/dto/APIExecuteSqlDTO.java b/dinky-admin/src/main/java/org/dinky/data/dto/APIExecuteSqlDTO.java
@@ -128,7 +128,7 @@ public JobConfig getJobConfig() {
                 .useRemote(true)
                 .address(address)
                 .jobName(jobName)
-                .fragment(isFragment())
+                .fragment(getFragment())
                 .statementSet(useStatementSet)
                 .maxRowNum(maxRowNum)
                 .checkpoint(checkPoint)

diff --git a/dinky-admin/src/main/java/org/dinky/data/dto/APIExplainSqlDTO.java b/dinky-admin/src/main/java/org/dinky/data/dto/APIExplainSqlDTO.java
@@ -59,7 +59,7 @@ public JobConfig getJobConfig() {
         return JobConfig.builder()
                 .type(GatewayType.LOCAL.getLongValue())
                 .useRemote(false)
-                .fragment(isFragment())
+                .fragment(getFragment())
                 .statementSet(useStatementSet)
                 .parallelism(parallelism)
                 .configJson(configuration)

diff --git a/dinky-admin/src/main/java/org/dinky/data/dto/AbstractStatementDTO.java b/dinky-admin/src/main/java/org/dinky/data/dto/AbstractStatementDTO.java
@@ -41,7 +41,7 @@ public class AbstractStatementDTO {
     private Integer envId;
 
     @ApiModelProperty(value = "Fragment Flag", dataType = "boolean", example = "false", notes = "是否为片段")
-    private boolean fragment = false;
+    private Boolean fragment;
 
     @ApiModelProperty(
             value = "Variables",

diff --git a/...g/dinky/data/params/AssignRoleParams.java → ...ava/org/dinky/data/dto/AssignRoleDTO.java b/...g/dinky/data/params/AssignRoleParams.java → ...ava/org/dinky/data/dto/AssignRoleDTO.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.dinky.data.params;
+package org.dinky.data.dto;
 
 import java.util.List;
 
@@ -27,8 +27,8 @@
 
 /** assign role params */
 @Data
-@ApiModel(value = "AssignRoleParams", description = "Parameters for Assigning Roles to a User")
-public class AssignRoleParams {
+@ApiModel(value = "AssignRoleDTO", description = "Parameters for Assigning Roles to a User")
+public class AssignRoleDTO {
 
     @ApiModelProperty(value = "User ID", dataType = "Integer", notes = "ID of the user to assign roles to")
     private Integer userId;

diff --git a/...data/params/AssignUserToTenantParams.java → ...dinky/data/dto/AssignUserToTenantDTO.java b/...data/params/AssignUserToTenantParams.java → ...dinky/data/dto/AssignUserToTenantDTO.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.dinky.data.params;
+package org.dinky.data.dto;
 
 import java.util.List;
 
@@ -31,8 +31,8 @@
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@ApiModel(value = "AssignUserToTenantParams", description = "Parameters for Assigning Users to a Tenant")
-public class AssignUserToTenantParams {
+@ApiModel(value = "AssignUserToTenantDTO", description = "Parameters for Assigning Users to a Tenant")
+public class AssignUserToTenantDTO {
 
     @ApiModelProperty(value = "Tenant ID", dataType = "Integer", notes = "ID of the tenant to assign users to")
     private Integer tenantId;

diff --git a/.../data/params/GitProjectSortJarParams.java → .../dinky/data/dto/GitProjectSortJarDTO.java b/.../data/params/GitProjectSortJarParams.java → .../dinky/data/dto/GitProjectSortJarDTO.java
@@ -17,9 +17,7 @@
  *
  */
 
-package org.dinky.data.params;
-
-import org.dinky.data.dto.GitAnalysisJarDTO;
+package org.dinky.data.dto;
 
 import java.io.Serializable;
 import java.util.List;
@@ -29,8 +27,8 @@
 import lombok.Data;
 
 @Data
-@ApiModel(value = "GitProjectSortJarParams", description = "Parameters for Sorting JARs in a Git Project")
-public class GitProjectSortJarParams implements Serializable {
+@ApiModel(value = "GitProjectSortJarDTO", description = "Parameters for Sorting JARs in a Git Project")
+public class GitProjectSortJarDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "Project ID", dataType = "Integer", notes = "ID of the Git project")

diff --git a/dinky-admin/src/main/java/org/dinky/data/dto/StudioMetaStoreDTO.java b/dinky-admin/src/main/java/org/dinky/data/dto/StudioMetaStoreDTO.java
@@ -70,7 +70,7 @@ public JobConfig getJobConfig() {
                 .useResult(true)
                 .useChangeLog(false)
                 .useAutoCancel(false)
-                .fragment(isFragment())
+                .fragment(getFragment())
                 .statementSet(false)
                 .batchModel(false)
                 .maxRowNum(0)

diff --git a/dinky-admin/src/main/java/org/dinky/service/GitProjectService.java b/dinky-admin/src/main/java/org/dinky/service/GitProjectService.java
@@ -20,9 +20,9 @@
 package org.dinky.service;
 
 import org.dinky.data.dto.GitProjectDTO;
+import org.dinky.data.dto.GitProjectSortJarDTO;
 import org.dinky.data.dto.TreeNodeDTO;
 import org.dinky.data.model.GitProject;
-import org.dinky.data.params.GitProjectSortJarParams;
 import org.dinky.mybatis.service.ISuperService;
 
 import java.util.List;
@@ -50,10 +50,10 @@ public interface GitProjectService extends ISuperService<GitProject> {
     /**
      * drag sort jar level
      *
-     * @param gitProjectSortJarParams
+     * @param gitProjectSortJarDTO
      * @return
      */
-    Boolean dragendSortJar(GitProjectSortJarParams gitProjectSortJarParams);
+    Boolean dragendSortJar(GitProjectSortJarDTO gitProjectSortJarDTO);
 
     /**
      * Get the Git pool as a map of strings.

diff --git a/dinky-admin/src/main/java/org/dinky/service/TenantService.java b/dinky-admin/src/main/java/org/dinky/service/TenantService.java
@@ -19,8 +19,8 @@
 
 package org.dinky.service;
 
+import org.dinky.data.dto.AssignUserToTenantDTO;
 import org.dinky.data.model.rbac.Tenant;
-import org.dinky.data.params.AssignUserToTenantParams;
 import org.dinky.data.result.Result;
 import org.dinky.mybatis.service.ISuperService;
 
@@ -78,8 +78,8 @@ public interface TenantService extends ISuperService<Tenant> {
     /**
      * assignUserToTenant users to tenant
      *
-     * @param assignUserToTenantParams {@link AssignUserToTenantParams}
+     * @param assignUserToTenantDTO {@link AssignUserToTenantDTO}
      * @return {@link Result} of {@link Void}
      */
-    Result<Void> assignUserToTenant(AssignUserToTenantParams assignUserToTenantParams);
+    Result<Void> assignUserToTenant(AssignUserToTenantDTO assignUserToTenantDTO);
 }
diff --git a/dinky-admin/src/main/java/org/dinky/service/UserService.java b/dinky-admin/src/main/java/org/dinky/service/UserService.java
@@ -19,14 +19,14 @@
 
 package org.dinky.service;
 
+import org.dinky.data.dto.AssignRoleDTO;
 import org.dinky.data.dto.LoginDTO;
 import org.dinky.data.dto.ModifyPasswordDTO;
 import org.dinky.data.dto.UserDTO;
 import org.dinky.data.model.rbac.Role;
 import org.dinky.data.model.rbac.RowPermissions;
 import org.dinky.data.model.rbac.Tenant;
 import org.dinky.data.model.rbac.User;
-import org.dinky.data.params.AssignRoleParams;
 import org.dinky.data.result.Result;
 import org.dinky.data.vo.UserVo;
 import org.dinky.mybatis.service.ISuperService;
@@ -91,10 +91,10 @@ public interface UserService extends ISuperService<User> {
     /**
      * grant role
      *
-     * @param assignRoleParams {@link AssignRoleParams}
+     * @param assignRoleDTO {@link AssignRoleDTO}
      * @return {@link Result}<{@link Void}>
      */
-    Result<Void> assignRole(AssignRoleParams assignRoleParams);
+    Result<Void> assignRole(AssignRoleDTO assignRoleDTO);
 
     /**
      * choose tenant

diff --git a/dinky-admin/src/main/java/org/dinky/service/impl/GitProjectServiceImpl.java b/dinky-admin/src/main/java/org/dinky/service/impl/GitProjectServiceImpl.java
@@ -21,10 +21,10 @@
 
 import org.dinky.data.dto.GitAnalysisJarDTO;
 import org.dinky.data.dto.GitProjectDTO;
+import org.dinky.data.dto.GitProjectSortJarDTO;
 import org.dinky.data.dto.TreeNodeDTO;
 import org.dinky.data.exception.DinkyException;
 import org.dinky.data.model.GitProject;
-import org.dinky.data.params.GitProjectSortJarParams;
 import org.dinky.function.pool.UdfCodePool;
 import org.dinky.mapper.GitProjectMapper;
 import org.dinky.mybatis.service.impl.SuperServiceImpl;
@@ -93,14 +93,14 @@ public void dragendSortProject(Map gitProjectDTOList) {
         }
     }
 
-    /** @param gitProjectSortJarParams */
+    /** @param gitProjectSortJarDTO */
     @Override
-    public Boolean dragendSortJar(GitProjectSortJarParams gitProjectSortJarParams) {
-        GitProject gitProject = getById(gitProjectSortJarParams.getProjectId());
+    public Boolean dragendSortJar(GitProjectSortJarDTO gitProjectSortJarDTO) {
+        GitProject gitProject = getById(gitProjectSortJarDTO.getProjectId());
         if (gitProject == null) {
             return false;
         } else {
-            String jarClasses = JSONUtil.toJsonStr(gitProjectSortJarParams.getJars());
+            String jarClasses = JSONUtil.toJsonStr(gitProjectSortJarDTO.getJars());
             gitProject.setUdfClassMapList(jarClasses);
             return updateById(gitProject);
         }

diff --git a/dinky-admin/src/main/java/org/dinky/service/impl/TaskServiceImpl.java b/dinky-admin/src/main/java/org/dinky/service/impl/TaskServiceImpl.java
@@ -227,7 +227,7 @@ public JobConfig buildJobConfig(TaskDTO task) {
     public String buildEnvSql(AbstractStatementDTO task) {
         log.info("Start initialize FlinkSQLEnv:");
         String sql = CommonConstant.LineSep;
-        if (task.isFragment()) {
+        if (task.getFragment()) {
             String flinkWithSql = dataBaseService.getEnabledFlinkWithSql();
             if (Asserts.isNotNullString(flinkWithSql)) {
                 sql += flinkWithSql + CommonConstant.LineSep;

diff --git a/dinky-admin/src/main/java/org/dinky/service/impl/TenantServiceImpl.java b/dinky-admin/src/main/java/org/dinky/service/impl/TenantServiceImpl.java
@@ -22,11 +22,11 @@
 import org.dinky.assertion.Asserts;
 import org.dinky.context.TenantContextHolder;
 import org.dinky.data.constant.BaseConstant;
+import org.dinky.data.dto.AssignUserToTenantDTO;
 import org.dinky.data.enums.Status;
 import org.dinky.data.model.rbac.Role;
 import org.dinky.data.model.rbac.Tenant;
 import org.dinky.data.model.rbac.UserTenant;
-import org.dinky.data.params.AssignUserToTenantParams;
 import org.dinky.data.result.Result;
 import org.dinky.mapper.TenantMapper;
 import org.dinky.mybatis.service.impl.SuperServiceImpl;
@@ -166,11 +166,11 @@ public Result<Void> removeTenantById(Integer tenantId) {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Result<Void> assignUserToTenant(AssignUserToTenantParams assignUserToTenantParams) {
+    public Result<Void> assignUserToTenant(AssignUserToTenantDTO assignUserToTenantDTO) {
         List<UserTenant> tenantUserList = new ArrayList<>();
-        Integer tenantId = assignUserToTenantParams.getTenantId();
+        Integer tenantId = assignUserToTenantDTO.getTenantId();
         userTenantService.remove(new LambdaQueryWrapper<UserTenant>().eq(UserTenant::getTenantId, tenantId));
-        List<Integer> userIds = assignUserToTenantParams.getUserIds();
+        List<Integer> userIds = assignUserToTenantDTO.getUserIds();
         for (Integer userId : userIds) {
             UserTenant userTenant = new UserTenant();
             userTenant.setTenantId(tenantId);