sueblue 7 years ago
parent
commit
49eb5ead08

+ 46 - 19
FCS.Crawler/Content/UpdateService/UpdateJobs/Update_RealTimeJobCeshi.cs

@@ -32,25 +32,42 @@ namespace FCS.Crawler
         public void Click()
         {
             ThreadPool.SetMaxThreads(500, 500);
-            CommonHelper.LogBD("Update_RealTimeJobCeshi" + DateTime.Now);
+            CommonHelper.LogBD("Update_RealTimeJobCeshi", "Update_RealTimeJobCeshi");
             Trace.WriteLine("Update_RealTimeJobCeshi" + DateTime.Now);
 
 
             List<int> rlist = new List<int>();
             //概率
-            var query = services.Query_delete<F_Compensate>("(select * from (select COUNT(GameId) as PK,GameId,BankerCompanyId,CompensateType from F_Compensate where CompensateType='20f77e31d96ae811ab3100ac6a4a134f' group by GameId,BankerCompanyId,CompensateType) as a where a.PK>1)").ToList();
-            foreach (var item in query)
-            {
-                var querylist = services.Query<F_Compensate>(" and BankerCompanyId='"+item.BankerCompanyId+ "' and GameId='"+item.GameId+ "' and CompensateType='"+item.CompensateType+"'").OrderByDescending(a=>a.CreateDateTime).ToList();
-                for (int i = 0; i < querylist.Count; i++)
-                {
-                    if (i == 0)
-                        continue;
-                    rlist.Add(querylist[i].PK);
-                }
-            }
+            //var query = services.Query_delete<F_Compensate>("(select * from (select COUNT(GameId) as PK,GameId,BankerCompanyId,CompensateType from F_Compensate where CompensateType='20f77e31d96ae811ab3100ac6a4a134f' group by GameId,BankerCompanyId,CompensateType) as a where a.PK>1)").ToList();
+            //for (int i = 0; i < query.Count(); i++)
+            //{
+            //    services.Delete<F_Compensate>(@" and BankerCompanyId = '" + query[i].BankerCompanyId + "' and GameId = '" + query[i].GameId + "' and CompensateType = '" + query[i].CompensateType + "' and PK not in (select top 1 PK from F_Compensate where  BankerCompanyId = '" + query[i].BankerCompanyId + "' and GameId = '" + query[i].GameId + "' and CompensateType = '" + query[i].CompensateType + "' order by CreateDateTime desc)");
+            //}
+            //foreach (var item in query)
+            //{
+            //    //delete F_Compensate where GameId='' and BankerCompanyId='' and CompensateType='' and PK not in (select top 1 PK from F_Compensate where GameId='' and BankerCompanyId='' and CompensateType='' order by CreateDateTime desc)
+            //    services.Delete<F_Compensate>(@" and BankerCompanyId = '" + item.BankerCompanyId+ "' and GameId = '"+item.GameId+ "' and CompensateType = '"+item.CompensateType+"' and PK not in (select top 1 PK from F_Compensate where  BankerCompanyId = '" + item.BankerCompanyId+ "' and GameId = '"+item.GameId+ "' and CompensateType = '"+item.CompensateType+"' order by CreateDateTime desc)");
+            //    //for (int i = 0; i < querylist.Count; i++)
+            //    //{
+            //    //    if (i == 0)
+            //    //        continue;
+            //    //    rlist.Add(querylist[i].PK);
+            //    //}
+            //}
+            //if (rlist.Count > 0)
+            //{
+            //    int pg = rlist.Count % 1000 == 0 ? rlist.Count / 1000 : rlist.Count / 1000 + 1;
+            //    for (int i = 0; i < pg; i++)
+            //    {
+            //        var listint1 = rlist.Skip(i * 1000).Take(1000).ToList();
+            //        string sql = "delete F_Compensate where PK in (" + string.Join(",", listint1) + ")";
+            //        CommonHelper.LogBD(sql, "Update_RealTimeJobCeshi");
+            //        //services.Delete<F_Compensate>(" and PK in (" + string.Join(",", listint1) + ")");
+            //    }
+            //}
+            rlist = new List<int>();
             //凯利指数
-            query = services.Query_delete<F_Compensate>("(select * from (select COUNT(GameId) as PK,GameId,BankerCompanyId,CompensateType from F_Compensate where CompensateType='21f77e31d96ae811ab3100ac6a4a134f' group by GameId,BankerCompanyId,CompensateType) as a where a.PK>1)").ToList();
+            var query = services.Query_delete<F_Compensate>("(select * from (select COUNT(GameId) as PK,GameId,BankerCompanyId,CompensateType from F_Compensate where CompensateType='21f77e31d96ae811ab3100ac6a4a134f' group by GameId,BankerCompanyId,CompensateType) as a where a.PK>1)").ToList();
             foreach (var item in query)
             {
                 var querylist = services.Query<F_Compensate>(" and BankerCompanyId='" + item.BankerCompanyId + "' and GameId='" + item.GameId + "' and CompensateType='" + item.CompensateType + "'").OrderByDescending(a => a.CreateDateTime).ToList();
@@ -75,12 +92,22 @@ namespace FCS.Crawler
             }
             if (rlist.Count > 0)
             {
-                int pg = rlist.Count % 10000 == 0 ? rlist.Count / 10000 : rlist.Count / 10000 + 1;
-                for (int i = 0; i < pg; i++)
+                for (int i = 0; i < rlist.Count(); i++)
                 {
-                    var listint1 = rlist.Skip(i * 10000).Take(10000).ToList();
-                    services.Delete<F_Compensate>(" and PK in (" + string.Join(",", listint1) + ")");
+                    services.Delete<F_Compensate>(" and PK = " + rlist[i] + "");
                 }
+                //foreach (var item in rlist)
+                //{
+                //    services.Delete<F_Compensate>(" and PK = "+item+"");
+                //}
+                //int pg = rlist.Count % 1000 == 0 ? rlist.Count / 1000 : rlist.Count / 1000 + 1;
+                //for (int i = 0; i < pg; i++)
+                //{
+                //    var listint1 = rlist.Skip(i * 1000).Take(1000).ToList();
+                //    string sql = "delete F_Compensate where PK in (" + string.Join(",", listint1) + ")";
+                //    CommonHelper.LogBD(sql, "Update_RealTimeJobCeshi");
+                //    //services.Delete<F_Compensate>(" and PK in (" + string.Join(",", listint1) + ")");
+                //}
             }
 
             //List<int> rlist = new List<int>();
@@ -137,8 +164,8 @@ namespace FCS.Crawler
             //}
 
 
-            //CommonHelper.LogBD("获取完Update_RealTimeJobToDay10" + DateTime.Now);
-            //Trace.WriteLine("获取完Update_RealTimeJobToDay10" + DateTime.Now);
+            CommonHelper.LogBD("获取完Update_RealTimeJobToDay10", "Update_RealTimeJobCeshi");
+            Trace.WriteLine("获取完Update_RealTimeJobToDay10" + DateTime.Now);
         }
     }
 

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

