Browse Source

调整PDF相关API

zhouj1203@hotmail.com 3 years ago
parent
commit
9ee9eeb834

+ 1 - 1
TEAMModelOS.FunctionV4/ServiceBus/ActiveTaskTopic.cs

@@ -760,7 +760,7 @@ namespace TEAMModelOS.FunctionV4.ServiceBus
                                                         <td> 已完成 </td >
                                                     </tr> ");
                     }
-                    string blob = await StudyService.GenPdf(id, areaId, cname, sname, gname, stringBuilder.ToString(), _converter, _azureStorage);
+                    await StudyService.GenPdf(id, areaId, cname, sname, gname, stringBuilder.ToString(), _converter, _azureStorage,_dingDing);
                 }
 
 

+ 3 - 5
TEAMModelOS.SDK/Models/Service/StudyService.cs

@@ -13,7 +13,7 @@ namespace TEAMModelOS.SDK.Models.Service
 {
     public static class StudyService
     {
-        public static async Task<string> GenPdf(string tId,string areaId, string cname,string sname,string gname,string details, IConverter _converter, AzureStorageFactory _azureStorage)
+        public static async Task GenPdf(string tId,string areaId, string cname,string sname,string gname,string details, IConverter _converter, AzureStorageFactory _azureStorage,DingDing _dingDing)
         {
             //https://article.itxueyuan.com/JAxOnG
             //http://t.zoukankan.com/hsiang-p-14608694.html
@@ -54,11 +54,9 @@ namespace TEAMModelOS.SDK.Models.Service
                     Objects = { objectSettings },
                 };
                 var a = _converter.Convert(htmlToPdfDocument);
-                MemoryStream m = new MemoryStream(a);
+                MemoryStream m = new(a);
                 tasks.Add(_azureStorage.UploadFileByContainer("teammodelos", m, $"{areaId}", $"{tId}/offline-report.pdf", false));
                 await Task.WhenAll(tasks);
-                string aa = "";
-                return aa;
                 /* FileStream fs = new FileStream("F:\\1111111111111\\SimplePdf1.pdf", FileMode.Create, FileAccess.Write, FileShare.Read);
                  m.WriteTo(fs);
                  m.Close();
@@ -85,7 +83,7 @@ namespace TEAMModelOS.SDK.Models.Service
             }
             catch (Exception ex)
             {
-                return "";
+                await _dingDing.SendBotMsg($"{Environment.GetEnvironmentVariable("Option:Location")}-StudyService,GenPdf()\n{ex.Message}\n{ex.StackTrace}", GroupNames.成都开发測試群組);
             }
         }
     }