From fac0853dc9fa1c864baf91fe314609fddce85671 Mon Sep 17 00:00:00 2001 From: username@email.com <yzy2002yzy@163.com> Date: 星期五, 02 十二月 2022 15:55:31 +0800 Subject: [PATCH] 提交 --- zhengcaioa/Crawler/sichuan/CcgpSichuanoperation.cs | 85 +++++++++++++++++++----------------------- 1 files changed, 38 insertions(+), 47 deletions(-) diff --git a/zhengcaioa/Crawler/sichuan/CcgpSichuanoperation.cs b/zhengcaioa/Crawler/sichuan/CcgpSichuanoperation.cs index de5b64d..821f402 100644 --- a/zhengcaioa/Crawler/sichuan/CcgpSichuanoperation.cs +++ b/zhengcaioa/Crawler/sichuan/CcgpSichuanoperation.cs @@ -26,7 +26,7 @@ if (updatetime != null) { operationStartTime = updatetime.Updatetime1.ToString("yyyy-MM-dd"); - operationEndTime = updatetime.Updatetime1.AddDays(1).ToString("yyyy-MM-dd"); + operationEndTime = DateTime.Now.ToString("yyyy-MM-dd"); //updatetime.Updatetime1 = DateTime.Now.AddDays(-1); //_ccontext.SaveChanges(); } @@ -174,7 +174,7 @@ var list11 = new List<AngleSharp.Dom.IElement>(); while (true) { - Thread.CurrentThread.Join(1000 * 4);//闃绘璁惧畾鏃堕棿 + Thread.CurrentThread.Join(1000 * 5);//闃绘璁惧畾鏃堕棿 logg.WriteLog(page.ToString(), "涓浗鏀块噰缃戝洓宸濈渷"); string sichuanpageurl2 = sichuanpageurll.Replace("page_index=1", "page_index=" + page); using (HttpClient client = new HttpClient()) @@ -224,7 +224,7 @@ foreach (var sichuanjieshoudtl1 in lists) { - Thread.CurrentThread.Join(1000 * 4);//闃绘璁惧畾鏃堕棿 + Thread.CurrentThread.Join(1000 * 5);//闃绘璁惧畾鏃堕棿 try { sichuanjieshoudtl aaaaaaaa = new sichuanjieshoudtl(); @@ -253,8 +253,10 @@ } using (HttpClient clientdtl = new HttpClient()) { - ZhengfuProject zhengfuProject = _ccontext.ZhengfuProjects.Where(x => x.Pageurl == aaaaaaaa.pageurl).FirstOrDefault(); - if (zhengfuProject == null) + var zhengfuProjectcount = _ccontext.ZhengfuProjects.Count(x => (x.RecStatus == "A" && x.Pageurl == aaaaaaaa.pageurl) || (x.RecStatus == "A" && x.Title == aaaaaaaa.title && x.Gglx == "02" && x.OpenTenderTime == DateTime.Parse(NoticeTime))); + + + if (zhengfuProjectcount <= 0) { HttpResponseMessage responsedtl = clientdtl.GetAsync(aaaaaaaa.pageurl).Result; var resdtl = responsedtl.Content.ReadAsStringAsync().Result; @@ -381,14 +383,12 @@ } } - var zhengfuProject1 = _ccontext.ZhengfuProjects.Where(x => x.RecStatus == "A" && x.Title == aaaaaaaa.title && x.Gglx == "02" && x.OpenTenderCode == OpenTenderCode).FirstOrDefault(); - if (zhengfuProject1 != null) - continue; + - zhengfuProject = new ZhengfuProject(); + var zhengfuProject = new ZhengfuProject(); zhengfuProject.Id = Guid.NewGuid().ToString(); zhengfuProject.Gglx = "02"; string gglxName = "閲囪喘鍏憡"; @@ -485,7 +485,7 @@ _ccontext.SaveChanges(); - Thread.CurrentThread.Join(1000 * 4);//闃绘璁惧畾鏃堕棿 + Thread.CurrentThread.Join(1000 * 5);//闃绘璁惧畾鏃堕棿 } } } @@ -525,7 +525,7 @@ var list11 = new List<AngleSharp.Dom.IElement>(); while (true) { - Thread.CurrentThread.Join(1000 * 4);//闃绘璁惧畾鏃堕棿 + Thread.CurrentThread.Join(1000 * 5);//闃绘璁惧畾鏃堕棿 logg.WriteLog(page.ToString(), "涓浗鏀块噰缃戝洓宸濈渷"); string sichuanpageurl2 = sichuanpageurll.Replace("page_index=1", "page_index=" + page); using (HttpClient client = new HttpClient()) @@ -572,7 +572,7 @@ } foreach (var sichuanjieshoudtl1 in lists) { - Thread.CurrentThread.Join(1000 * 4);//闃绘璁惧畾鏃堕棿 + Thread.CurrentThread.Join(1000 * 5);//闃绘璁惧畾鏃堕棿 try { sichuanjieshoudtl aaaaaaaa = new sichuanjieshoudtl(); @@ -601,8 +601,8 @@ } using (HttpClient clientdtl = new HttpClient()) { - ZhengfuProject zhengfuProject = _ccontext.ZhengfuProjects.Where(x => x.Pageurl == aaaaaaaa.pageurl).FirstOrDefault(); - if (zhengfuProject == null) + var zhengfuProjectCount = _ccontext.ZhengfuProjects.Count(x => (x.RecStatus == "A" && x.Pageurl == aaaaaaaa.pageurl) || (x.RecStatus == "A" && x.Title == aaaaaaaa.title && x.Gglx == "01" && x.OpenTenderTime == DateTime.Parse(NoticeTime))); + if (zhengfuProjectCount <=0) { HttpResponseMessage responsedtl = clientdtl.GetAsync(aaaaaaaa.pageurl).Result; var resdtl = responsedtl.Content.ReadAsStringAsync().Result; @@ -677,14 +677,12 @@ } } - var zhengfuProject1 = _ccontext.ZhengfuProjects.Where(x => x.RecStatus == "A" && x.Title == aaaaaaaa.title && x.Gglx == "01" && x.OpenTenderCode == OpenTenderCode).FirstOrDefault(); - if (zhengfuProject1 != null) - continue; + - zhengfuProject = new ZhengfuProject(); + var zhengfuProject = new ZhengfuProject(); zhengfuProject.Id = Guid.NewGuid().ToString(); zhengfuProject.Gglx = "01"; string gglxName = "鎰忓悜鍏紑"; @@ -781,7 +779,7 @@ _ccontext.SaveChanges(); - Thread.CurrentThread.Join(1000 * 4);//闃绘璁惧畾鏃堕棿 + Thread.CurrentThread.Join(1000 * 5);//闃绘璁惧畾鏃堕棿 } } } @@ -821,7 +819,7 @@ var list11 = new List<AngleSharp.Dom.IElement>(); while (true) { - Thread.CurrentThread.Join(1000 * 4);//闃绘璁惧畾鏃堕棿 + Thread.CurrentThread.Join(1000 * 5);//闃绘璁惧畾鏃堕棿 logg.WriteLog(page.ToString(), "涓浗鏀块噰缃戝洓宸濈渷"); string sichuanpageurl2 = sichuanpageurll.Replace("page_index=1", "page_index=" + page); using (HttpClient client = new HttpClient()) @@ -869,7 +867,7 @@ foreach (var sichuanjieshoudtl1 in lists) { - Thread.CurrentThread.Join(1000 * 4);//闃绘璁惧畾鏃堕棿 + Thread.CurrentThread.Join(1000 * 5);//闃绘璁惧畾鏃堕棿 try { sichuanjieshoudtl aaaaaaaa = new sichuanjieshoudtl(); @@ -898,8 +896,8 @@ } using (HttpClient clientdtl = new HttpClient()) { - ZhengfuProject zhengfuProject = _ccontext.ZhengfuProjects.Where(x => x.Pageurl == aaaaaaaa.pageurl).FirstOrDefault(); - if (zhengfuProject == null) + var zhengfuProjectCount = _ccontext.ZhengfuProjects.Count(x => (x.RecStatus == "A" && x.Pageurl == aaaaaaaa.pageurl) || (x.RecStatus == "A" && x.Title == aaaaaaaa.title && x.Gglx == "03" && x.OpenTenderTime == DateTime.Parse(NoticeTime))); + if (zhengfuProjectCount <=0) { HttpResponseMessage responsedtl = clientdtl.GetAsync(aaaaaaaa.pageurl).Result; var resdtl = responsedtl.Content.ReadAsStringAsync().Result; @@ -1027,14 +1025,12 @@ } } - var zhengfuProject1 = _ccontext.ZhengfuProjects.Where(x => x.RecStatus == "A" && x.Title == aaaaaaaa.title && x.Gglx == "03" && x.OpenTenderCode == OpenTenderCode).FirstOrDefault(); - if (zhengfuProject1 != null) - continue; + - zhengfuProject = new ZhengfuProject(); + var zhengfuProject = new ZhengfuProject(); zhengfuProject.Id = Guid.NewGuid().ToString(); zhengfuProject.Gglx = "03"; string gglxName = "缁撴灉鍏憡"; @@ -1131,7 +1127,7 @@ _ccontext.SaveChanges(); - Thread.CurrentThread.Join(1000 * 4);//闃绘璁惧畾鏃堕棿 + Thread.CurrentThread.Join(1000 * 5);//闃绘璁惧畾鏃堕棿 } } } @@ -1170,7 +1166,7 @@ var list11 = new List<AngleSharp.Dom.IElement>(); while (true) { - Thread.CurrentThread.Join(1000 * 4);//闃绘璁惧畾鏃堕棿 + Thread.CurrentThread.Join(1000 * 5);//闃绘璁惧畾鏃堕棿 logg.WriteLog(page.ToString(), "涓浗鏀块噰缃戝洓宸濈渷"); string sichuanpageurl2 = sichuanpageurll.Replace("page_index=1", "page_index=" + page); using (HttpClient client = new HttpClient()) @@ -1218,7 +1214,7 @@ foreach (var sichuanjieshoudtl1 in lists) { - Thread.CurrentThread.Join(1000 * 4);//闃绘璁惧畾鏃堕棿 + Thread.CurrentThread.Join(1000 * 5);//闃绘璁惧畾鏃堕棿 try { sichuanjieshoudtl aaaaaaaa = new sichuanjieshoudtl(); @@ -1247,8 +1243,8 @@ } using (HttpClient clientdtl = new HttpClient()) { - ZhengfuProject zhengfuProject = _ccontext.ZhengfuProjects.Where(x => x.Pageurl == aaaaaaaa.pageurl).FirstOrDefault(); - if (zhengfuProject == null) + var zhengfuProjectCount = _ccontext.ZhengfuProjects.Count(x => (x.RecStatus == "A" && x.Pageurl == aaaaaaaa.pageurl) || (x.RecStatus == "A" && x.Title == aaaaaaaa.title && x.Gglx == "04" && x.OpenTenderTime == DateTime.Parse(NoticeTime))); + if (zhengfuProjectCount<=0) { HttpResponseMessage responsedtl = clientdtl.GetAsync(aaaaaaaa.pageurl).Result; var resdtl = responsedtl.Content.ReadAsStringAsync().Result; @@ -1323,14 +1319,11 @@ } } - var zhengfuProject1 = _ccontext.ZhengfuProjects.Where(x => x.RecStatus == "A" && x.Title == aaaaaaaa.title && x.Gglx == "04" && x.OpenTenderCode == OpenTenderCode).FirstOrDefault(); - if (zhengfuProject1 != null) - continue; + - - zhengfuProject = new ZhengfuProject(); + var zhengfuProject = new ZhengfuProject(); zhengfuProject.Id = Guid.NewGuid().ToString(); zhengfuProject.Gglx = "04"; string gglxName = "鏇存鍏憡"; @@ -1427,7 +1420,7 @@ _ccontext.SaveChanges(); - Thread.CurrentThread.Join(1000 * 4);//闃绘璁惧畾鏃堕棿 + Thread.CurrentThread.Join(1000 * 5);//闃绘璁惧畾鏃堕棿 } } } @@ -1467,7 +1460,7 @@ var list11 = new List<AngleSharp.Dom.IElement>(); while (true) { - Thread.CurrentThread.Join(1000 * 4);//闃绘璁惧畾鏃堕棿 + Thread.CurrentThread.Join(1000 * 5);//闃绘璁惧畾鏃堕棿 logg.WriteLog(page.ToString(), "涓浗鏀块噰缃戝洓宸濈渷"); string sichuanpageurl2 = sichuanpageurll.Replace("page_index=1", "page_index=" + page); using (HttpClient client = new HttpClient()) @@ -1515,7 +1508,7 @@ foreach (var sichuanjieshoudtl1 in lists) { - Thread.CurrentThread.Join(1000 * 4);//闃绘璁惧畾鏃堕棿 + Thread.CurrentThread.Join(1000 * 5);//闃绘璁惧畾鏃堕棿 try { sichuanjieshoudtl aaaaaaaa = new sichuanjieshoudtl(); @@ -1544,8 +1537,8 @@ } using (HttpClient clientdtl = new HttpClient()) { - ZhengfuProject zhengfuProject = _ccontext.ZhengfuProjects.Where(x => x.Pageurl == aaaaaaaa.pageurl).FirstOrDefault(); - if (zhengfuProject == null) + var zhengfuProjectCount = _ccontext.ZhengfuProjects.Count(x => (x.RecStatus == "A" && x.Pageurl == aaaaaaaa.pageurl) || (x.RecStatus == "A" && x.Title == aaaaaaaa.title && x.Gglx == "11" && x.OpenTenderTime == DateTime.Parse(NoticeTime))); + if (zhengfuProjectCount <=0) { HttpResponseMessage responsedtl = clientdtl.GetAsync(aaaaaaaa.pageurl).Result; var resdtl = responsedtl.Content.ReadAsStringAsync().Result; @@ -1620,14 +1613,12 @@ } } - var zhengfuProject1 = _ccontext.ZhengfuProjects.Where(x => x.RecStatus == "A" && x.Title == aaaaaaaa.title && x.Gglx == "11" && x.OpenTenderCode == OpenTenderCode).FirstOrDefault(); - if (zhengfuProject1 != null) - continue; + - zhengfuProject = new ZhengfuProject(); + var zhengfuProject = new ZhengfuProject(); zhengfuProject.Id = Guid.NewGuid().ToString(); zhengfuProject.Gglx = "11"; string gglxName = "搴熸爣鍏憡"; @@ -1724,7 +1715,7 @@ _ccontext.SaveChanges(); - Thread.CurrentThread.Join(1000 * 4);//闃绘璁惧畾鏃堕棿 + Thread.CurrentThread.Join(1000 * 5);//闃绘璁惧畾鏃堕棿 } } } -- Gitblit v1.9.1