server/HuanMengAdmin
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改代码生成

Browse Source
This commit is contained in:
zpc 2024-07-18 15:12:49 +08:00
parent 54ec2b977b
commit 1d8ccfca40
14 changed files with 81 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin-client/package.json
View File

@ -1,5 +1,5 @@
{
"name": "hzy-admin",
"name": "MiaoYu-admin",
"private": true,
"version": "1.0.0",
"type": "module",

10
admin-client/src/views/development_tool/low_code/components/CodeGeneration.vue
View File

@ -7,7 +7,7 @@ import CodeGenerationService from "@/services/development_tool/low_code/CodeGene
//定义组件事件
const props = defineProps<{ rowData: any }>();
const codeType = ref("HZY.Models");
const codeType = ref("MiaoYu.Models");
const loading = ref(false);
const csharpEditorContainer = ref<HTMLElement>();
// 修改 monaco editor 默认的右键菜单中的剪切、复制和粘贴菜单项的文本
@ -69,7 +69,7 @@ async function getCode() {
standaloneCodeEditor?.setValue(result?.data?.code);
// 切换编辑器语言
if (codeType.value == "HZY.Models" || codeType.value == "HZY.Services.Admin" || codeType.value == "HZY.Controllers.Admin") {
if (codeType.value == "MiaoYu.Models" || codeType.value == "MiaoYu.Services.Admin" || codeType.value == "MiaoYu.Controllers.Admin") {
monaco.editor.setModelLanguage(standaloneCodeEditor?.getModel()!, "csharp");
}
@ -110,9 +110,9 @@ function downloadAll() {
<div class="mb-16">
<a-spin :spinning="loading">
<a-radio-group v-model:value="codeType">
<a-radio-button value="HZY.Models">实体</a-radio-button>
<a-radio-button value="HZY.Services.Admin">服务</a-radio-button>
<a-radio-button value="HZY.Controllers.Admin">控制器</a-radio-button>
<a-radio-button value="MiaoYu.Models">实体</a-radio-button>
<a-radio-button value="MiaoYu.Services.Admin">服务</a-radio-button>
<a-radio-button value="MiaoYu.Controllers.Admin">控制器</a-radio-button>
<a-radio-button value="Client.Index">客户端列表页</a-radio-button>
<a-radio-button value="Client.Info">客户端表单页</a-radio-button>
<a-radio-button value="Client.Service">客户端服务</a-radio-button>

22
admin-server/MiaoYu.Api.Admin/ApplicationServices/DevelopmentTools/LowCode/Impl/DatabaseTableService.cs
View File

@ -1,4 +1,6 @@
namespace MiaoYu.Api.Admin.ApplicationServices.DevelopmentTools.LowCode.Impl;
using MiaoYu.Repository.ChatAI.Admin.Entities;
namespace MiaoYu.Api.Admin.ApplicationServices.DevelopmentTools.LowCode.Impl;
/// <summary>
/// 数据库表服务
@ -12,6 +14,7 @@ public class DatabaseTableService : IDatabaseTableService
private readonly IRepository<LowCodeTable> _lowCodeTableRepository;
private readonly IRepository<LowCodeTableInfo> _lowCodeTableInfoRepository;
private readonly IRepository<T_Image_Config> _imageConfig;
/// <summary>
///
/// </summary>
@ -21,18 +24,31 @@ public class DatabaseTableService : IDatabaseTableService
public DatabaseTableService(
IMemoryCache memoryCache,
IRepository<LowCodeTable> lowCodeTableRepository,
IRepository<LowCodeTableInfo> lowCodeTableInfoRepository)
IRepository<LowCodeTableInfo> lowCodeTableInfoRepository,
IRepository<T_Image_Config> imageConfig
)
{
_memoryCache = memoryCache;
_lowCodeTableRepository = lowCodeTableRepository;
_lowCodeTableInfoRepository = lowCodeTableInfoRepository;
_imageConfig = imageConfig;
}
/// <summary>
/// 获取所有的表 包含表下面的列
/// </summary>
/// <returns></returns>
public virtual List<DbTableInfo> GetAllTableInfos() => _lowCodeTableRepository.UnitOfWork.FreeSqlOrm.DbFirst.GetTablesByDatabase();
public virtual List<DbTableInfo> GetAllTableInfos()
{
var list = _lowCodeTableRepository.UnitOfWork.FreeSqlOrm.DbFirst.GetTablesByDatabase();
var tlist = _imageConfig.UnitOfWork.FreeSqlOrm.DbFirst.GetTablesByDatabase();
tlist.ForEach(t =>
{
t.Schema = t.Schema + "." + "MiaoYuChat";
});
list.AddRange(tlist);
return list;
}
/// <summary>
/// 获取所有的表 包含表下面的列

20
admin-server/MiaoYu.Api.Admin/ApplicationServices/DevelopmentTools/LowCode/Impl/LowCodeTableService.cs
View File

@ -11,12 +11,10 @@ public class LowCodeTableService : ApplicationService<IRepository<LowCodeTable>>
private readonly LowCodeTableInfoService _lowCodeTableInfoService;
private readonly IDatabaseTableService _databaseTableService;
private readonly ICodeGenerationService _codeGenerationService;
public LowCodeTableService(
IRepository<LowCodeTable> defaultRepository,
LowCodeTableInfoService lowCodeTableInfoService,
IRepository<LowCodeTableInfo> lowCodeTableInfoRepository,
IRepository<T_Image_Config> imageConfig,
IDatabaseTableService databaseTableService,
ICodeGenerationService codeGenerationService) : base(defaultRepository)
{
@ -24,6 +22,7 @@ public class LowCodeTableService : ApplicationService<IRepository<LowCodeTable>>
_lowCodeTableInfoRepository = lowCodeTableInfoRepository;
_databaseTableService = databaseTableService;
_codeGenerationService = codeGenerationService;
}
/// <summary>
@ -33,6 +32,7 @@ public class LowCodeTableService : ApplicationService<IRepository<LowCodeTable>>
/// <returns></returns>
public async Task<PagingView> FindListAsync(PagingSearchInput<LowCodeTable> pagingSearchInput)
{
var query = _defaultRepository.SelectNoTracking
.WhereIf(!string.IsNullOrWhiteSpace(pagingSearchInput.Search.TableName),
w => w.TableName.Contains(pagingSearchInput.Search.TableName))
@ -51,6 +51,7 @@ public class LowCodeTableService : ApplicationService<IRepository<LowCodeTable>>
w.Remark,
w.LastModificationTime,
w.CreationTime,
w.DataBase,
})
;
@ -97,10 +98,12 @@ public class LowCodeTableService : ApplicationService<IRepository<LowCodeTable>>
var ids = new List<Guid>();
foreach (var item in allTables)
{
var table = oldAllTables.Find(w => w.TableName == item.Name);
var id = Guid.NewGuid();
if (table == null)
{
var lowCodeTable = new LowCodeTable
{
Id = id,
@ -108,11 +111,24 @@ public class LowCodeTableService : ApplicationService<IRepository<LowCodeTable>>
TableName = item.Name,
EntityName = item.Name.ToLineConvertHump()
};
if (item.Schema.Contains(".MiaoYuChat"))
{
item.Schema = item.Schema.Replace(".MiaoYuChat", "");
lowCodeTable.Schema = item.Schema;
lowCodeTable.DataBase = "MiaoYuChat";
}
insertList.Add(lowCodeTable);
}
else
{
id = table.Id;
if (item.Schema.Contains(".MiaoYuChat"))
{
item.Schema = item.Schema.Replace(".MiaoYuChat", "");
table.Schema = item.Schema;
table.DataBase = "MiaoYuChat";
}
updateList.Add(table);
}

2
admin-server/MiaoYu.Api.Admin/MiaoYu.Api.Admin.xml
View File

@ -627,7 +627,7 @@
数据库表服务
</summary>
</member>
<member name="M:MiaoYu.Api.Admin.ApplicationServices.DevelopmentTools.LowCode.Impl.DatabaseTableService.#ctor(Microsoft.Extensions.Caching.Memory.IMemoryCache,HZY.Framework.Repository.EntityFramework.IRepository{MiaoYu.Repository.Admin.Entities.LowCode.LowCodeTable},HZY.Framework.Repository.EntityFramework.IRepository{MiaoYu.Repository.Admin.Entities.LowCode.LowCodeTableInfo})">
<member name="M:MiaoYu.Api.Admin.ApplicationServices.DevelopmentTools.LowCode.Impl.DatabaseTableService.#ctor(Microsoft.Extensions.Caching.Memory.IMemoryCache,HZY.Framework.Repository.EntityFramework.IRepository{MiaoYu.Repository.Admin.Entities.LowCode.LowCodeTable},HZY.Framework.Repository.EntityFramework.IRepository{MiaoYu.Repository.Admin.Entities.LowCode.LowCodeTableInfo},HZY.Framework.Repository.EntityFramework.IRepository{MiaoYu.Repository.ChatAI.Admin.Entities.T_Image_Config})">
<summary>
</summary>

2
admin-server/MiaoYu.Api.Admin/wwwroot/code_generation/template/tempController.cshtml
View File

@ -6,7 +6,7 @@
<pre>
using @(Model.Namespace).Api.Admin.ApplicationServices.Apps;
using @(Model.Namespace).Repository.EntityFramework.Admin.Entities.Apps;
using @(Model.Namespace).@(Model.DataBase == "MiaoYuChat" ? "Repository.ChatAI.Admin.Entities.Apps;" : "Repository.EntityFramework.Admin.Entities.Apps;");
namespace @(Model.Namespace).Api.Admin.Controllers.Apps;
/// <summary>

10
admin-server/MiaoYu.Api.Admin/wwwroot/code_generation/template/tempModel.cshtml
View File

@ -11,7 +11,8 @@
"LastModifierUserId" ,
"DeletionTime",
"DeleterUserId",
"IsDeleted"
"IsDeleted",
"TenantId",
};
var tableInfos = Model.TableInfos
@ -68,6 +69,10 @@
{
var lowCodeTableInfo = Model.TableInfos.Where(w => w.ColumnName == "Id")?.FirstOrDefault();
if (Model.DataBase == "MiaoYuChat")
{
return "DefaultEntityV4";
}
if (lowCodeTableInfo == null) return "DefaultEntity";
if (lowCodeTableInfo.CsType.ToLower().Contains("string"))
@ -86,7 +91,8 @@
}
<pre>
namespace @(Model.Namespace).Repository.EntityFramework.Admin.Entities.Apps;
namespace @(Model.Namespace).@(Model.DataBase == "MiaoYuChat" ? "Repository.ChatAI.Admin.Entities.Apps;" : "Repository.EntityFramework.Admin.Entities.Apps;")
/// <summary>
/// @(string.IsNullOrWhiteSpace(classNameRemark) ? className : classNameRemark)

2
admin-server/MiaoYu.Api.Admin/wwwroot/code_generation/template/tempService.cshtml
View File

@ -32,7 +32,7 @@
}
}
<pre>
using @(Model.Namespace).Repository.EntityFramework.Admin.Entities.Apps;
using @(Model.Namespace).@(Model.DataBase == "MiaoYuChat" ? "Repository.ChatAI.Admin.Entities.Apps;" : "Repository.EntityFramework.Admin.Entities.Apps;")
namespace @(Model.Namespace).Api.Admin.ApplicationServices.Apps;
/// <summary>

