diff --git a/New_College.Api/Controllers/Front/PcVolunteerController.cs b/New_College.Api/Controllers/Front/PcVolunteerController.cs index 4a8c6ea..3896156 100644 --- a/New_College.Api/Controllers/Front/PcVolunteerController.cs +++ b/New_College.Api/Controllers/Front/PcVolunteerController.cs @@ -257,6 +257,7 @@ namespace New_College.Api.Controllers.Front var firstmodels = planmajordesc.Where(e => e.UniversityName == s.UniversityName).FirstOrDefault(); planmajordesc.Where(ww => planids.Contains(ww.ID)).ToList().ForEach(a => { + string remark = string.IsNullOrWhiteSpace(a.Remark) ? "" : "("+a.Remark + ")"; tableDetailItemsViews.Add(new VolunteerItemsViewMinExcelAttr() { UniversityName = s.UniversityName, @@ -264,7 +265,7 @@ namespace New_College.Api.Controllers.Front AreaName = planstatus ? firstmodels.Province != null ? firstmodels.Province + "|" + (planstatus ? firstmodels.City : "") : "" : "", Nature = planstatus ? firstmodels.Nature != null ? firstmodels.Nature : "" : "", fee = string.IsNullOrEmpty(a.Fee) ? "--" : a.Fee, - Major = a.MajorName, + Major = a.MajorName + remark, MajorCode = a.MajorCode, // MajorGroup = a.MajorGroup, //// MajorRemark = a.Remark, diff --git a/New_College.Api/New_College.Api.csproj b/New_College.Api/New_College.Api.csproj index 36d6e8f..4891979 100644 --- a/New_College.Api/New_College.Api.csproj +++ b/New_College.Api/New_College.Api.csproj @@ -111,6 +111,9 @@ + + Always + Always diff --git a/New_College.Api/wwwroot/fonts/AlimamaDongFangDaKai-Regular.otf b/New_College.Api/wwwroot/fonts/AlimamaDongFangDaKai-Regular.otf new file mode 100644 index 0000000..8136b2e Binary files /dev/null and b/New_College.Api/wwwroot/fonts/AlimamaDongFangDaKai-Regular.otf differ diff --git a/New_College.Tasks/HostedService/JobTimedSpiderService.cs b/New_College.Tasks/HostedService/JobTimedSpiderService.cs index 7c8e97a..5ef3f47 100644 --- a/New_College.Tasks/HostedService/JobTimedSpiderService.cs +++ b/New_College.Tasks/HostedService/JobTimedSpiderService.cs @@ -34,34 +34,41 @@ namespace New_College.Tasks private void DoWork(object state) { - HtmlAgHelper agHelper = new HtmlAgHelper(); - var list = agHelper.HtmlCreatePageData(); - list.ForEach(async c => + try { - var newsinfo = await newsInfoServices.Query(e => e.Title.Trim() == c.title); - if (!newsinfo.Any() && c.pubtime.Year > DateTime.Now.Year - 1) + HtmlAgHelper agHelper = new HtmlAgHelper(); + var list = agHelper.HtmlCreatePageData(); + list.ForEach(async c => { - - await newsInfoServices.Add(new Model.Models.D_NewsInfo() + var newsinfo = await newsInfoServices.Query(e => e.Title.Trim() == c.title); + if (!newsinfo.Any() && c.pubtime.Year > DateTime.Now.Year - 1) { - Author = c.author, - CategoryId = 1, - CreateBy = "spdier", - ProvinceCode = "370000", - CreateId = 1, - CreateTime = c.pubtime, - - // Detail = c.detail, - CoverImg = "https://static-data.ycymedu.com/static/newstop.png", - OrderSort = 0, - IsDelete = false, - Title = c.title, - Summary = HtmlHelper.ReplaceHtmlTag(c.detail).Length > 200 ? HtmlHelper.ReplaceHtmlTag(c.detail).Substring(0, 200) : HtmlHelper.ReplaceHtmlTag(c.detail) - }); - } - }); - ConsoleHelper.WriteWarningLine($"Job spider success: {DateTime.Now}-{list.Count}"); + await newsInfoServices.Add(new Model.Models.D_NewsInfo() + { + Author = c.author, + CategoryId = 1, + CreateBy = "spdier", + ProvinceCode = "370000", + CreateId = 1, + CreateTime = c.pubtime, + + // Detail = c.detail, + CoverImg = "https://static-data.ycymedu.com/static/newstop.png", + OrderSort = 0, + IsDelete = false, + Title = c.title, + Summary = HtmlHelper.ReplaceHtmlTag(c.detail).Length > 200 ? HtmlHelper.ReplaceHtmlTag(c.detail).Substring(0, 200) : HtmlHelper.ReplaceHtmlTag(c.detail) + }); + + } + }); + ConsoleHelper.WriteWarningLine($"Job spider success: {DateTime.Now}-{list.Count}"); + } + catch (Exception ex) + { + ConsoleHelper.WriteWarningLine($"Job spider 抓取异常"); + } } public Task StopAsync(CancellationToken cancellationToken) diff --git a/PdfOpt/PdfOptHelper.cs b/PdfOpt/PdfOptHelper.cs index a472163..8cd8b1b 100644 --- a/PdfOpt/PdfOptHelper.cs +++ b/PdfOpt/PdfOptHelper.cs @@ -38,7 +38,7 @@ namespace PDFGenerateApi pdf.SetDefaultPageSize(pageSize); Document document = new Document(pdf); // 加载中文字体 - string fontsPath = System.IO.Path.Combine(Directory.GetCurrentDirectory(), "wwwroot", "fonts", "NotoSansCJKsc-Regular.otf"); + string fontsPath = System.IO.Path.Combine(Directory.GetCurrentDirectory(), "wwwroot", "fonts", "AlimamaDongFangDaKai-Regular.otf"); //if (!File.Exists(fontsPath)) //{ // bool aa = true; @@ -135,11 +135,11 @@ namespace PDFGenerateApi h++; if (h == 4) { - table.AddHeaderCell(new Cell().Add(new Paragraph(header).SetWidth(85).SetFont(font).SetBold().SetTextAlignment(TextAlignment.CENTER))); + table.AddHeaderCell(new Cell().Add(new Paragraph(header).SetWidth(120).SetFont(font).SetBold().SetTextAlignment(TextAlignment.CENTER))); } else { - table.AddHeaderCell(new Cell().Add(new Paragraph(header).SetFont(font).SetBold().SetTextAlignment(TextAlignment.CENTER))); + table.AddHeaderCell(new Cell().Add(new Paragraph(header).SetWidth(50).SetFont(font).SetBold().SetTextAlignment(TextAlignment.CENTER))); } } dataList.ForEach(a =>