diff --git a/ZR.Admin.WebApi/Controllers/CodeGeneratorController.cs b/ZR.Admin.WebApi/Controllers/CodeGeneratorController.cs
index 83c32a1..e4ba737 100644
--- a/ZR.Admin.WebApi/Controllers/CodeGeneratorController.cs
+++ b/ZR.Admin.WebApi/Controllers/CodeGeneratorController.cs
@@ -7,6 +7,7 @@ using System.Linq;
using System.Threading.Tasks;
using ZR.Model;
using ZR.Model.CodeGenerator;
+using ZR.Model.Vo;
using ZR.Service.IService;
using ZR.Service.System;
@@ -43,18 +44,30 @@ namespace ZR.Admin.WebApi.Controllers
///
/// 数据库名
/// 表名
- /// 分页信息
+ /// 分页信息
///
[HttpGet("FindListTable")]
- public IActionResult FindListTable(string enCode, string keywords, PagerInfo pagerInfo)
+ public IActionResult FindListTable(string enCode, string keywords, PagerInfo pager)
{
if (string.IsNullOrEmpty(enCode))
{
return ToRespose(ResultCode.PARAM_ERROR);
}
- List listTable = CodeGeneratorService.GetTablesWithPage(keywords, enCode, pagerInfo);
+ List list = CodeGeneratorService.GetTablesWithPage(keywords, enCode, pager);
+ var vm = new VMPageResult(list, pager);
- return SUCCESS(listTable);
+ return SUCCESS(vm);
+ }
+
+ ///
+ /// 生成代码
+ ///
+ ///
+ [HttpGet("Generate")]
+ public IActionResult Generate()
+ {
+
+ return SUCCESS(null);
}
}
}
diff --git a/ZR.Repository/DbProvider/SugarDbContext.cs b/ZR.Repository/DbProvider/SugarDbContext.cs
index 67ec657..2aa9b4e 100644
--- a/ZR.Repository/DbProvider/SugarDbContext.cs
+++ b/ZR.Repository/DbProvider/SugarDbContext.cs
@@ -27,6 +27,7 @@ namespace ZR.Repository.DbProvider
{
connStr = NETCore.Encrypt.EncryptProvider.DESDecrypt(connStr, dbKey);
}
+
Db = new SqlSugarClient(new List()
{
new ConnectionConfig(){
diff --git a/ZR.Repository/System/CodeGeneratorRepository.cs b/ZR.Repository/System/CodeGeneratorRepository.cs
index 4e9fedb..7455f89 100644
--- a/ZR.Repository/System/CodeGeneratorRepository.cs
+++ b/ZR.Repository/System/CodeGeneratorRepository.cs
@@ -10,7 +10,7 @@ using ZR.Model.CodeGenerator;
namespace ZR.Repository.System
{
[AppService(ServiceLifetime = LifeTime.Transient)]
- public class CodeGeneratorRepository: BaseRepository
+ public class CodeGeneratorRepository : BaseRepository
{
///
/// 获取数据库信息
@@ -24,11 +24,22 @@ namespace ZR.Repository.System
///
/// 获取所有的表
///
+ ///
+ ///
+ ///
///
- public List GetAllTables(string dbName)
+ public List GetAllTables(string dbName, string tableName, PagerInfo pager)
{
- string sql = $"SELECT name as TableName FROM {dbName}..SysObjects Where XType='U' ORDER BY Name";
- return Db.Ado.SqlQuery(sql, new { dbName});
+ string sql = $"SELECT name as TableName FROM {dbName}..SysObjects Where XType='U'";
+ int total = 0;
+ var list = Db.SqlQueryable(sql)
+ //.WithCache(60 * 10)
+ .WhereIF(!string.IsNullOrEmpty(tableName), it => it.TableName.Contains(tableName))
+ .AddParameters(new { dbName })
+ .OrderBy(x => x.TableName)
+ .ToPageList(pager.PageNum, pager.PageSize, ref total);
+ pager.TotalNum = total;
+ return list;
}
}
}
diff --git a/ZR.Service/System/CodeGeneratorService.cs b/ZR.Service/System/CodeGeneratorService.cs
index 2a8b4f7..c6b9112 100644
--- a/ZR.Service/System/CodeGeneratorService.cs
+++ b/ZR.Service/System/CodeGeneratorService.cs
@@ -43,22 +43,22 @@ namespace ZR.Service.System
return list;
}
- public List GetTablesWithPage(string tablename, string dbName, PagerInfo info)
+ public List GetTablesWithPage(string tablename, string dbName, PagerInfo pager)
{
var dbType = ConfigUtils.Instance.GetConfig("CodeGenDbType");
List list = new List();
if (dbType == "1")
{
- list = CodeGeneratorRepository.GetAllTables(dbName);
+ list = CodeGeneratorRepository.GetAllTables(dbName, tablename, pager);
}
else if (dbType.Contains("MySql"))
{
//list = mysqlExtractor.GetAllTables(this.dbName, tablename, fieldNameToSort, isDescending, info);
}
- if (!string.IsNullOrEmpty(tablename))
- {
- list = list.Where(f => f.TableName.Contains(tablename)).ToList();
- }
+ //if (!string.IsNullOrEmpty(tablename))
+ //{
+ // list = list.Where(f => f.TableName.Contains(tablename)).ToList();
+ //}
return list;
}
diff --git a/ZR.Vue/src/views/tool/index.vue b/ZR.Vue/src/views/tool/index.vue
index 56a51b4..572bb82 100644
--- a/ZR.Vue/src/views/tool/index.vue
+++ b/ZR.Vue/src/views/tool/index.vue
@@ -46,12 +46,12 @@
查询
-
-
+
+
-
+
@@ -129,7 +129,7 @@ export default {
},
],
tableData: [],
- tableloading: true,
+ tableloading: false,
pagination: {
pageNum: 1,
pagesize: 20,
@@ -146,7 +146,7 @@ export default {
created() {
this.pagination.pageNum = 1;
this.loadData();
- this.loadTableData();
+ // this.loadTableData();
},
methods: {
loadData: function () {
@@ -169,7 +169,7 @@ export default {
// Sort: this.sortableData.sort,
};
codeGetTableList(seachdata).then((res) => {
- this.tableData = res.data;
+ this.tableData = res.data.result;
this.pagination.pageTotal = res.data.totalNum;
this.tableloading = false;
});
@@ -179,6 +179,7 @@ export default {
* 点击查询
*/
handleSearch: function () {
+ this.tableloading = true;
this.pagination.pageNum = 1;
this.loadTableData();
},
@@ -230,20 +231,15 @@ export default {
};
codeGenerator(seachdata)
.then((res) => {
- if (res.Success) {
+ if (res.code == 100) {
downloadFile(
defaultSettings.fileUrl + res.ResData[0],
res.ResData[1]
);
- this.$message({
- message: "恭喜你，代码生成完成！",
- type: "success",
- });
+
+ this.msgSuccess("恭喜你，代码生成完成！");
} else {
- this.$message({
- message: res.ErrMsg,
- type: "error",
- });
+ this.msgError(res.msg);
}
pageLoading.close();
})
diff --git a/ZRAdmin.xml b/ZRAdmin.xml
index 974524e..1ca6464 100644
--- a/ZRAdmin.xml
+++ b/ZRAdmin.xml
@@ -44,9 +44,15 @@
数据库名
表名
- 分页信息
+ 分页信息
+
+
+ 生成代码
+
+
+
心跳