From cf374cfedd42a5250a5360e3616c849b16075c59 Mon Sep 17 00:00:00 2001
From: sunshine7058 <2564255161@qq.com>
Date: Fri, 26 Apr 2024 17:00:09 +0800
Subject: [PATCH] =?UTF-8?q?feat():=E5=AD=97=E5=85=B8=E8=A1=A8=E5=88=9D?=
 =?UTF-8?q?=E5=A7=8B=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/muyu/data/source/domain/DictData.java | 48 +++++++++++++++++++
 .../com/muyu/data/source/domain/DictType.java | 44 +++++++++++++++++
 .../source/controller/DictDataCpntroller.java | 17 +++++++
 .../source/controller/DictTypeController.java | 18 +++++++
 .../data/source/mapper/DictDataMapper.java    | 17 +++++++
 .../data/source/mapper/DictTypeMapper.java    | 18 +++++++
 .../data/source/service/DictDataService.java  | 17 +++++++
 .../data/source/service/DictTypeService.java  | 17 +++++++
 .../service/impl/DataSourceServiceImpl.java   | 19 --------
 .../service/impl/DictDataServiceImpl.java     | 20 ++++++++
 .../service/impl/DictTypeServiceImpl.java     | 18 +++++++
 .../resources/mapper/data/DictDataMapper.xml  | 11 +++++
 .../resources/mapper/data/DictTypeMapper.xml  | 11 +++++
 13 files changed, 256 insertions(+), 19 deletions(-)
 create mode 100644 muyu-modules/muyu-data-source/muyu-data-source-common/src/main/java/com/muyu/data/source/domain/DictData.java
 create mode 100644 muyu-modules/muyu-data-source/muyu-data-source-common/src/main/java/com/muyu/data/source/domain/DictType.java
 create mode 100644 muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/controller/DictDataCpntroller.java
 create mode 100644 muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/controller/DictTypeController.java
 create mode 100644 muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/mapper/DictDataMapper.java
 create mode 100644 muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/mapper/DictTypeMapper.java
 create mode 100644 muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/service/DictDataService.java
 create mode 100644 muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/service/DictTypeService.java
 create mode 100644 muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/service/impl/DictDataServiceImpl.java
 create mode 100644 muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/service/impl/DictTypeServiceImpl.java
 create mode 100644 muyu-modules/muyu-data-source/muyu-data-source-server/src/main/resources/mapper/data/DictDataMapper.xml
 create mode 100644 muyu-modules/muyu-data-source/muyu-data-source-server/src/main/resources/mapper/data/DictTypeMapper.xml

