Skip to content

Commit 64b567b

Browse files
hudingwenhudingwen
committed
DBFirst代码生成 缩进优化
1 parent 780d220 commit 64b567b

3 files changed

Lines changed: 136 additions & 95 deletions

File tree

‎Blog.Core.Api/Blog.Core.xml‎

Lines changed: 19 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Blog.Core.Api/Controllers/DbFirst/DbFirstController.cs‎

Lines changed: 51 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public DbFirstController(ISqlSugarClient sqlSugarClient, IWebHostEnvironment env
2828
}
2929

3030
/// <summary>
31-
/// 获取 整体框架 文件
31+
/// 获取 整体框架 文件(主库)(一般可用第一次生成)
3232
/// </summary>
3333
/// <returns></returns>
3434
[HttpGet]
@@ -64,8 +64,7 @@ public MessageModel<string> GetFrameFiles()
6464
}
6565

6666
/// <summary>
67-
/// 根据数据库表名 生成整体框架
68-
/// 仅针对通过CodeFirst生成表的情况
67+
/// 获取仓储层和服务层(需指定表名和数据库)
6968
/// </summary>
7069
/// <param name="ConnID">数据库链接名称</param>
7170
/// <param name="tableNames">需要生成的表名</param>
@@ -79,7 +78,6 @@ public MessageModel<string> GetFrameFilesByTableNames([FromBody]string[] tableNa
7978
var data = new MessageModel<string>() { success = true, msg = "" };
8079
if (Env.IsDevelopment())
8180
{
82-
8381
data.response += $"库{ConnID}-IRepositorys层生成：{FrameSeed.CreateIRepositorys(_sqlSugarClient, ConnID, isMuti, tableNames)} || ";
8482
data.response += $"库{ConnID}-IServices层生成：{FrameSeed.CreateIServices(_sqlSugarClient, ConnID, isMuti, tableNames)} || ";
8583
data.response += $"库{ConnID}-Repository层生成：{FrameSeed.CreateRepository(_sqlSugarClient, ConnID, isMuti, tableNames)} || ";
@@ -93,9 +91,57 @@ public MessageModel<string> GetFrameFilesByTableNames([FromBody]string[] tableNa
9391

9492
return data;
9593
}
94+
/// <summary>
95+
/// 获取实体(需指定表名和数据库)
96+
/// </summary>
97+
/// <param name="ConnID">数据库链接名称</param>
98+
/// <param name="tableNames">需要生成的表名</param>
99+
/// <returns></returns>
100+
[HttpPost]
101+
public MessageModel<string> GetFrameFilesByTableNamesForEntity([FromBody] string[] tableNames, [FromQuery] string ConnID = null)
102+
{
103+
ConnID = ConnID == null ? MainDb.CurrentDbConnId.ToLower() : ConnID;
104+
105+
var isMuti = Appsettings.app(new string[] { "MutiDBEnabled" }).ObjToBool();
106+
var data = new MessageModel<string>() { success = true, msg = "" };
107+
if (Env.IsDevelopment())
108+
{
109+
data.response += $"库{ConnID}-Models层生成：{FrameSeed.CreateModels(_sqlSugarClient, ConnID, isMuti, tableNames)}";
110+
}
111+
else
112+
{
113+
data.success = false;
114+
data.msg = "当前不处于开发模式，代码生成不可用！";
115+
}
116+
return data;
117+
}
118+
/// <summary>
119+
/// 获取控制器(需指定表名和数据库)
120+
/// </summary>
121+
/// <param name="ConnID">数据库链接名称</param>
122+
/// <param name="tableNames">需要生成的表名</param>
123+
/// <returns></returns>
124+
[HttpPost]
125+
public MessageModel<string> GetFrameFilesByTableNamesForController([FromBody] string[] tableNames, [FromQuery] string ConnID = null)
126+
{
127+
ConnID = ConnID == null ? MainDb.CurrentDbConnId.ToLower() : ConnID;
128+
129+
var isMuti = Appsettings.app(new string[] { "MutiDBEnabled" }).ObjToBool();
130+
var data = new MessageModel<string>() { success = true, msg = "" };
131+
if (Env.IsDevelopment())
132+
{
133+
data.response += $"库{ConnID}-Controllers层生成：{FrameSeed.CreateControllers(_sqlSugarClient, ConnID, isMuti, tableNames)}";
134+
}
135+
else
136+
{
137+
data.success = false;
138+
data.msg = "当前不处于开发模式，代码生成不可用！";
139+
}
140+
return data;
141+
}
96142

97143
/// <summary>
98-
/// DbFrist 根据数据库表名 生成整体框架,包含Model层
144+
/// DbFrist 根据数据库表名 生成整体框架,包含Model层(一般可用第一次生成)
99145
/// </summary>
100146
/// <param name="ConnID">数据库链接名称</param>
101147
/// <param name="tableNames">需要生成的表名</param>

‎Blog.Core.Model/Seed/FrameSeed.cs‎

Lines changed: 66 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,8 @@ public class FrameSeed
2020
/// <returns></returns>
2121
public static bool CreateControllers(SqlSugarClient sqlSugarClient, string ConnId = null, bool isMuti = false, string[] tableNames = null)
2222
{
23-
24-
2523
Create_Controller_ClassFileByDBTalbe(sqlSugarClient, ConnId, $@"C:\my-file\Blog.Core.Api.Controllers", "Blog.Core.Api.Controllers", tableNames, "", isMuti);
2624
return true;
27-
28-
2925
}
3026

3127
/// <summary>
@@ -38,12 +34,8 @@ public static bool CreateControllers(SqlSugarClient sqlSugarClient, string ConnI
3834
/// <returns></returns>
3935
public static bool CreateModels(SqlSugarClient sqlSugarClient, string ConnId, bool isMuti = false, string[] tableNames = null)
4036
{
41-
42-
4337
Create_Model_ClassFileByDBTalbe(sqlSugarClient, ConnId, $@"C:\my-file\Blog.Core.Model", "Blog.Core.Model.Models", tableNames, "", isMuti);
4438
return true;
45-
46-
4739
}
4840

4941
/// <summary>
@@ -56,12 +48,8 @@ public static bool CreateModels(SqlSugarClient sqlSugarClient, string ConnId, bo
5648
/// <returns></returns>
5749
public static bool CreateIRepositorys(SqlSugarClient sqlSugarClient, string ConnId, bool isMuti = false, string[] tableNames = null)
5850
{
59-
60-
6151
Create_IRepository_ClassFileByDBTalbe(sqlSugarClient, ConnId, $@"C:\my-file\Blog.Core.IRepository", "Blog.Core.IRepository", tableNames, "", isMuti);
6252
return true;
63-
64-
6553
}
6654

6755

@@ -76,11 +64,8 @@ public static bool CreateIRepositorys(SqlSugarClient sqlSugarClient, string Conn
7664
/// <returns></returns>
7765
public static bool CreateIServices(SqlSugarClient sqlSugarClient, string ConnId, bool isMuti = false, string[] tableNames = null)
7866
{
79-
80-
8167
Create_IServices_ClassFileByDBTalbe(sqlSugarClient, ConnId, $@"C:\my-file\Blog.Core.IServices", "Blog.Core.IServices", tableNames, "", isMuti);
8268
return true;
83-
8469
}
8570

8671

@@ -95,8 +80,6 @@ public static bool CreateIServices(SqlSugarClient sqlSugarClient, string ConnId,
9580
/// <returns></returns>
9681
public static bool CreateRepository(SqlSugarClient sqlSugarClient, string ConnId, bool isMuti = false, string[] tableNames = null)
9782
{
98-
99-
10083
Create_Repository_ClassFileByDBTalbe(sqlSugarClient, ConnId, $@"C:\my-file\Blog.Core.Repository", "Blog.Core.Repository", tableNames, "", isMuti);
10184
return true;
10285
}
@@ -113,11 +96,8 @@ public static bool CreateRepository(SqlSugarClient sqlSugarClient, string ConnId
11396
/// <returns></returns>
11497
public static bool CreateServices(SqlSugarClient sqlSugarClient, string ConnId, bool isMuti = false, string[] tableNames = null)
11598
{
116-
117-
11899
Create_Services_ClassFileByDBTalbe(sqlSugarClient, ConnId, $@"C:\my-file\Blog.Core.Services", "Blog.Core.Services", tableNames, "", isMuti);
119100
return true;
120-
121101
}
122102

123103

@@ -168,10 +148,10 @@ namespace " + strNameSpace + @"
168148
[ApiController]
169149
[Authorize(Permissions.Name)]
170150
public class {ClassName}Controller : ControllerBase
171-
{
172-
/// <summary>
173-
/// 服务器接口，因为是模板生成，所以首字母是大写的，自己可以重构下
174-
/// </summary>
151+
{
152+
/// <summary>
153+
/// 服务器接口，因为是模板生成，所以首字母是大写的，自己可以重构下
154+
/// </summary>
175155
private readonly I{ClassName}Services _{ClassName}Services;
176156
177157
public {ClassName}Controller(I{ClassName}Services {ClassName}Services)
@@ -196,77 +176,77 @@ public class {ClassName}Controller : ControllerBase
196176
response = await _{ClassName}Services.QueryPage(whereExpression, page, intPageSize)
197177
};
198178
199-
}
200-
201-
[HttpGet(""{id}"")]
202-
public async Task<MessageModel<{ClassName}>> Get(int id = 0)
203-
{
204-
return new MessageModel<{ClassName}>()
205-
{
206-
msg = ""获取成功"",
207-
success = true,
208-
response = await _{ClassName}Services.QueryById(id)
209-
};
210-
}
211-
212-
[HttpPost]
213-
public async Task<MessageModel<string>> Post([FromBody] {ClassName} request)
214-
{
215-
var data = new MessageModel<string>();
216-
217-
var id = await _{ClassName}Services.Add(request);
218-
data.success = id > 0;
219-
220-
if (data.success)
221-
{
222-
data.response = id.ObjToString();
223-
data.msg = ""添加成功"";
224-
}
225-
226-
return data;
227-
}
179+
}
228180
229-
[HttpPut]
230-
public async Task<MessageModel<string>> Put([FromBody] {ClassName} request)
231-
{
232-
var data = new MessageModel<string>();
233-
if (request.id > 0)
234-
{
235-
data.success = await _{ClassName}Services.Update(request);
236-
if (data.success)
181+
[HttpGet(""{id}"")]
182+
public async Task<MessageModel<{ClassName}>> Get(int id = 0)
237183
{
238-
data.msg = ""更新成功"";
239-
data.response = request?.id.ObjToString();
184+
return new MessageModel<{ClassName}>()
185+
{
186+
msg = ""获取成功"",
187+
success = true,
188+
response = await _{ClassName}Services.QueryById(id)
189+
};
240190
}
241-
}
242191
243-
return data;
244-
}
192+
[HttpPost]
193+
public async Task<MessageModel<string>> Post([FromBody] {ClassName} request)
194+
{
195+
var data = new MessageModel<string>();
245196
246-
[HttpDelete(""{id}"")]
247-
public async Task<MessageModel<string>> Delete(int id = 0)
248-
{
249-
var data = new MessageModel<string>();
250-
if (id > 0)
251-
{
252-
var detail = await _{ClassName}Services.QueryById(id);
197+
var id = await _{ClassName}Services.Add(request);
198+
data.success = id > 0;
253199
254-
detail.IsDeleted = true;
200+
if (data.success)
201+
{
202+
data.response = id.ObjToString();
203+
data.msg = ""添加成功"";
204+
}
205+
206+
return data;
207+
}
255208
256-
if (detail != null)
209+
[HttpPut]
210+
public async Task<MessageModel<string>> Put([FromBody] {ClassName} request)
211+
{
212+
var data = new MessageModel<string>();
213+
if (request.id > 0)
257214
{
258-
data.success = await _{ClassName}Services.Update(detail);
215+
data.success = await _{ClassName}Services.Update(request);
259216
if (data.success)
260217
{
261-
data.msg = ""删除成功"";
262-
data.response = detail?.id.ObjToString();
218+
data.msg = ""更新成功"";
219+
data.response = request?.id.ObjToString();
263220
}
264221
}
265-
}
266222
267-
return data;
223+
return data;
224+
}
225+
226+
[HttpDelete(""{id}"")]
227+
public async Task<MessageModel<string>> Delete(int id = 0)
228+
{
229+
var data = new MessageModel<string>();
230+
if (id > 0)
231+
{
232+
var detail = await _{ClassName}Services.QueryById(id);
233+
234+
detail.IsDeleted = true;
235+
236+
if (detail != null)
237+
{
238+
data.success = await _{ClassName}Services.Update(detail);
239+
if (data.success)
240+
{
241+
data.msg = ""删除成功"";
242+
data.response = detail?.id.ObjToString();
243+
}
244+
}
245+
}
246+
247+
return data;
248+
}
268249
}
269-
}
270250
}")
271251

272252
.ToClassStringList(strNameSpace);
@@ -331,13 +311,13 @@ namespace " + strNameSpace + @"
331311
[SugarTable( ""{ClassName}"", """ + ConnId + @""")]" + (blnSerializable ? "\n [Serializable]" : "") + @"
332312
public class {ClassName}" + (string.IsNullOrEmpty(strInterface) ? "" : (" : " + strInterface)) + @"
333313
{
334-
public {ClassName}()
335-
{
336-
}
337-
{PropertyName}
314+
public {ClassName}()
315+
{
316+
}
317+
{PropertyName}
338318
}
339319
}")
340-
.SettingPropertyDescriptionTemplate(p => p = string.Empty)
320+
//.SettingPropertyDescriptionTemplate(p => p = string.Empty)
341321
.SettingPropertyTemplate(p => p =
342322
@"{SugarColumn}
343323
public {PropertyType} {PropertyName} { get; set; }")

0 commit comments

Comments
 (0)