lichunlei 3 ماه پیش
والد
کامیت
9e14811aec

+ 2 - 0
Controllers/Admin/DatabaseMakeLogController.cs

@@ -5,6 +5,7 @@ using Services;
 using Model.Base;
 using Model.Base;
 using Vo.Admin;
 using Vo.Admin;
 using Mapster;
 using Mapster;
+using Common;
 
 
 
 
 namespace Controllers.Admin
 namespace Controllers.Admin
@@ -53,6 +54,7 @@ namespace Controllers.Admin
         [Route("/v1/omega_source/DatabaseMakeLog/getDatabaseMakeLogQuery")]
         [Route("/v1/omega_source/DatabaseMakeLog/getDatabaseMakeLogQuery")]
         public IActionResult getDatabaseMakeLogQuery([FromQuery] DatabaseMakeLog param)
         public IActionResult getDatabaseMakeLogQuery([FromQuery] DatabaseMakeLog param)
         {
         {
+            Function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(param), "查询数据库生成日志详情");
             var response = _DatabaseMakeLogService.getDatabaseMakeLogQuery(param).Adapt<GetDatabaseMakeLogQueryVo>();
             var response = _DatabaseMakeLogService.getDatabaseMakeLogQuery(param).Adapt<GetDatabaseMakeLogQueryVo>();
             return SUCCESS(response);
             return SUCCESS(response);
         }
         }

+ 1 - 1
Model/Dto/Admin/MakeDatabaseFieldDto.cs

@@ -12,7 +12,7 @@ namespace Dto.Admin
         /// <summary>
         /// <summary>
         /// 字段ID
         /// 字段ID
         /// </summary>
         /// </summary>
-        public int[] id { get; set; }
+        public string id { get; set; }
 
 
 
 
 
 

+ 1 - 1
Model/Dto/Admin/MakeDatabaseTableDto.cs

@@ -12,7 +12,7 @@ namespace Dto.Admin
         /// <summary>
         /// <summary>
         /// 表ID
         /// 表ID
         /// </summary>
         /// </summary>
-        public int[] id { get; set; }
+        public string id { get; set; }
 
 
 
 
 
 

+ 1 - 1
Model/Vo/Admin/GetDatabaseMakeLogListVo.cs

@@ -10,7 +10,7 @@ namespace Vo.Admin
         /// <summary>
         /// <summary>
         /// ID
         /// ID
         /// </summary>
         /// </summary>
-        public long id { get; set; }
+        public string id { get; set; }
 
 
 
 
         /// <summary>
         /// <summary>

+ 2 - 1
Services/DatabaseFieldService.cs

@@ -99,7 +99,7 @@ namespace Services
         public void makeDatabaseField([FromBody] MakeDatabaseFieldDto param, DatabaseTable table, TokenModel loginUser)
         public void makeDatabaseField([FromBody] MakeDatabaseFieldDto param, DatabaseTable table, TokenModel loginUser)
         {
         {
             string tableName = table.tableName;
             string tableName = table.tableName;
-            List<int> fieldIds = param.id.ToList();
+            List<int> fieldIds = Tools.SpitIntArrary(param.id.Replace("[", "").Replace("]", "")).ToList();
             List<DatabaseField> fields = GetList(m => fieldIds.Contains(m.id));
             List<DatabaseField> fields = GetList(m => fieldIds.Contains(m.id));
 
 
             Dictionary<string, object> pushData = new Dictionary<string, object>();pushData.Add("since", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
             Dictionary<string, object> pushData = new Dictionary<string, object>();pushData.Add("since", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
@@ -107,6 +107,7 @@ namespace Services
             pushData.Add("opType", "add");
             pushData.Add("opType", "add");
             pushData.Add("tableName", tableName);
             pushData.Add("tableName", tableName);
             pushData.Add("databaseField", fields);
             pushData.Add("databaseField", fields);
+            pushData.Add("fileName", Function.MD5_16(param.id));
             MakeHelper.Push(pushData, "dbField", "dbField", loginUser);
             MakeHelper.Push(pushData, "dbField", "dbField", loginUser);
         }
         }
     }
     }

+ 2 - 1
Services/DatabaseTableService.cs

@@ -199,7 +199,7 @@ namespace Services
         /// <returns>生成</returns>
         /// <returns>生成</returns>
         public void makeDatabaseTable([FromBody] MakeDatabaseTableDto param, TokenModel loginUser)
         public void makeDatabaseTable([FromBody] MakeDatabaseTableDto param, TokenModel loginUser)
         {
         {
-            List<int> tableIds = param.id.ToList();
+            List<int> tableIds = Tools.SpitIntArrary(param.id.Replace("[", "").Replace("]", "")).ToList();
             List<DatabaseTable> tables = GetList(m => tableIds.Contains(m.id));
             List<DatabaseTable> tables = GetList(m => tableIds.Contains(m.id));
             foreach(DatabaseTable table in tables)
             foreach(DatabaseTable table in tables)
             {
             {
@@ -208,6 +208,7 @@ namespace Services
 
 
             Dictionary<string, object> pushData = new Dictionary<string, object>();pushData.Add("since", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
             Dictionary<string, object> pushData = new Dictionary<string, object>();pushData.Add("since", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
             pushData.Add("author", loginUser.username);
             pushData.Add("author", loginUser.username);
+            pushData.Add("fileName", Function.MD5_16(param.id));
             pushData.Add("databaseTable", tables);
             pushData.Add("databaseTable", tables);
             MakeHelper.Push(pushData, "dbTable", "dbTable", loginUser);
             MakeHelper.Push(pushData, "dbTable", "dbTable", loginUser);
         }
         }