[Fix-4191][Fix-4288] fix jar sqlstatement split (#4292)

Co-authored-by: jiangwei <jiangwei@szfiu.com>
Co-authored-by: jiangwwwei <jiangwwwei@users.noreply.github.com>

Author: jiangwwwei

dinky-admin/src/main/java/org/dinky/controller/TaskController.java

@@ -19,6 +19,7 @@
 
 package org.dinky.controller;
 
+import org.dinky.assertion.Asserts;
 import org.dinky.config.Dialect;
 import org.dinky.data.annotations.CheckTaskOwner;
 import org.dinky.data.annotations.ExecuteProcess;
@@ -49,9 +50,7 @@
 import org.dinky.trans.ExecuteJarParseStrategyUtil;
 import org.dinky.utils.SqlUtil;
 
-import java.util.Arrays;
 import java.util.List;
-import java.util.stream.Collectors;
 
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -306,7 +305,6 @@ public Result<List<TaskDTO>> getMyTask() {
     @PostMapping("/flinkJarSqlConvertForm")
     @ApiOperation("FlinkJar SqlConvertForm")
     public Result<FlinkJarSqlConvertVO> flinkJarSqlConvertForm(@RequestBody TaskDTO taskDTO) {
-
         String sqlStatement = taskDTO.getStatement();
         String[] statements = SqlUtil.getStatements(sqlStatement);
         FlinkJarSqlConvertVO flinkJarSqlConvertVO = new FlinkJarSqlConvertVO();
@@ -315,21 +313,24 @@ public Result<FlinkJarSqlConvertVO> flinkJarSqlConvertForm(@RequestBody TaskDTO
             flinkJarSqlConvertVO.setInitSqlStatement(sqlStatement);
             return Result.succeed(flinkJarSqlConvertVO);
         }
+
         Integer lastExecuteJarSqlStatementIndex = null;
         for (int i = 0; i < statements.length; i++) {
-            if (ExecuteJarParseStrategyUtil.match(statements[i])) {
+            if (ExecuteJarParseStrategyUtil.find(statements[i])) {
                 lastExecuteJarSqlStatementIndex = i;
             }
         }
         if (lastExecuteJarSqlStatementIndex == null) {
+            flinkJarSqlConvertVO.setInitSqlStatement(sqlStatement);
             return Result.succeed(flinkJarSqlConvertVO);
         }
         String lastSqlStatement = statements[lastExecuteJarSqlStatementIndex];
         JarSubmitParam info = JarSubmitParam.getInfo(lastSqlStatement);
         flinkJarSqlConvertVO.setJarSubmitParam(info);
-        String sql = Arrays.stream(ArrayUtil.remove(statements, lastExecuteJarSqlStatementIndex))
-                .map(x -> x + ";")
-                .collect(Collectors.joining("\n"));
+        // English: Only clear the 'Execute Jar' part of the original sqlStatement, while retaining all other
+        // statements.
+        // 中文： 只清理 Execute Jar 的语句，保留其他各种语句与注释
+        String sql = ExecuteJarParseStrategyUtil.removeExecuteJarStatement(sqlStatement);
         flinkJarSqlConvertVO.setInitSqlStatement(sql);
         return Result.succeed(flinkJarSqlConvertVO);
     }
@@ -338,6 +339,11 @@ public Result<FlinkJarSqlConvertVO> flinkJarSqlConvertForm(@RequestBody TaskDTO
     @ApiOperation("FlinkJar FormConvertSql")
     public Result<String> flinkJarFormConvertSql(@RequestBody FlinkJarSqlConvertVO dto) {
         JarSubmitParam jarSubmitParam = dto.getJarSubmitParam();
+        String initSqlStatement = dto.getInitSqlStatement();
+        // remove Other Execute Jar
+        if (Asserts.isNotNullString(initSqlStatement)) {
+            initSqlStatement = ExecuteJarParseStrategyUtil.removeExecuteJarStatement(initSqlStatement);
+        }
         Dict objectMap = Dict.create()
                 .set("uri", Opt.ofNullable(jarSubmitParam.getUri()).orElse(""))
                 .set(
@@ -352,6 +358,6 @@ public Result<String> flinkJarFormConvertSql(@RequestBody FlinkJarSqlConvertVO d
                                 .orElse(false)
                                 .toString());
         String executeJarSql = ENGINE.getTemplate("executeJar.sql").render(objectMap);
-        return Result.succeed(Opt.ofNullable(dto.getInitSqlStatement()).orElse("") + "\n" + executeJarSql, "");
+        return Result.succeed(Opt.ofNullable(initSqlStatement).orElse("") + "\n" + executeJarSql, "");
     }
 }