From 0632a3247d31e432463082c870e61acbab6f3cf9 Mon Sep 17 00:00:00 2001 From: wangxiang <1827945911@qq.com> Date: Fri, 1 Mar 2024 11:45:31 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E8=A7=84=E5=88=99=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kicc/system/api/entity/Datasource.java | 52 +++++++++++++++++++ .../system/controller/RegionController.java | 2 +- .../cloud/kicc/system/util/ObjectUtil.java | 2 +- .../devtools/GenCodeParamMapper.xml | 0 .../devtools/GenDatabaseTypeMapper.xml | 0 .../devtools/GenQueryTypeMapper.xml | 0 .../devtools/GenShowTypeMapper.xml | 0 .../devtools/GenTableFieldTypeMapper.xml | 0 .../devtools/GenValidateTypeMapper.xml | 0 .../devtools/GencodeCustomFieldMapper.xml | 0 .../devtools/GencodeCustomObjMapper.xml | 0 .../devtools/GencodeSchemeMapper.xml | 0 .../devtools/GencodeTableColumnMapper.xml | 0 .../devtools/GencodeTableMapper.xml | 0 .../devtools/GencodeTemplateGroupMapper.xml | 0 .../devtools/GencodeTemplateObjMapper.xml | 0 .../main/test/SimpleCrudGeneratorTest.java | 2 +- 17 files changed, 55 insertions(+), 3 deletions(-) create mode 100644 kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Datasource.java rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/{ => mapper}/devtools/GenCodeParamMapper.xml (100%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/{ => mapper}/devtools/GenDatabaseTypeMapper.xml (100%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/{ => mapper}/devtools/GenQueryTypeMapper.xml (100%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/{ => mapper}/devtools/GenShowTypeMapper.xml (100%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/{ => mapper}/devtools/GenTableFieldTypeMapper.xml (100%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/{ => mapper}/devtools/GenValidateTypeMapper.xml (100%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/{ => mapper}/devtools/GencodeCustomFieldMapper.xml (100%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/{ => mapper}/devtools/GencodeCustomObjMapper.xml (100%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/{ => mapper}/devtools/GencodeSchemeMapper.xml (100%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/{ => mapper}/devtools/GencodeTableColumnMapper.xml (100%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/{ => mapper}/devtools/GencodeTableMapper.xml (100%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/{ => mapper}/devtools/GencodeTemplateGroupMapper.xml (100%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/{ => mapper}/devtools/GencodeTemplateObjMapper.xml (100%) diff --git a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Datasource.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Datasource.java new file mode 100644 index 00000000..8f298c3e --- /dev/null +++ b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Datasource.java @@ -0,0 +1,52 @@ +package com.cloud.kicc.system.api.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.cloud.kicc.common.data.entity.CommonEntity; +import java.io.Serializable; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; +import lombok.experimental.Accessors; + +/** + *

+ * 可视化数据源配置表 + *

+ * + * @author wangxiang4 + * @since 2024-03-01 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("sys_datasource") +@ApiModel(value = "Datasource对象", description = "可视化数据源配置表") +public class Datasource extends CommonEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("主键") + private String id; + + @ApiModelProperty("名称") + private String name; + + @ApiModelProperty("驱动类") + private String driverClass; + + @ApiModelProperty("连接地址") + private String url; + + @ApiModelProperty("用户名") + private String username; + + @ApiModelProperty("密码") + private String password; + + @ApiModelProperty("数据源状态") + private String status; + +} diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/RegionController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/RegionController.java index e273b371..ebe12043 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/RegionController.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/RegionController.java @@ -12,7 +12,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; -import com.cloud.dolphin.system.util.ObjectUtil; +import com.cloud.kicc.system.util.ObjectUtil; import java.util.List; /** diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/util/ObjectUtil.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/util/ObjectUtil.java index 21634fdb..bcb8c0be 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/util/ObjectUtil.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/util/ObjectUtil.java @@ -1,4 +1,4 @@ -package com.cloud.dolphin.system.util; +package com.cloud.kicc.system.util; import cn.hutool.core.util.StrUtil; import lombok.experimental.UtilityClass; diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/devtools/GenCodeParamMapper.xml b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/devtools/GenCodeParamMapper.xml similarity index 100% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/devtools/GenCodeParamMapper.xml rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/devtools/GenCodeParamMapper.xml diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/devtools/GenDatabaseTypeMapper.xml b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/devtools/GenDatabaseTypeMapper.xml similarity index 100% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/devtools/GenDatabaseTypeMapper.xml rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/devtools/GenDatabaseTypeMapper.xml diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/devtools/GenQueryTypeMapper.xml b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/devtools/GenQueryTypeMapper.xml similarity index 100% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/devtools/GenQueryTypeMapper.xml rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/devtools/GenQueryTypeMapper.xml diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/devtools/GenShowTypeMapper.xml b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/devtools/GenShowTypeMapper.xml similarity index 100% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/devtools/GenShowTypeMapper.xml rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/devtools/GenShowTypeMapper.xml diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/devtools/GenTableFieldTypeMapper.xml b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/devtools/GenTableFieldTypeMapper.xml similarity index 100% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/devtools/GenTableFieldTypeMapper.xml rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/devtools/GenTableFieldTypeMapper.xml diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/devtools/GenValidateTypeMapper.xml b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/devtools/GenValidateTypeMapper.xml similarity index 100% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/devtools/GenValidateTypeMapper.xml rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/devtools/GenValidateTypeMapper.xml diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/devtools/GencodeCustomFieldMapper.xml b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/devtools/GencodeCustomFieldMapper.xml similarity index 100% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/devtools/GencodeCustomFieldMapper.xml rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/devtools/GencodeCustomFieldMapper.xml diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/devtools/GencodeCustomObjMapper.xml b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/devtools/GencodeCustomObjMapper.xml similarity index 100% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/devtools/GencodeCustomObjMapper.xml rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/devtools/GencodeCustomObjMapper.xml diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/devtools/GencodeSchemeMapper.xml b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/devtools/GencodeSchemeMapper.xml similarity index 100% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/devtools/GencodeSchemeMapper.xml rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/devtools/GencodeSchemeMapper.xml diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/devtools/GencodeTableColumnMapper.xml b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/devtools/GencodeTableColumnMapper.xml similarity index 100% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/devtools/GencodeTableColumnMapper.xml rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/devtools/GencodeTableColumnMapper.xml diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/devtools/GencodeTableMapper.xml b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/devtools/GencodeTableMapper.xml similarity index 100% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/devtools/GencodeTableMapper.xml rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/devtools/GencodeTableMapper.xml diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/devtools/GencodeTemplateGroupMapper.xml b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/devtools/GencodeTemplateGroupMapper.xml similarity index 100% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/devtools/GencodeTemplateGroupMapper.xml rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/devtools/GencodeTemplateGroupMapper.xml diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/devtools/GencodeTemplateObjMapper.xml b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/devtools/GencodeTemplateObjMapper.xml similarity index 100% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/devtools/GencodeTemplateObjMapper.xml rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/devtools/GencodeTemplateObjMapper.xml diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/test/SimpleCrudGeneratorTest.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/test/SimpleCrudGeneratorTest.java index 13e73c22..a2ae529d 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/test/SimpleCrudGeneratorTest.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/test/SimpleCrudGeneratorTest.java @@ -45,7 +45,7 @@ public class SimpleCrudGeneratorTest { String packageController = "controller"; - String[] includeTable = { "sys_im_content" }; + String[] includeTable = { "sys_datasource" }; String[] filterEntityTablePrefix = { "sys_" };