@@ -18,7 +18,7 @@
     <CronExpression>0 0 1 * * ? *  </CronExpression>
     <SkipDate></SkipDate>
   </Setting>-->
-  <Setting>
+  <!--<Setting>
     <Name>Update_RealTime</Name>
     <Area>全国</Area>
     <LotteryName>比赛、比赛详情、赔率</LotteryName>
@@ -33,11 +33,11 @@
     <JobGroup>group_Update_RealTime</JobGroup>
     <JobIdentityName>jb_Update_RealTime</JobIdentityName>
     <TriggerIdentityName>trigger_Update_RealTime</TriggerIdentityName>
-    <CronExpression>0 0 6,10,14,18 * * ?  </CronExpression>
+    <CronExpression>0 40 6,10,14,16 * * ?  </CronExpression>
     <SkipDate></SkipDate>
-  </Setting>
-  <!--<Setting>
-    <Name>Update_Player</Name>
+  </Setting>-->
+  <Setting>
+    <Name>Update_RealTimeJobCeshi</Name>
     <Area>全国</Area>
     <LotteryName>球队球员信息</LotteryName>
     <MainUrl></MainUrl>
@@ -47,11 +47,11 @@
     <Interval>24</Interval>
     <TimesPerDay>1</TimesPerDay>
     <KJRate>每日数据更新</KJRate>
-    <JobName>Update_PlayerJob</JobName>
-    <JobGroup>group_Update_Player</JobGroup>
-    <JobIdentityName>jb_Update_Player</JobIdentityName>
-    <TriggerIdentityName>trigger_Update_Player</TriggerIdentityName>
-    <CronExpression>0 0 2 * * ? * </CronExpression>
+    <JobName>Update_RealTimeJobCeshi</JobName>
+    <JobGroup>group_Update_RealTimeJobCeshi</JobGroup>
+    <JobIdentityName>jb_Update_RealTimeJobCeshi</JobIdentityName>
+    <TriggerIdentityName>trigger_Update_RealTimeJobCeshi</TriggerIdentityName>
+    <CronExpression>0 41 14 * * ? * </CronExpression>
     <SkipDate></SkipDate>
-  </Setting>-->
+  </Setting>
 </FCSSettings>

+ 7 - 1
FCS.Interface/Interface/IDTOpenCode.cs

@@ -91,6 +91,12 @@ namespace FCS.Interface
         /// <returns></returns>
         IEnumerable<T> Query<T>(string where = "", string json = "", string select = "a.*");
         /// <summary>
+        /// 单表查询
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <returns></returns>
+        IEnumerable<T> Query_delete<T>(string sql);
+        /// <summary>
         /// 表查询
         /// </summary>
         /// <typeparam name="T">表名对象</typeparam>
@@ -99,7 +105,7 @@ namespace FCS.Interface
         /// <param name="json">join条件(默认第一个是a开头)</param>
         /// <param name="select">查询字段</param>
         /// <returns></returns>
-         IEnumerable<U> Query<T, U>(string where = "", string json = "", string select = "a.*");
+        IEnumerable<U> Query<T, U>(string where = "", string json = "", string select = "a.*");
         /// <summary>
         /// 单表查询
         /// </summary>

+ 16 - 0
FCS.Services/Service/DTOpenCodeServices.cs

@@ -733,6 +733,22 @@ WHERE 1=1 {1}
         /// </summary>
         /// <typeparam name="T"></typeparam>
         /// <returns></returns>
+        public IEnumerable<T> Query_delete<T>(string sql)
+        {
+            
+            var ds = SqlHelper.ExecuteDataset(CommandType.Text, sql);
+            if (ds != null && ds.Tables.Count > 0 && ds.Tables[0].Rows.Count > 0)
+            {
+                var result = DataSetToList<T>(ds);
+                return result;
+            }
+            return new List<T>();
+        }
+        /// <summary>
+        /// 单表查询
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <returns></returns>
         public IEnumerable<U> Query<T, U>(string where = "", string json = "", string select = "a.*")
         {
             var sql = @"