5
admin-server/MiaoYu.Repository.Admin/Entities/LowCode/LowCodeTable.cs
View File

@ -11,6 +11,11 @@ public class LowCodeTable : DefaultEntity
/// </summary>
public string? Schema { get; set; }
/// <summary>
/// 所属数据库
/// </summary>
public string? DataBase { get; set; }
/// <summary>
/// 类型
/// </summary>

5
admin-server/MiaoYu.Repository.Admin/MiaoYu.Repository.Admin.xml
View File

@ -344,6 +344,11 @@
</summary>
</member>
<member name="P:MiaoYu.Repository.Admin.Entities.LowCode.LowCodeTable.DataBase">
<summary>
所属数据库
</summary>
</member>
<member name="P:MiaoYu.Repository.Admin.Entities.LowCode.LowCodeTable.Type">
<summary>
类型

5
admin-server/MiaoYu.Repository.Admin/Migrations/AdminDbContextModelSnapshot.cs
View File

@ -1,6 +1,8 @@
// <auto-generated />
using System;
using MiaoYu.Repository.Admin;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Metadata;
@ -388,7 +390,8 @@ namespace MiaoYu.Repository.Admin.Migrations
b.Property<string>("Schema")
.HasColumnType("nvarchar(max)");
b.Property<string>("DataBase")
.HasColumnType("nvarchar(100)");
b.Property<string>("ServicePath")
.HasColumnType("nvarchar(max)");

