zx 6 years ago
parent
commit
f69cbc5d34

+ 1 - 1
FCS.Crawler/Content/Jobs/BasketJobs/Basketball/B_GamesJob.cs

@@ -76,7 +76,7 @@ namespace FCS.Crawler.Basketball
 
             });
             deleteWhere = deleteWhere.ToString().Substring(0, deleteWhere.ToString().Length - 1);
-            services.Delete<B_PlayersStatistics>(" AND GroupingId IN ({0})".FormatMe(deleteWhere));
+            services.Delete<B_Games>(" AND GroupingId IN ({0})".FormatMe(deleteWhere));
             services.SqlBulkCopyAdd(result);
         }
 

+ 12 - 8
FCS.Crawler/Content/UpdateService/UpdateJobs/UpdateJob.cs

@@ -35,10 +35,10 @@ namespace FCS.Crawler
 
         public void Click()
         {
-            ThreadPool.SetMaxThreads(200, 200);
+            ThreadPool.SetMaxThreads(300, 300);
             CommonHelper.LogBD("Update开始", logName);
-            new IPJob().GetIP();
-            Task.Run(() =>
+            //new IPJob().GetIP();
+            taskList.Add(Task.Run(() =>
             {
                 new FootballMatchJob().GetAll();
                 CommonHelper.LogBD("FootballMatchJob结束", logName);
@@ -46,10 +46,11 @@ namespace FCS.Crawler
                 CommonHelper.LogBD("GroupingJob结束", logName);
                 new GamesJob().Click();
                 CommonHelper.LogBD("GamesJob结束", logName);
+                ThreadPool.SetMaxThreads(100, 100);
                 new Update_RealTimeJobToDay10().Click();
                 CommonHelper.LogBD("Update_RealTimeJobToDay10结束", logName);
-            });
-            Task.Run(() =>
+            }));
+            taskList.Add(Task.Run(() =>
             {
                 new B_GroupingJob().Click();
                 CommonHelper.LogBD("B_GroupingJob结束", logName);
@@ -57,9 +58,12 @@ namespace FCS.Crawler
                 CommonHelper.LogBD("B_GamesJob结束", logName);
                 new B_PlayersStatisticsJob().Click();
                 CommonHelper.LogBD("B_PlayersStatisticsJob结束", logName);
-            });
-            while (!CommonHelper.ThreadsFinsh())
-                continue;
+                new B_TeamJob().GetAll();
+                CommonHelper.LogBD("B_TeamJob结束", logName);
+                new B_PlayerJob().GetAll();
+                CommonHelper.LogBD("B_PlayerJob结束", logName);
+            }));
+            Task.WaitAll(taskList.ToArray());
             CommonHelper.LogBD("Update结束", logName);
         }
     }

+ 9 - 4
FCS.Crawler/Content/UpdateService/UpdateJobs/Update_PlayerJob.cs

@@ -26,6 +26,11 @@ namespace FCS.Crawler
         {
             logName = "Update_RealTimeJob";
         }
+        public void Execute(IJobExecutionContext context)
+        {
+            Config = CommonHelper.GetConfigFromDataMap(context.JobDetail.JobDataMap);
+            Click();
+        }
 
         public void Click()
         {
@@ -43,10 +48,10 @@ namespace FCS.Crawler
             new UpperLlowerSingleDoubleJob().Click();
 
 
-          new B_MakeBallRankingJob().Click();
-          new B_SizeBallRankingJob().Click();
-          new B_TeamStatisticsJob().Click();
-          new B_LeagueRankingJob().Click();
+            new B_MakeBallRankingJob().Click();
+            new B_SizeBallRankingJob().Click();
+            new B_TeamStatisticsJob().Click();
+            new B_LeagueRankingJob().Click();
 
             while (true)
             {

+ 9 - 2
FCS.Crawler/Content/UpdateService/UpdateJobs/Update_RealTimeJob.cs

@@ -21,12 +21,19 @@ using Quartz;
 
 namespace FCS.Crawler
 {
-    public class Update_RealTimeJob : CommonJob
+    public class Update_RealTimeJob : CommonJob, IJob
     {
         public Update_RealTimeJob()
         {
             logName = "Update_RealTimeJob";
         }
+
+        public void Execute(IJobExecutionContext context)
+        {
+            Config = CommonHelper.GetConfigFromDataMap(context.JobDetail.JobDataMap);
+            Click();
+        }
+
         public void Click()
         {
             ThreadPool.SetMaxThreads(200, 200);
@@ -38,7 +45,7 @@ namespace FCS.Crawler
             Task.Run(() => new AgainstJob().Click());
             while (!CommonHelper.ThreadsFinsh())
                 continue;
-            Thread.Sleep(60000*5);
+            Thread.Sleep(60000 * 5);
             //new Update_RealTimeJobToDay10().Click();
             CommonHelper.LogBD("结束Update_RealTime", logName);
         }

+ 0 - 1
FCS.Crawler/Content/UpdateService/UpdateJobs/Update_RealTimeJobToDay10.cs

@@ -35,7 +35,6 @@ namespace FCS.Crawler
 
         public void Click()
         {
-            ThreadPool.SetMaxThreads(200, 200);
             CommonHelper.LogBD("开始Update_RealTimeJobToDay10", logName);
             Trace.WriteLine("开始Update_RealTimeJobToDay10" + DateTime.Now);
 

+ 3 - 3
FCS.Crawler/Program.cs

@@ -31,11 +31,11 @@ namespace FCS.Crawler
             ServiceBase[] ServicesToRun;
             ServicesToRun = new ServiceBase[]
                {
-                   new Service1()
+                       new Service1()
                };
             ServiceBase.Run(ServicesToRun);
-            //new().Click();
-            // new B_PlayersStatisticsJob().GetAll_NBA();
+           // new B_GamesJob().Click();
+           // new UpdateJob().Click();
             //Update_RealTimeJob job13 = new Update_RealTimeJob();
             //job13.Click();
 

+ 6 - 6
FCS.Crawler/XmlConfig/FCSConfig.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <FCSSettings>
-  <Setting>
+  <!--<Setting>
     <Name>Update</Name>
     <Area>全国</Area>
     <LotteryName>数据更新</LotteryName>
@@ -15,10 +15,10 @@
     <JobGroup>group_Update</JobGroup>
     <JobIdentityName>jb_Update</JobIdentityName>
     <TriggerIdentityName>trigger_Update</TriggerIdentityName>
-    <CronExpression>0 0 6,12,14,16 * * ?  </CronExpression>
+    <CronExpression>0 0 1 * * ? *  </CronExpression>
     <SkipDate></SkipDate>
-  </Setting>
-  <!--<Setting>
+  </Setting>-->
+  <Setting>
     <Name>Update_RealTime</Name>
     <Area>全国</Area>
     <LotteryName>比赛、比赛详情、赔率</LotteryName>
@@ -33,9 +33,9 @@
     <JobGroup>group_Update_RealTime</JobGroup>
     <JobIdentityName>jb_Update_RealTime</JobIdentityName>
     <TriggerIdentityName>trigger_Update_RealTime</TriggerIdentityName>
-    <CronExpression>0 0 6,12,14,16 * * ?  </CronExpression>
+    <CronExpression>0 0 6,10,14,16 * * ?  </CronExpression>
     <SkipDate></SkipDate>
-  </Setting>-->
+  </Setting>
   <!--<Setting>
     <Name>Update_Player</Name>
     <Area>全国</Area>