修复生成

Controllers/Admin/DatabaseFieldController.cs

@@ -159,9 +159,7 @@ namespace Controllers.Admin
         public IActionResult makeDatabaseField([FromBody] MakeDatabaseFieldDto param)
         {
             TokenModel loginUser = JwtUtil.GetLoginUser(HttpContext);
-            int tableId = param.id.Length > 0 ? param.id[0] : 0;
-            var table = _DatabaseTableService.GetFirst(m => m.id == tableId) ?? new DatabaseTable();
-            string res = _DatabaseFieldService.makeDatabaseField(param, table, loginUser);
+            string res = _DatabaseFieldService.makeDatabaseField(param, new DatabaseTable(), loginUser);
             string id = MakeHelper.Instance.DoQueue(res);
             Dictionary<string, object> dic = new Dictionary<string, object>();
             dic.Add("makeObjectId", id);

Feign/IMake.cs

@@ -10,7 +10,6 @@ namespace Feign
         public static string makeFile(string data)
         {
             string url = Utils.FeignUrl["omega_make"] + "/v1/omega_make/vscode/makeFile";
-            Function.WriteLog("{\"content\":\"" + HttpUtility.UrlEncode(data) + "\"}", "生成文件");
             string content = Function.PostWebRequest(url, "{\"content\":\"" + HttpUtility.UrlEncode(data) + "\"}", "application/json");
             JsonData jsonObj = JsonMapper.ToObject(content);
             if(jsonObj["status"].ToString() == "1")

Services/DatabaseFieldService.cs

@@ -10,6 +10,7 @@ using System.Linq;
 using Common;
 using Custom;
 using Tasks;
+using Infrastructure;
 
 
 namespace Services
@@ -98,15 +99,18 @@ namespace Services
         /// <returns>生成</returns>
         public string makeDatabaseField([FromBody] MakeDatabaseFieldDto param, DatabaseTable table, TokenModel loginUser)
         {
-            string tableName = table.tableName;
             List<int> fieldIds = param.id.ToList();
             List<DatabaseField> fields = GetList(m => fieldIds.Contains(m.id));
+            int tableId = fields.Count > 0 ? fields[0].tableId : 0;
+            var _DatabaseTableService = App.GetService<IDatabaseTableService>();
+            table = _DatabaseTableService.GetFirst(m => m.id == tableId) ?? new DatabaseTable();
+            string tableName = table.tableName;
 
             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("databaseField", fields);
             pushData.Add("opType", "add");
             pushData.Add("tableName", tableName);
-            pushData.Add("databaseField", fields);
             pushData.Add("fileName", Function.MD5_16(string.Join(",", param.id)));
             return MakeHelper.Make(pushData, "dbField", "dbField", loginUser);
         }

Task/MakeHelper.cs

@@ -112,8 +112,8 @@ namespace Tasks
             attach.Add("versionNo", versionNo);
             makeData.attach = Newtonsoft.Json.JsonConvert.SerializeObject(attach);
             makeData.data = pushData;
-            
-            return IMake.makeFile( Newtonsoft.Json.JsonConvert.SerializeObject(makeData));
+            RedisServer.Cache.Set("MakeData:" + requestId, Newtonsoft.Json.JsonConvert.SerializeObject(makeData), TimeSpan.FromMinutes(5));
+            return IMake.makeFile( requestId);
         }
 
     }