Optimize code structure service code.

Chat2DB-Pro · Chat2DB-Pro · commit b0196a4ef581 · 2024-01-09T19:19:53.000+08:00
diff --git a/chat2db-server/chat2db-server-domain/chat2db-server-domain-api/src/main/java/ai/chat2db/server/domain/api/param/UpdateSelectResultParam.java b/chat2db-server/chat2db-server-domain/chat2db-server-domain-api/src/main/java/ai/chat2db/server/domain/api/param/UpdateSelectResultParam.java
@@ -1,6 +1,7 @@
 package ai.chat2db.server.domain.api.param;
 
 import ai.chat2db.spi.model.Header;
+import ai.chat2db.spi.model.ResultOperation;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
@@ -44,7 +45,7 @@ public class UpdateSelectResultParam {
      * 修改后数据的列表
      */
     @NotEmpty
-    private List<SelectResultOperation> operations;
+    private List<ResultOperation> operations;
 
 
     /**
diff --git a/chat2db-server/chat2db-server-domain/chat2db-server-domain-core/src/main/java/ai/chat2db/server/domain/core/converter/CommandConverter.java b/chat2db-server/chat2db-server-domain/chat2db-server-domain-core/src/main/java/ai/chat2db/server/domain/core/converter/CommandConverter.java
@@ -0,0 +1,16 @@
+package ai.chat2db.server.domain.core.converter;
+
+import ai.chat2db.server.domain.api.param.DlExecuteParam;
+import ai.chat2db.spi.model.Command;
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.Mappings;
+
+@Mapper(componentModel = "spring")
+public abstract class CommandConverter {
+
+    @Mappings({
+            @Mapping(target = "script", source = "sql")
+    })
+    public abstract Command param2model(DlExecuteParam param);
+}
diff --git a/chat2db-server/chat2db-server-domain/chat2db-server-domain-core/src/main/java/ai/chat2db/server/domain/core/impl/ConsoleServiceImpl.java b/chat2db-server/chat2db-server-domain/chat2db-server-domain-core/src/main/java/ai/chat2db/server/domain/core/impl/ConsoleServiceImpl.java
@@ -24,7 +24,6 @@ public ActionResult createConsole(ConsoleConnectParam param) {
 
     @Override
     public ActionResult closeConsole(ConsoleCloseParam param) {
-        SQLExecutor.getInstance().close();
         return ActionResult.isSuccess();
     }
 
diff --git a/chat2db-server/chat2db-server-domain/chat2db-server-domain-core/src/main/java/ai/chat2db/server/domain/core/impl/DataSourceServiceImpl.java b/chat2db-server/chat2db-server-domain/chat2db-server-domain-core/src/main/java/ai/chat2db/server/domain/core/impl/DataSourceServiceImpl.java
@@ -275,7 +275,6 @@ public ListResult<Database> connect(Long id) {
     public ActionResult close(Long id) {
         DataSourceCloseParam closeParam = new DataSourceCloseParam();
         closeParam.setDataSourceId(id);
-        SQLExecutor.getInstance().close();
         return ActionResult.isSuccess();
     }
 
diff --git a/chat2db-server/chat2db-server-domain/chat2db-server-domain-core/src/main/java/ai/chat2db/server/domain/core/impl/DlTemplateServiceImpl.java b/chat2db-server/chat2db-server-domain/chat2db-server-domain-core/src/main/java/ai/chat2db/server/domain/core/impl/DlTemplateServiceImpl.java
diff --git a/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/rdb/RdbDmlExportController.java b/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/rdb/RdbDmlExportController.java

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,6 @@ public ActionResult createConsole(ConsoleConnectParam param) {`
`24`	`24`
`25`	`25`	`@Override`
`26`	`26`	`public ActionResult closeConsole(ConsoleCloseParam param) {`
`27`		`- SQLExecutor.getInstance().close();`
`28`	`27`	`return ActionResult.isSuccess();`
`29`	`28`	`}`
`30`	`29`
Original file line number	Diff line number	Diff line change
`@@ -275,7 +275,6 @@ public ListResult<Database> connect(Long id) {`
`275`	`275`	`public ActionResult close(Long id) {`
`276`	`276`	`DataSourceCloseParam closeParam = new DataSourceCloseParam();`
`277`	`277`	`closeParam.setDataSourceId(id);`
`278`		`- SQLExecutor.getInstance().close();`
`279`	`278`	`return ActionResult.isSuccess();`
`280`	`279`	`}`
`281`	`280`