diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b16c6d7..5f2a26d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,21 +4,30 @@
-
-
-
-
+
+
+
+
+
-
-
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -70,9 +79,6 @@
-
-
-
{
"customColor": "",
"associatedIndex": 3
@@ -84,7 +90,7 @@
-
+
+
+
+
+
+
@@ -388,7 +399,15 @@
1719713406313
-
+
+
+ 1719717493348
+
+
+
+ 1719717493348
+
+
@@ -472,7 +491,8 @@
-
+
+
diff --git a/etl-cleaning/src/main/java/com/etl/cleaning/controller/GetTableController.java b/etl-cleaning/src/main/java/com/etl/cleaning/controller/GetTableController.java
new file mode 100644
index 0000000..574edc5
--- /dev/null
+++ b/etl-cleaning/src/main/java/com/etl/cleaning/controller/GetTableController.java
@@ -0,0 +1,41 @@
+package com.etl.cleaning.controller;
+
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.etl.cleaning.domian.pojo.DataPlace;
+import com.etl.cleaning.domian.request.TableRequest;
+import com.etl.cleaning.service.PlaceService;
+import com.etl.common.result.Result;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 获取表名控制器
+ */
+@RestController
+@RequestMapping("/dataTable")
+public class GetTableController {
+
+ private final PlaceService placeService;
+
+ public GetTableController(PlaceService placeService) {
+ this.placeService = placeService;
+ }
+
+ /**
+ * 获取所有表名
+ *
+ * @param tableRequest
+ * @return
+ */
+ @PostMapping("/getTableName")
+ public Result getTableName(@RequestBody TableRequest tableRequest) {
+ LambdaUpdateWrapper eqed = new LambdaUpdateWrapper().eq(DataPlace::getName, tableRequest.getName()).or().eq(DataPlace::getTypeId, tableRequest.getTypeId());
+ DataPlace dataPlace = placeService.getOne(eqed);
+ if (dataPlace == null) {
+ throw new RuntimeException("您所选中的数据源不存在");
+ }
+ return Result.success();
+ }
+}
diff --git a/etl-cleaning/src/main/java/com/etl/cleaning/controller/PlaceController.java b/etl-cleaning/src/main/java/com/etl/cleaning/controller/PlaceController.java
index 97887ca..7ef6b4b 100644
--- a/etl-cleaning/src/main/java/com/etl/cleaning/controller/PlaceController.java
+++ b/etl-cleaning/src/main/java/com/etl/cleaning/controller/PlaceController.java
@@ -1,8 +1,5 @@
package com.etl.cleaning.controller;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.etl.cleaning.domian.pojo.DataPlace;
import com.etl.cleaning.domian.request.InsertPlaceRequest;
import com.etl.cleaning.domian.request.PlaceRequest;
import com.etl.cleaning.service.PlaceService;
diff --git a/etl-cleaning/src/main/java/com/etl/cleaning/controller/RoleTypeController.java b/etl-cleaning/src/main/java/com/etl/cleaning/controller/RoleTypeController.java
index d2ad1d8..0ab7271 100644
--- a/etl-cleaning/src/main/java/com/etl/cleaning/controller/RoleTypeController.java
+++ b/etl-cleaning/src/main/java/com/etl/cleaning/controller/RoleTypeController.java
@@ -23,11 +23,9 @@ import java.util.List;
@RequestMapping("/role-type")
public class RoleTypeController {
private final RoleTypeService roleTypeService;
-
public RoleTypeController(RoleTypeService roleTypeService) {
this.roleTypeService = roleTypeService;
}
-
/**
* 规则类型列表
* @return
diff --git a/etl-cleaning/src/main/java/com/etl/cleaning/controller/TypeController.java b/etl-cleaning/src/main/java/com/etl/cleaning/controller/TypeController.java
index b734135..9f8c73d 100644
--- a/etl-cleaning/src/main/java/com/etl/cleaning/controller/TypeController.java
+++ b/etl-cleaning/src/main/java/com/etl/cleaning/controller/TypeController.java
@@ -29,12 +29,14 @@ public class TypeController {
return Result.success(list);
}
- /**
- * 测试mysql链接
- * @return
+ /*
+ 测试mysql链接
+ @return
*/
-// @GetMapping("/testMysql")
-// public Result testMysql(){
-// ServerTest.testDatabaseConnection()
-// }
+/*
+ @GetMapping("/testMysql")
+ public Result testMysql(){
+ ServerTest.testDatabaseConnection()
+ }
+*/
}
diff --git a/etl-cleaning/src/main/java/com/etl/cleaning/domian/pojo/DataPlace.java b/etl-cleaning/src/main/java/com/etl/cleaning/domian/pojo/DataPlace.java
index cee3941..ed94e7a 100644
--- a/etl-cleaning/src/main/java/com/etl/cleaning/domian/pojo/DataPlace.java
+++ b/etl-cleaning/src/main/java/com/etl/cleaning/domian/pojo/DataPlace.java
@@ -74,3 +74,4 @@ public class DataPlace {
*/
private String dataUrl;
}
+
diff --git a/etl-cleaning/src/main/java/com/etl/cleaning/domian/pojo/DataRole.java b/etl-cleaning/src/main/java/com/etl/cleaning/domian/pojo/DataRole.java
index 3558a83..6e46e1e 100644
--- a/etl-cleaning/src/main/java/com/etl/cleaning/domian/pojo/DataRole.java
+++ b/etl-cleaning/src/main/java/com/etl/cleaning/domian/pojo/DataRole.java
@@ -36,3 +36,4 @@ public class DataRole {
*/
private Long typeId;
}
+
diff --git a/etl-cleaning/src/main/java/com/etl/cleaning/domian/pojo/DataTask.java b/etl-cleaning/src/main/java/com/etl/cleaning/domian/pojo/DataTask.java
index 2ab1a0d..5a0645c 100644
--- a/etl-cleaning/src/main/java/com/etl/cleaning/domian/pojo/DataTask.java
+++ b/etl-cleaning/src/main/java/com/etl/cleaning/domian/pojo/DataTask.java
@@ -46,3 +46,4 @@ public class DataTask {
}
+
diff --git a/etl-cleaning/src/main/java/com/etl/cleaning/domian/pojo/DateType.java b/etl-cleaning/src/main/java/com/etl/cleaning/domian/pojo/DateType.java
index 3ee8a2a..4732a7b 100644
--- a/etl-cleaning/src/main/java/com/etl/cleaning/domian/pojo/DateType.java
+++ b/etl-cleaning/src/main/java/com/etl/cleaning/domian/pojo/DateType.java
@@ -27,3 +27,4 @@ public class DateType {
*/
private String name;
}
+
diff --git a/etl-cleaning/src/main/java/com/etl/cleaning/domian/pojo/RoleType.java b/etl-cleaning/src/main/java/com/etl/cleaning/domian/pojo/RoleType.java
index b14abe1..0b5d958 100644
--- a/etl-cleaning/src/main/java/com/etl/cleaning/domian/pojo/RoleType.java
+++ b/etl-cleaning/src/main/java/com/etl/cleaning/domian/pojo/RoleType.java
@@ -24,3 +24,4 @@ public class RoleType {
*/
private String name;
}
+
diff --git a/etl-cleaning/src/main/java/com/etl/cleaning/domian/request/InsertPlaceRequest.java b/etl-cleaning/src/main/java/com/etl/cleaning/domian/request/InsertPlaceRequest.java
index 1986bc5..fc9f405 100644
--- a/etl-cleaning/src/main/java/com/etl/cleaning/domian/request/InsertPlaceRequest.java
+++ b/etl-cleaning/src/main/java/com/etl/cleaning/domian/request/InsertPlaceRequest.java
@@ -1,6 +1,5 @@
package com.etl.cleaning.domian.request;
-import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -64,3 +63,4 @@ public class InsertPlaceRequest {
@NotBlank(message = "连接地址不能为空")
private String dataUrl;
}
+
diff --git a/etl-cleaning/src/main/java/com/etl/cleaning/domian/request/InsertTaskRequest.java b/etl-cleaning/src/main/java/com/etl/cleaning/domian/request/InsertTaskRequest.java
index 613bd88..fb4fadc 100644
--- a/etl-cleaning/src/main/java/com/etl/cleaning/domian/request/InsertTaskRequest.java
+++ b/etl-cleaning/src/main/java/com/etl/cleaning/domian/request/InsertTaskRequest.java
@@ -38,3 +38,4 @@ public class InsertTaskRequest {
@NotBlank(message = "任务备注不能为空")
private String remark;
}
+
diff --git a/etl-cleaning/src/main/java/com/etl/cleaning/domian/request/MysqlRequest.java b/etl-cleaning/src/main/java/com/etl/cleaning/domian/request/MysqlRequest.java
index f720f25..f5e4bf8 100644
--- a/etl-cleaning/src/main/java/com/etl/cleaning/domian/request/MysqlRequest.java
+++ b/etl-cleaning/src/main/java/com/etl/cleaning/domian/request/MysqlRequest.java
@@ -37,3 +37,4 @@ public class MysqlRequest {
@NotBlank(message = "链接地址不能为空")
private String place;
}
+
diff --git a/etl-cleaning/src/main/java/com/etl/cleaning/domian/request/PlaceRequest.java b/etl-cleaning/src/main/java/com/etl/cleaning/domian/request/PlaceRequest.java
index 007da5d..6dacd70 100644
--- a/etl-cleaning/src/main/java/com/etl/cleaning/domian/request/PlaceRequest.java
+++ b/etl-cleaning/src/main/java/com/etl/cleaning/domian/request/PlaceRequest.java
@@ -13,3 +13,4 @@ public class PlaceRequest {
private Integer pageNum;
private Integer pageSize;
}
+
diff --git a/etl-cleaning/src/main/java/com/etl/cleaning/domian/request/RedisRequest.java b/etl-cleaning/src/main/java/com/etl/cleaning/domian/request/RedisRequest.java
index 3bc89d0..726e12b 100644
--- a/etl-cleaning/src/main/java/com/etl/cleaning/domian/request/RedisRequest.java
+++ b/etl-cleaning/src/main/java/com/etl/cleaning/domian/request/RedisRequest.java
@@ -28,3 +28,4 @@ public class RedisRequest {
@NotBlank(message = "链接地址不能为空")
private String host;
}
+
diff --git a/etl-cleaning/src/main/java/com/etl/cleaning/domian/request/TableRequest.java b/etl-cleaning/src/main/java/com/etl/cleaning/domian/request/TableRequest.java
new file mode 100644
index 0000000..5ee7d69
--- /dev/null
+++ b/etl-cleaning/src/main/java/com/etl/cleaning/domian/request/TableRequest.java
@@ -0,0 +1,29 @@
+package com.etl.cleaning.domian.request;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * 加载表参数
+ */
+@Data
+@AllArgsConstructor
+public class TableRequest {
+ /**
+ * 数据源类型ID
+ */
+ @NotNull(message = "数据源类型ID不能为空")
+ private Long typeId;
+
+
+ /**
+ * 数据源描述
+ */
+ @NotBlank(message = "数据源描述不能为空")
+ private String name;
+
+}
+
diff --git a/etl-cleaning/src/main/java/com/etl/cleaning/domian/request/TaskRequest.java b/etl-cleaning/src/main/java/com/etl/cleaning/domian/request/TaskRequest.java
index e49ea98..34e80cb 100644
--- a/etl-cleaning/src/main/java/com/etl/cleaning/domian/request/TaskRequest.java
+++ b/etl-cleaning/src/main/java/com/etl/cleaning/domian/request/TaskRequest.java
@@ -22,3 +22,4 @@ public class TaskRequest {
private Integer pageNum;
private Integer pageSize;
}
+
diff --git a/etl-cleaning/src/main/java/com/etl/cleaning/domian/request/UserRequest.java b/etl-cleaning/src/main/java/com/etl/cleaning/domian/request/UserRequest.java
index 945b389..de2d52a 100644
--- a/etl-cleaning/src/main/java/com/etl/cleaning/domian/request/UserRequest.java
+++ b/etl-cleaning/src/main/java/com/etl/cleaning/domian/request/UserRequest.java
@@ -11,3 +11,4 @@ public class UserRequest {
private String password;
}
+
diff --git a/etl-cleaning/src/main/java/com/etl/cleaning/domian/response/PlaceResponse.java b/etl-cleaning/src/main/java/com/etl/cleaning/domian/response/PlaceResponse.java
index 864cecf..9b76eb8 100644
--- a/etl-cleaning/src/main/java/com/etl/cleaning/domian/response/PlaceResponse.java
+++ b/etl-cleaning/src/main/java/com/etl/cleaning/domian/response/PlaceResponse.java
@@ -34,3 +34,4 @@ public class PlaceResponse {
@TableField(exist = false)
private String typeName;
}
+
diff --git a/etl-cleaning/src/main/java/com/etl/cleaning/enums/EnumMsg.java b/etl-cleaning/src/main/java/com/etl/cleaning/enums/EnumMsg.java
index c9ff706..a1b02c0 100644
--- a/etl-cleaning/src/main/java/com/etl/cleaning/enums/EnumMsg.java
+++ b/etl-cleaning/src/main/java/com/etl/cleaning/enums/EnumMsg.java
@@ -16,7 +16,6 @@ public enum EnumMsg {
private final int code;
private final String message;
-
EnumMsg(int code, String message) {
this.code = code;
this.message = message;
diff --git a/etl-cleaning/src/main/java/com/etl/cleaning/handler/CatchExceptions.java b/etl-cleaning/src/main/java/com/etl/cleaning/handler/CatchExceptions.java
new file mode 100644
index 0000000..de2ea70
--- /dev/null
+++ b/etl-cleaning/src/main/java/com/etl/cleaning/handler/CatchExceptions.java
@@ -0,0 +1,22 @@
+package com.etl.cleaning.handler;
+
+import com.alibaba.fastjson2.JSONObject;
+import com.etl.common.result.Result;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+
+/**
+ * 全局异常捕获类
+ */
+@RestControllerAdvice
+@Configuration
+@Log4j2
+public class CatchExceptions {
+ @ExceptionHandler(value = RuntimeException.class)
+ public Result catchException(RuntimeException exception) {
+ log.error("请求异常: [{}]",exception.getMessage(),exception);
+ return Result.error(JSONObject.toJSONString(exception.getMessage()));
+ }
+}
diff --git a/etl-cleaning/src/main/java/com/etl/cleaning/mapper/PlaceMapper.java b/etl-cleaning/src/main/java/com/etl/cleaning/mapper/PlaceMapper.java
index 7fc088b..e822d50 100644
--- a/etl-cleaning/src/main/java/com/etl/cleaning/mapper/PlaceMapper.java
+++ b/etl-cleaning/src/main/java/com/etl/cleaning/mapper/PlaceMapper.java
@@ -7,4 +7,5 @@ import com.etl.cleaning.domian.pojo.DataPlace;
* 数据源管理
*/
public interface PlaceMapper extends BaseMapper {
+
}
diff --git a/etl-cleaning/src/main/java/com/etl/cleaning/server/GetTableServerTest.java b/etl-cleaning/src/main/java/com/etl/cleaning/server/GetTableServerTest.java
new file mode 100644
index 0000000..14eb14f
--- /dev/null
+++ b/etl-cleaning/src/main/java/com/etl/cleaning/server/GetTableServerTest.java
@@ -0,0 +1,42 @@
+package com.etl.cleaning.server;
+
+
+import java.sql.*;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 获取数据库下的所有表名
+ */
+public class GetTableServerTest {
+ public static List getTableNames(String url,String username,String password){
+ ArrayList tableNames = new ArrayList<>();
+ Connection connection = null;
+ try {
+ Class.forName("com.mysql.cj.jdbc.Driver");
+ connection = DriverManager.getConnection(url, username, password);
+ DatabaseMetaData metaData = connection.getMetaData();
+ ResultSet tables = metaData.getTables(null, null, "%", new String[]{"TABLE"});
+ while (tables.next()){
+ tableNames.add(tables.getString(3));
+ }
+ tables.close();
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }finally {
+ // 关闭连接（如果已打开）
+ try {
+ if (connection != null && !connection.isClosed()) {
+ try {
+ connection.close();
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+ }
+ } catch (SQLException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ return tableNames;
+ }
+}
diff --git a/etl-cleaning/src/main/java/com/etl/cleaning/serviceimpl/PlaceServiceImpl.java b/etl-cleaning/src/main/java/com/etl/cleaning/serviceimpl/PlaceServiceImpl.java
index 2bac5f4..244cf3b 100644
--- a/etl-cleaning/src/main/java/com/etl/cleaning/serviceimpl/PlaceServiceImpl.java
+++ b/etl-cleaning/src/main/java/com/etl/cleaning/serviceimpl/PlaceServiceImpl.java
@@ -37,6 +37,7 @@ public class PlaceServiceImpl extends ServiceImpl implem
this.placeMapper = placeMapper;
}
+
@Override
public Map showPlacePage(PlaceRequest placeRequest) {
LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>();
@@ -65,7 +66,7 @@ public class PlaceServiceImpl extends ServiceImpl implem
.typeName(typeName)
.name(item.getName())
.bank(item.getBank())
- .statue(item.getStatue()) // 注意：这里可能是status的拼写错误，请检查
+ .statue(item.getStatue())
.updateTime(item.getUpdateTime())
.build();
}).collect(Collectors.toList());