生成回调

Program.cs

@@ -12,6 +12,7 @@ using Nacos.AspNetCore.V2;
 using Util;
 using System.Net;
 using System.Net.Sockets;
+using Tasks;
 
 ThreadPool.SetMinThreads(200, 200);
 var builder = WebApplication.CreateBuilder(args);
@@ -131,7 +132,8 @@ app.Urls.Add("http://*:8005");
 ModelVoAdapt.Map(); //模型字段类型映射配置
 
 RabbitMQClient.Instance.Conn("MakeQueue");
-// MakeHelper.Instance.Start("MakeCallBackQueue");
+RabbitMQClient.Instance.Conn("MakeCallBackQueue");
+MakeHelper.Instance.Start("MakeCallBackQueue");
 
 // CopyData.CopyOldData();
 

Services/DatabaseInfoService.cs

@@ -71,6 +71,8 @@ namespace Services
             pushData.Add("databaseInfo", databaseInfo);
             pushData.Add("databaseTable", tables);
             MakeHelper.Push(pushData, "db", "db", loginUser);
+
+            
         }
 
 

Task/MakeHelper.cs

@@ -33,20 +33,22 @@ namespace Tasks
             }
             catch (Exception ex)
             {
-                Utils.WriteLog(DateTime.Now.ToString() + "\n" + ex, "接收生成SQL回调异常");
+                Utils.WriteLog(DateTime.Now.ToString() + "\n" + ex, "接收生成回调异常");
             }
         }
 
         public void DoQueue(string content)
         {
             string[] array = content.Split(new string[] { "#cut#" }, StringSplitOptions.None);
-            string requestId = array[0];
-            string attach = array[1];
-            string data = array[2];
-            var attachObj = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<string, string>>(attach);
-            if(attachObj["kind"] == "db")
+            string req = array[0];
+            JsonData jsonData = JsonMapper.ToObject(req);
+            string data = array[1];
+            string requestId = jsonData["requestId"].ToString();
+            string attach = jsonData["attach"].ToString();
+            JsonData attachObj = JsonMapper.ToObject(attach);
+            if(attachObj["fileType"].ToString() == "db")
             {
-                int databaseId = int.Parse(attachObj["id"]);
+                int databaseId = int.Parse(jsonData["data"]["databaseInfo"]["id"].ToString());
                 var dbService = App.GetService<IDatabaseInfoService>();
                 var databaseInfo = dbService.GetFirst(m => m.id == databaseId) ?? new DatabaseInfo();
                 var logService = App.GetService<IDatabaseMakeLogService>();
@@ -54,8 +56,8 @@ namespace Tasks
                 {
                     createTime = DateTime.Now,
                     updateTime = DateTime.Now,
-                    createBy = attachObj["operator"],
-                    updateBy = attachObj["operator"],
+                    createBy = attachObj["createBy"].ToString(),
+                    updateBy = attachObj["createBy"].ToString(),
                     makeObject = 1,
                     makeObjectId = databaseId,
                     makeObjectName = databaseInfo.dbName,
@@ -65,7 +67,7 @@ namespace Tasks
         }
 
 
-        public static void Push(Dictionary<string, object> pushData, string modePath, string fileType, TokenModel createBy, string dataId = "0", string versionNo = "0")
+        public static string Push(Dictionary<string, object> pushData, string modePath, string fileType, TokenModel createBy, string dataId = "0", string versionNo = "0")
         { 
             MakeData makeData = new();
             string requestId = DateTime.Now.ToString("yyyyMMddHHmmssfff") + Function.get_Random(8);
@@ -83,6 +85,8 @@ namespace Tasks
             Function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(makeData), "推送生成数据");
             
             RabbitMQClient.Instance.Push("MakeQueue", Newtonsoft.Json.JsonConvert.SerializeObject(makeData));
+
+            return requestId;
         }
 
     }