gaoxing/UNIVPLMDataIntegration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

😎1、增加数据库类型字典 2、统一代码生成实体里面的库类型字段

Browse Source
This commit is contained in:
zuohuaijun 2025-07-27 15:44:01 +08:00
parent 0c4683cd69
commit c4cedbfb32
6 changed files with 51 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Admin.NET/Admin.NET.Core/Entity/SysCodeGen.cs
View File

@ -53,9 +53,8 @@ public partial class SysCodeGen : EntityBase
/// <summary>
/// 数据库类型
/// </summary>
[SugarColumn(ColumnDescription = "数据库类型", Length = 64)]
[MaxLength(64)]
public string? DbType { get; set; }
[SugarColumn(ColumnDescription = "数据库类型", DefaultValue = "4")]
public SqlSugar.DbType DbType { get; set; } = SqlSugar.DbType.PostgreSQL;
/// <summary>
/// 数据库链接

35
Admin.NET/Admin.NET.Core/SeedData/SysDictDataSeedData.cs
View File

@ -74,6 +74,41 @@ public class SysDictDataSeedData : ISqlSugarEntitySeedData<SysDictData>
new SysDictData{ Id=1300000000701, DictTypeId=1300000000107, Label="普通列表", Value="List", OrderNo=105, Remark="普通列表", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2023-02-10 00:00:00") },
new SysDictData{ Id=1300000000702, DictTypeId=1300000000107, Label="树形表", Value="Tree", OrderNo=106, Remark="树形表", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2023-02-10 00:00:00") },
new SysDictData{ Id=1300000000801, DictTypeId=1300000000108, Label="MySql", Value="0", OrderNo=100, Remark="MySql", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2025-07-27 00:00:00") },
new SysDictData{ Id=1300000000802, DictTypeId=1300000000108, Label="SqlServer", Value="1", OrderNo=101, Remark="SqlServer", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2025-07-27 00:00:00") },
new SysDictData{ Id=1300000000803, DictTypeId=1300000000108, Label="Sqlite", Value="2", OrderNo=102, Remark="Sqlite", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2025-07-27 00:00:00") },
new SysDictData{ Id=1300000000804, DictTypeId=1300000000108, Label="Oracle", Value="3", OrderNo=103, Remark="Oracle", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2025-07-27 00:00:00") },
new SysDictData{ Id=1300000000805, DictTypeId=1300000000108, Label="PostgreSQL", Value="4", OrderNo=104, Remark="PostgreSQL", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2025-07-27 00:00:00") },
new SysDictData{ Id=1300000000806, DictTypeId=1300000000108, Label="Dm", Value="5", OrderNo=105, Remark="Dm", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2025-07-27 00:00:00") },
new SysDictData{ Id=1300000000807, DictTypeId=1300000000108, Label="Kdbndp", Value="6", OrderNo=106, Remark="Kdbndp", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2025-07-27 00:00:00") },
new SysDictData{ Id=1300000000808, DictTypeId=1300000000108, Label="Oscar", Value="7", OrderNo=107, Remark="Oscar", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2025-07-27 00:00:00") },
new SysDictData{ Id=1300000000809, DictTypeId=1300000000108, Label="MySqlConnector", Value="8", OrderNo=108, Remark="MySqlConnector", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2025-07-27 00:00:00") },
new SysDictData{ Id=1300000000810, DictTypeId=1300000000108, Label="Access", Value="9", OrderNo=109, Remark="Access", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2025-07-27 00:00:00") },
new SysDictData{ Id=1300000000811, DictTypeId=1300000000108, Label="OpenGauss", Value="10", OrderNo=110, Remark="OpenGauss", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2025-07-27 00:00:00") },
new SysDictData{ Id=1300000000812, DictTypeId=1300000000108, Label="QuestDB", Value="11", OrderNo=111, Remark="QuestDB", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2025-07-27 00:00:00") },
new SysDictData{ Id=1300000000813, DictTypeId=1300000000108, Label="HG", Value="12", OrderNo=112, Remark="HG", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2025-07-27 00:00:00") },
new SysDictData{ Id=1300000000814, DictTypeId=1300000000108, Label="ClickHouse", Value="13", OrderNo=113, Remark="ClickHouse", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2025-07-27 00:00:00") },
new SysDictData{ Id=1300000000815, DictTypeId=1300000000108, Label="GBase", Value="14", OrderNo=114, Remark="GBase", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2025-07-27 00:00:00") },
new SysDictData{ Id=1300000000816, DictTypeId=1300000000108, Label="Odbc", Value="15", OrderNo=115, Remark="Odbc", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2025-07-27 00:00:00") },
new SysDictData{ Id=1300000000817, DictTypeId=1300000000108, Label="OceanBaseForOracle", Value="16", OrderNo=116, Remark="OceanBaseForOracle", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2025-07-27 00:00:00") },
new SysDictData{ Id=1300000000818, DictTypeId=1300000000108, Label="TDengine", Value="17", OrderNo=117, Remark="TDengine", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2025-07-27 00:00:00") },
new SysDictData{ Id=1300000000819, DictTypeId=1300000000108, Label="GaussDB", Value="18", OrderNo=118, Remark="GaussDB", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2025-07-27 00:00:00") },
new SysDictData{ Id=1300000000820, DictTypeId=1300000000108, Label="OceanBase", Value="19", OrderNo=119, Remark="OceanBase", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2025-07-27 00:00:00") },
new SysDictData{ Id=1300000000821, DictTypeId=1300000000108, Label="Tidb", Value="20", OrderNo=120, Remark="Tidb", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2025-07-27 00:00:00") },
new SysDictData{ Id=1300000000822, DictTypeId=1300000000108, Label="Vastbase", Value="21", OrderNo=121, Remark="Vastbase", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2025-07-27 00:00:00") },
new SysDictData{ Id=1300000000823, DictTypeId=1300000000108, Label="PolarDB", Value="22", OrderNo=122, Remark="PolarDB", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2025-07-27 00:00:00") },
new SysDictData{ Id=1300000000824, DictTypeId=1300000000108, Label="Doris", Value="23", OrderNo=123, Remark="Doris", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2025-07-27 00:00:00") },
new SysDictData{ Id=1300000000825, DictTypeId=1300000000108, Label="Xugu", Value="24", OrderNo=124, Remark="Xugu", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2025-07-27 00:00:00") },
new SysDictData{ Id=1300000000826, DictTypeId=1300000000108, Label="GoldenDB", Value="25", OrderNo=125, Remark="GoldenDB", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2025-07-27 00:00:00") },
new SysDictData{ Id=1300000000827, DictTypeId=1300000000108, Label="TDSQLForPGODBC", Value="26", OrderNo=126, Remark="TDSQLForPGODBC", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2025-07-27 00:00:00") },
new SysDictData{ Id=1300000000828, DictTypeId=1300000000108, Label="TDSQL", Value="27", OrderNo=127, Remark="TDSQL", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2025-07-27 00:00:00") },
new SysDictData{ Id=1300000000829, DictTypeId=1300000000108, Label="HANA", Value="28", OrderNo=128, Remark="HANA", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2025-07-27 00:00:00") },
new SysDictData{ Id=1300000000830, DictTypeId=1300000000108, Label="DB2", Value="29", OrderNo=129, Remark="DB2", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2025-07-27 00:00:00") },
new SysDictData{ Id=1300000000831, DictTypeId=1300000000108, Label="GaussDBNative", Value="30", OrderNo=130, Remark="GaussDBNative", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2025-07-27 00:00:00") },
new SysDictData{ Id=1300000000832, DictTypeId=1300000000108, Label="DuckDB", Value="31", OrderNo=131, Remark="DuckDB", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2025-07-27 00:00:00") },
new SysDictData{ Id=1300000000833, DictTypeId=1300000000108, Label="MongoDb", Value="32", OrderNo=132, Remark="MongoDb", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2025-07-27 00:00:00") },
new SysDictData{ Id=1300000000899, DictTypeId=1300000000108, Label="Custom", Value="999", OrderNo=999, Remark="Custom", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2025-07-27 00:00:00") },
new SysDictData{ Id=1300000005001, DictTypeId=1300000005001, Label="集团", Value="101", OrderNo=100, Remark="集团", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2023-02-10 00:00:00") },
new SysDictData{ Id=1300000005002, DictTypeId=1300000005001, Label="公司", Value="201", OrderNo=101, Remark="公司", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2023-02-10 00:00:00") },
new SysDictData{ Id=1300000005003, DictTypeId=1300000005001, Label="部门", Value="301", OrderNo=102, Remark="部门", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2023-02-10 00:00:00") },

6
Admin.NET/Admin.NET.Core/SeedData/SysDictTypeSeedData.cs
View File

@ -26,8 +26,10 @@ public class SysDictTypeSeedData : ISqlSugarEntitySeedData<SysDictType>
new SysDictType{ Id=1300000000104, Name="代码生成方式", Code="code_gen_create_type", SysFlag=YesNoEnum.Y, OrderNo=103, Remark="代码生成方式", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
new SysDictType{ Id=1300000000105, Name="代码生成基类", Code="code_gen_base_class", SysFlag=YesNoEnum.Y, OrderNo=104, Remark="代码生成基类", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
new SysDictType{ Id=1300000000106, Name="代码生成打印类型", Code="code_gen_print_type", SysFlag=YesNoEnum.Y, OrderNo=105, Remark="代码生成打印类型", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2023-12-04 00:00:00") },
new SysDictType{ Id=1300000000107, Name="代码生成控件表类型", Code="code_gen_tab_type", SysFlag=YesNoEnum.Y, OrderNo=202, Remark="代码生成控件表类型", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2023-02-10 00:00:00") },
new SysDictType{ Id=1300000005001, Name="机构类型", Code="org_type", SysFlag=YesNoEnum.Y, OrderNo=201, Remark="机构类型", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2023-02-10 00:00:00") },
new SysDictType{ Id=1300000000107, Name="代码生成控件表类型", Code="code_gen_tab_type", SysFlag=YesNoEnum.Y, OrderNo=106, Remark="代码生成控件表类型", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2023-02-10 00:00:00") },
new SysDictType{ Id=1300000000108, Name="数据库类型", Code="db_type", SysFlag=YesNoEnum.Y, OrderNo=107, Remark="数据库类型", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2025-07-27 00:00:00") },
new SysDictType{ Id=1300000005001, Name="机构类型", Code="org_type", SysFlag=YesNoEnum.Y, OrderNo=500, Remark="机构类型", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2023-02-10 00:00:00") },
];
}
}

7
Web/src/api-services/models/sys-code-gen.ts
View File

@ -12,6 +12,7 @@
* Do not edit the class manually.
*/
import { DbType } from './db-type';
import { SysCodeGenTemplateRelation } from './sys-code-gen-template-relation';
import { TableUniqueConfigItem } from './table-unique-config-item';
/**
@ -127,12 +128,10 @@ export interface SysCodeGen {
dbName?: string | null;
/**
* 数据库类型
*
* @type {string}
* @type {DbType}
* @memberof SysCodeGen
*/
dbType?: string | null;
dbType?: DbType;
/**
* 数据库链接

8
Web/src/views/system/codeGen/component/editCodeGenDialog.vue
View File

@ -23,8 +23,10 @@
</el-form-item>
</el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
<el-form-item label="库类型" prop="dbType" :rules="[{ required: true, message: '描述不能为空', trigger: 'blur' }]">
<el-select v-model="state.ruleForm.dbType" placeholder="数据库类型" filterable clearable disabled class="w100">
<el-form-item label="库类型" prop="dbType" :rules="[{ required: true, message: '库类型不能为空', trigger: 'blur' }]">
<g-sys-dict v-model="state.ruleForm.dbType" code="db_type" render-as="select" :disabled="state.ruleForm.tenantType == 0 && state.ruleForm.tenantType != undefined" />
<!-- <el-select v-model="state.ruleForm.dbType" placeholder="数据库类型" filterable clearable disabled class="w100">
<el-option label="MySql" :value="'0'" />
<el-option label="SqlServer" :value="'1'" />
<el-option label="Sqlite" :value="'2'" />
@ -50,7 +52,7 @@
<el-option label="PolarDB" :value="'22'" />
<el-option label="Doris" :value="'23'" />
<el-option label="Custom" :value="'900'" />
</el-select>
</el-select> -->
</el-form-item>
</el-col>
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">

35
Web/src/views/system/tenant/component/editTenant.vue
View File

@ -69,7 +69,7 @@
</el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
<el-form-item label="库定位器">
<el-select v-model="state.ruleForm.configId" placeholder="库定位器" filterable @change="dbChanged()" class="w100">
<el-select v-model="state.ruleForm.configId" placeholder="库定位器" filterable @change="dbChanged()" class="w100" :disabled="state.ruleForm.id != undefined">
<el-option v-for="item in state.tenantDbData" :key="item.dbName" :label="item.dbName" :value="item.configId">
<span style="float: left">{{ item.dbName }}</span>
<span style="float: right; color: var(--el-text-color-secondary)"> {{ item.configId }} </span>
@ -79,40 +79,9 @@
</el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
<el-form-item label="数据库类型">
<el-select v-model="state.ruleForm.dbType" placeholder="数据库类型" clearable class="w100" :disabled="state.ruleForm.tenantType == 0 && state.ruleForm.tenantType != undefined">
<el-option label="MySql" :value="0" />
<el-option label="SqlServer" :value="1" />
<el-option label="Sqlite" :value="2" />
<el-option label="Oracle" :value="3" />
<el-option label="PostgreSQL" :value="4" />
<el-option label="Dm" :value="5" />
<el-option label="Kdbndp" :value="6" />
<el-option label="Oscar" :value="7" />
<el-option label="MySqlConnector" :value="8" />
<el-option label="Access" :value="9" />
<el-option label="OpenGauss" :value="10" />
<el-option label="QuestDB" :value="11" />
<el-option label="HG" :value="12" />
<el-option label="ClickHouse" :value="13" />
<el-option label="GBase" :value="14" />
<el-option label="Odbc" :value="'15'" />
<el-option label="OceanBaseForOracle" :value="'16'" />
<el-option label="TDengine" :value="'17'" />
<el-option label="GaussDB" :value="'18'" />
<el-option label="OceanBase" :value="'19'" />
<el-option label="Tidb" :value="'20'" />
<el-option label="Vastbase" :value="'21'" />
<el-option label="PolarDB" :value="'22'" />
<el-option label="Doris" :value="'23'" />
<el-option label="Custom" :value="900" />
</el-select>
<g-sys-dict v-model="state.ruleForm.dbType" code="db_type" render-as="select" :disabled="state.ruleForm.tenantType == 0 && state.ruleForm.tenantType != undefined" />
</el-form-item>
</el-col>
<!-- <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
<el-form-item label="数据库标识">
<el-input v-model="ruleForm.configId" placeholder="数据库标识" clearable :disabled="ruleForm.tenantType == 0 && ruleForm.tenantType != undefined" />
</el-form-item>
</el-col> -->
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
<el-form-item label="连接字符串">
<el-input