10
admin-server/MiaoYu.Repository.ChatAI.Admin/Migrations/ChatAdminDbContextModelSnapshot.cs
View File

@ -1,11 +1,7 @@
using MiaoYu.Repository.ChatAI.Admin.Entities;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

using MiaoYu.Repository.ChatAI.Admin.Entities;
#nullable disable
namespace MiaoYu.Repository.ChatAI.Admin.Migrations
{
[DbContext(typeof(ChatAdminDbContext))]

9
admin-server/MiaoYu.WinFormDemo/appsettings.Development.json
View File

@ -7,13 +7,14 @@
// pi计算 数据库管理
"AdminRepositoryOptions": {
//默认数据库类型 SqlServer 、MySql 、PostgreSql、Oracle
"DefaultDatabaseType": "MySql",
"DefaultDatabaseType": "SqlServer",
//是否监控EFCore程序
"IsMonitorEFCore": false,
"IsMonitorEFCore": true,
// 连接字符串 - mysql
"ConnectionString": "Server=localhost; port=3306; Database=hzy_admin_mysql_20230227; uid=root; pwd=123456; Convert Zero Datetime=False"
//"ConnectionString": "Server=localhost; port=3306; Database=hzy_admin_mysql_20230227; uid=root; pwd=123456; Convert Zero Datetime=False"
//// 连接字符串 - sqlserver
//"ConnectionString": "Server=.;Database=hzy_microservices_sqlserver_20230227;User ID=sa;Password=123456;MultipleActiveResultSets=true;Encrypt=True;TrustServerCertificate=True;",
//"ConnectionString": "Server=192.168.195.2;Database=MiaoYu;User ID=zpc;Password=zpc;MultipleActiveResultSets=true;Encrypt=True;TrustServerCertificate=True;",
"ConnectionString": "Server=192.168.195.2;Database=HZY;User ID=zpc;Password=zpc;MultipleActiveResultSets=true;Encrypt=True;TrustServerCertificate=True;"
//// 连接字符串 - postgresql
//"ConnectionString": "User ID=postgres;Password=123456;Host=localhost;Port=5432;Database=hzy_microservices_pgsql_20230227;Pooling=true;TimeZone=Asia/Shanghai",
//// 连接字符串 - oracle

9
admin-server/MiaoYu.WinFormDemo/appsettings.Production.json
View File

@ -7,13 +7,14 @@
// pi计算 数据库管理
"AdminRepositoryOptions": {
//默认数据库类型 SqlServer 、MySql 、PostgreSql、Oracle
"DefaultDatabaseType": "MySql",
"DefaultDatabaseType": "SqlServer",
//是否监控EFCore程序
"IsMonitorEFCore": false,
"IsMonitorEFCore": true,
// 连接字符串 - mysql
"ConnectionString": "Server=localhost; port=3306; Database=hzy_admin_mysql_20230227; uid=root; pwd=123456; Convert Zero Datetime=False"
//"ConnectionString": "Server=localhost; port=3306; Database=hzy_admin_mysql_20230227; uid=root; pwd=123456; Convert Zero Datetime=False"
//// 连接字符串 - sqlserver
//"ConnectionString": "Server=.;Database=hzy_microservices_sqlserver_20230227;User ID=sa;Password=123456;MultipleActiveResultSets=true;Encrypt=True;TrustServerCertificate=True;",
//"ConnectionString": "Server=192.168.195.2;Database=MiaoYu;User ID=zpc;Password=zpc;MultipleActiveResultSets=true;Encrypt=True;TrustServerCertificate=True;",
"ConnectionString": "Server=192.168.195.2;Database=HZY;User ID=zpc;Password=zpc;MultipleActiveResultSets=true;Encrypt=True;TrustServerCertificate=True;"
//// 连接字符串 - postgresql
//"ConnectionString": "User ID=postgres;Password=123456;Host=localhost;Port=5432;Database=hzy_microservices_pgsql_20230227;Pooling=true;TimeZone=Asia/Shanghai",
//// 连接字符串 - oracle