diff --git a/muyu-modules/muyu-data-source/muyu-data-source-common/src/main/java/com/muyu/data/source/domain/DictData.java b/muyu-modules/muyu-data-source/muyu-data-source-common/src/main/java/com/muyu/data/source/domain/DictData.java
new file mode 100644
index 0000000..5279911
--- /dev/null
+++ b/muyu-modules/muyu-data-source/muyu-data-source-common/src/main/java/com/muyu/data/source/domain/DictData.java
@@ -0,0 +1,48 @@
+package com.muyu.data.source.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.muyu.common.core.web.domain.BaseEntity;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+/**
+ * 字典数据
+ *
+ * @author HuFangMing
+ * @ClassName: DictData
+ * @createTime: 2024/4/26 16:21
+ */
+
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@TableName(value = "dict_data")
+public class DictData extends BaseEntity {
+
+  /**
+   * 字典编码
+   */
+  @TableId(value = "dict_code", type = IdType.AUTO)
+  private Long dictCode;
+  /**
+   * 字典标签
+   */
+  private String dictLabel;
+  /**
+   * 字典键值
+   */
+  private String dictValue;
+  /**
+   * 字典类型
+   */
+  private String dictType;
+  /**
+   * 状态 (0正常 1停用)
+   */
+  private String status;
+}
diff --git a/muyu-modules/muyu-data-source/muyu-data-source-common/src/main/java/com/muyu/data/source/domain/DictType.java b/muyu-modules/muyu-data-source/muyu-data-source-common/src/main/java/com/muyu/data/source/domain/DictType.java
new file mode 100644
index 0000000..15e29d8
--- /dev/null
+++ b/muyu-modules/muyu-data-source/muyu-data-source-common/src/main/java/com/muyu/data/source/domain/DictType.java
@@ -0,0 +1,44 @@
+package com.muyu.data.source.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+/**
+ * 字典类型
+ *
+ * @author HuFangMing
+ * @ClassName: DictType
+ * @createTime: 2024/4/26 16:29
+ */
+
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@TableName(value = "dict_type")
+public class DictType {
+
+  /**
+   * 字典主键
+   */
+  @TableId(value = "dict_id", type = IdType.AUTO)
+  private Long dictId;
+
+  /**
+   * 字典名称
+   */
+  private String dictName;
+  /**
+   * 字典类型
+   */
+  private String dictType;
+  /**
+   * 状态（0正常 1停用）
+   */
+  private String status;
+}
diff --git a/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/controller/DictDataCpntroller.java b/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/controller/DictDataCpntroller.java
new file mode 100644
index 0000000..0a87bbb
--- /dev/null
+++ b/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/controller/DictDataCpntroller.java
@@ -0,0 +1,17 @@
+package com.muyu.data.source.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 字典数据控制层
+ *
+ * @author HuFangMing
+ * @ClassName: DictDataCpntroller
+ * @createTime: 2024/4/26 16:36
+ */
+@RestController
+@RequestMapping("/dictData")
+public class DictDataCpntroller {
+
+}
diff --git a/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/controller/DictTypeController.java b/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/controller/DictTypeController.java
new file mode 100644
index 0000000..1e01ddb
--- /dev/null
+++ b/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/controller/DictTypeController.java
@@ -0,0 +1,18 @@
+package com.muyu.data.source.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 字典类型控制层
+ *
+ * @author HuFangMing
+ * @ClassName: DictTypeController
+ * @createTime: 2024/4/26 16:37
+ */
+
+@RestController
+@RequestMapping("/dictType")
+public class DictTypeController {
+
+}
diff --git a/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/mapper/DictDataMapper.java b/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/mapper/DictDataMapper.java
new file mode 100644
index 0000000..1187d91
--- /dev/null
+++ b/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/mapper/DictDataMapper.java
@@ -0,0 +1,17 @@
+package com.muyu.data.source.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.muyu.data.source.domain.DictData;
+
+/**
+ * 字典数据mapper层
+ *
+ * @author HuFangMing
+ * @ClassName: DictDataMapper
+ * @createTime: 2024/4/26 16:48
+ */
+
+
+public interface DictDataMapper extends BaseMapper<DictData> {
+
+}
diff --git a/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/mapper/DictTypeMapper.java b/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/mapper/DictTypeMapper.java
new file mode 100644
index 0000000..015e369
--- /dev/null
+++ b/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/mapper/DictTypeMapper.java
@@ -0,0 +1,18 @@
+package com.muyu.data.source.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.muyu.data.source.domain.DictType;
+
+/**
+ * 字典类型mapper层
+ *
+ * @author HuFangMing
+ * @ClassName: DictTypeMapper
+ * @createTime: 2024/4/26 16:51
+ */
+
+
+public interface DictTypeMapper extends BaseMapper<DictType> {
+
+}
diff --git a/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/service/DictDataService.java b/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/service/DictDataService.java
new file mode 100644
index 0000000..722e60f
--- /dev/null
+++ b/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/service/DictDataService.java
@@ -0,0 +1,17 @@
+package com.muyu.data.source.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.muyu.data.source.domain.DictData;
+
+/**
+ * 字典数据业务层
+ *
+ * @author HuFangMing
+ * @ClassName: DictDataService
+ * @createTime: 2024/4/26 16:39
+ */
+
+
+public interface DictDataService extends IService<DictData> {
+
+}
diff --git a/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/service/DictTypeService.java b/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/service/DictTypeService.java
new file mode 100644
index 0000000..16463da
--- /dev/null
+++ b/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/service/DictTypeService.java
@@ -0,0 +1,17 @@
+package com.muyu.data.source.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.muyu.data.source.domain.DictType;
+
+/**
+ * 字典类型业务层
+ *
+ * @author HuFangMing
+ * @ClassName: DictTypeService
+ * @createTime: 2024/4/26 16:41
+ */
+
+
+public interface DictTypeService extends IService<DictType> {
+
+}
diff --git a/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/service/impl/DataSourceServiceImpl.java b/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/service/impl/DataSourceServiceImpl.java
index 31dec6b..6690df5 100644
--- a/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/service/impl/DataSourceServiceImpl.java
+++ b/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/service/impl/DataSourceServiceImpl.java
@@ -226,24 +226,6 @@ public class DataSourceServiceImpl extends ServiceImpl<DataSourceMapper, DataSou
         }
 
       }
-//
-      //获取表描述的集合
-//            List<Table> tableList = dataSourceMapper.selectTable(assetDataSource.getDatabaseName());
-      //判断是否存在
-//            if (childrenList == null || childrenList.size() == 0) {
-//                tableList.forEach(table -> {
-//                    Children children = Children.builder()
-//                        .name(table.getTableName())
-//                        .annotation(table.getTableComment())
-//                        .dataTotal(table.getTableRows())
-//                        .type("dataTable")
-//                        .assetId(assetDataSource.getId())
-//                        .build();
-//                    //添加到数据库
-//                    childrenService.save(children);
-
-//                });
-
       //返回表描述
       return childrenList;
 
@@ -388,7 +370,6 @@ public class DataSourceServiceImpl extends ServiceImpl<DataSourceMapper, DataSou
     } finally {
       try {
         pst.close();
-        pst = null;
       } catch (SQLException e) {
         throw new RuntimeException(e);
       }
diff --git a/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/service/impl/DictDataServiceImpl.java b/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/service/impl/DictDataServiceImpl.java
new file mode 100644
index 0000000..11f68dd
--- /dev/null
+++ b/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/service/impl/DictDataServiceImpl.java
@@ -0,0 +1,20 @@
+package com.muyu.data.source.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.muyu.data.source.domain.DictData;
+import com.muyu.data.source.mapper.DictDataMapper;
+import com.muyu.data.source.service.DictDataService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 字典数据实现层
+ *
+ * @author HuFangMing
+ * @ClassName: DictDataServiceImpl
+ * @createTime: 2024/4/26 16:44
+ */
+
+@Service
+public class DictDataServiceImpl extends ServiceImpl<DictDataMapper, DictData> implements DictDataService {
+
+}
diff --git a/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/service/impl/DictTypeServiceImpl.java b/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/service/impl/DictTypeServiceImpl.java
new file mode 100644
index 0000000..58b5486
--- /dev/null
+++ b/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/service/impl/DictTypeServiceImpl.java
@@ -0,0 +1,18 @@
+package com.muyu.data.source.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.muyu.data.source.domain.DictType;
+import com.muyu.data.source.mapper.DictTypeMapper;
+
+/**
+ * 字典类型实现层
+ *
+ * @author HuFangMing
+ * @ClassName: DictTypeService
+ * @createTime: 2024/4/26 16:45
+ */
+
+
+public class DictTypeServiceImpl extends ServiceImpl<DictTypeMapper, DictType> implements com.muyu.data.source.service.DictTypeService {
+
+}
diff --git a/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/resources/mapper/data/DictDataMapper.xml b/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/resources/mapper/data/DictDataMapper.xml
new file mode 100644
index 0000000..49d3e90
--- /dev/null
+++ b/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/resources/mapper/data/DictDataMapper.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+  PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+  "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!--
+1.在mybats的开发中namespace有特殊的意思，一定要是对应接口的全限定名
+	通过namespace可以简历mapper.xml和接口之间的关系(名字不重要，位置不重要)
+ -->
+<mapper namespace="com.muyu.data.source.mapper.DictDataMapper">
+
+</mapper>
diff --git a/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/resources/mapper/data/DictTypeMapper.xml b/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/resources/mapper/data/DictTypeMapper.xml
new file mode 100644
index 0000000..506c543
--- /dev/null
+++ b/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/resources/mapper/data/DictTypeMapper.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+  PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+  "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!--
+1.在mybats的开发中namespace有特殊的意思，一定要是对应接口的全限定名
+	通过namespace可以简历mapper.xml和接口之间的关系(名字不重要，位置不重要)
+ -->
+<mapper namespace="com.muyu.data.source.mapper.DictTypeMapper">
+
+</mapper>