فهرست منبع

更新篮球, 父级玩法错误

Your Name 6 سال پیش
والد
کامیت
8fb89d743a
7فایلهای تغییر یافته به همراه114 افزوده شده و 125 حذف شده
  1. 2 2
      hg3535/main.py
  2. 10 4
      hg3535/pipeline/jieshu.py
  3. 18 31
      hg3535/pipeline/roll_bangqiu.py
  4. 18 18
      hg3535/pipeline/roll_lanqiu.py
  5. 20 22
      hg3535/pipeline/roll_wangqiu.py
  6. 36 38
      hg3535/pipeline/roll_zuqiu.py
  7. 10 10
      hg3535/spiders/jieshu.py

+ 2 - 2
hg3535/main.py

@@ -11,13 +11,13 @@ sys.path.append(os.path.dirname(os.path.abspath(__file__)))
 # execute(["scrapy", "crawl", "wangqiu"])
 # execute(["scrapy", "crawl", "wqbodan"])
 # execute(["scrapy", "crawl", "bangqiu"])
-execute(["scrapy", "crawl", "roll_zuqiu"]) # 滚球足球 回来要解开这个注释 其他全部解封
+# execute(["scrapy", "crawl", "roll_zuqiu"]) # 滚球足球 回来要解开这个注释 其他全部解封
 # execute(["scrapy", "crawl", "roll_lanqiu"]) #滚球篮球
 # execute(["scrapy", "crawl", "roll_wangqiu"]) #滚球网球
 # execute(["scrapy", "crawl", "roll_bangqiu"])  # 滚球棒球
 # execute(["scrapy", "crawl", "ball_status"]) #滚球id本地存
 # execute(["scrapy", "crawl", "ball_status_update"]) #滚球id结束时间更新状态
 # execute(["scrapy", "crawl", "saiguo"]) #滚球id结束时间更新状态
-# execute(["scrapy", "crawl", "jieshu"]) #滚球id结束时间更新状态
+execute(["scrapy", "crawl", "jieshu"]) #滚球id结束时间更新状态
 # execute(["scrapy", "crawl", "wq_jieshu"]) #滚球id结束时间更新状态
 # execute(["scrapy", "crawl", "bq_jieshu"]) #滚球id结束时间更新状态

+ 10 - 4
hg3535/pipeline/jieshu.py

@@ -11,6 +11,7 @@ from ..settings import M_HOST, M_USER, M_PASSWORD, M_POST, M_DB, MATCH_STATUS
 from ..utils.helper import Helper
 from ..settings import R_HOST, R_PASSWORD, R_POST, R_DB
 
+
 # 滚球足球 插入
 class Jieshuqiupipeline(object):
 
@@ -25,13 +26,13 @@ class Jieshuqiupipeline(object):
         reactor.callInThread(self._do_calculation, item, out)
         yield out
         defer.returnValue(item)
-    def _do_calculation(self, item, out):
 
+    def _do_calculation(self, item, out):
     # def process_item(self, item, spider):
         logger = logging.getLogger(__name__)
         ball = item['ball']
         match_id = item['match_id']
-        # status = item['status']
+        status = item['status']
         if ball == '足球':
             game_code = "zq"
         elif ball == '篮球':
@@ -41,14 +42,19 @@ class Jieshuqiupipeline(object):
         else:
             game_code = "bq"
         status_dict = {"game_code": game_code, "title": "match_status", "source": "hg3535"}
+        update = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
         data_list = []
-        data = {'match_id': match_id, 'status': 2, "is_rollball": 0, "is_today": 0, "is_morningplate": 0, "is_stringscene": 0, "is_horn": 0, 'game_code': game_code, 'update': datetime.datetime.now()}
+        if status:
+            status = 1
+        else:
+            status = 2
+        data = {'match_id': match_id, 'status': status, "is_rollball": 0, "is_today": 0, "is_morningplate": 0, "is_stringscene": 0, "is_horn": 0, 'game_code': game_code, 'update': update}
         data_list.append(data)
         status_dict['data'] = data_list
         res = Helper.async_post(MATCH_STATUS, status_dict)
         if res:
             if "成功" in res:
-                self.db.match_status35.insert(data)
+                self.db.status35.insert(data)
                 self.rls.srem('hg3535.gunqiu.ids', match_id)
                 logger.info('{},赛事结果状态交成功, {}'.format(game_code, res))
                 logger.info(status_dict)

+ 18 - 31
hg3535/pipeline/roll_bangqiu.py

@@ -25,12 +25,9 @@ class Roll_Banqiupipeline(object):
         # 使用twisted将mysql插入变成异步执行
         logger = logging.getLogger(__name__)
         # 联赛id
-        # url = 'http://admin.5gogo.com'
-        # roll_bq = []
         league_id = item['league_id']
         # 联赛名
         league_name = item['league_name']
-        # result = item['result']
         # 比赛id
         match_id = item['game_id']
         # 球队1
@@ -39,12 +36,7 @@ class Roll_Banqiupipeline(object):
         team_guest = item['team_guest']
         # 数量(97>)
         tag_number = item['number']
-        # 新增 match_score_dict
-        # match_score_dict = item['match_score_dict']
-        # 比赛状态
-        zhuangtai = item['zhuangtai']
         # 日期
-        # data_game = item['data_game']
         data_game = item['data_game'].split("/")
         month = str(data_game[1].strip())
         day = str(data_game[0])
@@ -52,11 +44,9 @@ class Roll_Banqiupipeline(object):
         time_game = str(item['time_game'])
         # 比赛时间,时间戳
         ctime = "2019" + "-" + month + "-" + day + "" + time_game + ":00".strip()
-        r_ctime = "2019" + "-" + month + "-" + day
         # 现在时间,时间戳
         utime = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())
         match_date = datetime.datetime.now().strftime("%Y-%m-%d")
-        # expire_time = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(time.time() + 60))
         # 队1分数
         score_home = item['score_home']
         # 队2分数
@@ -77,8 +67,6 @@ class Roll_Banqiupipeline(object):
         # 总得分单双
         odd_evens_dict = item['odd_evens_dict']
         odd_evens_dict_rule = item['odd_evens_dict_rule']
-        # 赛事失效时间
-        # new_match_score_dict = json.dumps(match_score_dict)
         # 具体比分
         source_dict = item['source_dict']
         uuid = Helper.genearte_uuid(league_name + 'hg3535')
@@ -230,7 +218,6 @@ class Roll_Banqiupipeline(object):
             "source": "hg3535",
             "data": da_list,
         }
-        # print(r_data_dict)
         if da_list:
             try:
                 res = Helper.async_post(MATCH_RESULT, r_data_dict)
@@ -246,23 +233,23 @@ class Roll_Banqiupipeline(object):
                 logging.warning(r_data_dict)
         else:
             logger.info('棒球滚球结果记录为空, 不提交')
-        status_dict = {"game_code": 'bq', "title": "match_status", "source": "hg3535"}
-        data_list = []
-        data = {'match_id': match_id, 'status': 1, "is_rollball": 0, "is_today": 0, "is_morningplate": 0,
-                "is_stringscene": 0, "is_horn": 0}
-        data_list.append(data)
-        status_dict['data'] = data_list
-        res = Helper.async_post(MATCH_STATUS, status_dict)
-        if res:
-            if "成功" in res:
-                self.db.match_status35.insert(status_dict)
-                logger.info('{},赛事结果状态交成功, {}'.format('bq', res))
-                logger.info(status_dict)
-            else:
-                logger.warning('{},赛事结果状态交失败, {}'.format('bq', res))
-                logger.warning(status_dict)
-        else:
-            logger.warning('{},赛事结果状态接口异常提交失败, {}'.format('bq', res))
-            logger.warning(status_dict)
+        # status_dict = {"game_code": 'bq', "title": "match_status", "source": "hg3535"}
+        # data_list = []
+        # data = {'match_id': match_id, 'status': 1, "is_rollball": 0, "is_today": 0, "is_morningplate": 0,
+        #         "is_stringscene": 0, "is_horn": 0}
+        # data_list.append(data)
+        # status_dict['data'] = data_list
+        # res = Helper.async_post(MATCH_STATUS, status_dict)
+        # if res:
+        #     if "成功" in res:
+        #         self.db.match_status35.insert(status_dict)
+        #         logger.info('{},赛事结果状态交成功, {}'.format('bq', res))
+        #         logger.info(status_dict)
+        #     else:
+        #         logger.warning('{},赛事结果状态交失败, {}'.format('bq', res))
+        #         logger.warning(status_dict)
+        # else:
+        #     logger.warning('{},赛事结果状态接口异常提交失败, {}'.format('bq', res))
+        #     logger.warning(status_dict)
         reactor.callFromThread(out.callback, item)
 

+ 18 - 18
hg3535/pipeline/roll_lanqiu.py

@@ -290,22 +290,22 @@ class Roll_Lanqiupipeline(object):
                 logger.warning('篮球滚球赛事结果数据,接口异常,提交失败, {}'.format(e))
         else:
             logger.info('篮球滚球赛事结果数据,为空不提交')
-        status_dict = {"game_code": 'lq', "title": "match_status", "source": "hg3535"}
-        data_list = []
-        data = {'match_id': match_id, 'status': 1, "is_rollball": 0, "is_today": 0, "is_morningplate": 0,
-                "is_stringscene": 0, "is_horn": 0}
-        data_list.append(data)
-        status_dict['data'] = data_list
-        res = Helper.async_post(MATCH_STATUS, status_dict)
-        if res:
-            if "成功" in res:
-                self.db.match_status35.insert(status_dict)
-                logger.info('{},赛事结果状态交成功, {}'.format('lq', res))
-                logger.info(status_dict)
-            else:
-                logger.warning('{},赛事结果状态交失败, {}'.format('lq', res))
-                logger.warning(status_dict)
-        else:
-            logger.warning('{},赛事结果状态接口异常提交失败, {}'.format('lq', res))
-            logger.warning(status_dict)
+        # status_dict = {"game_code": 'lq', "title": "match_status", "source": "hg3535"}
+        # data_list = []
+        # data = {'match_id': match_id, 'status': 1, "is_rollball": 0, "is_today": 0, "is_morningplate": 0,
+        #         "is_stringscene": 0, "is_horn": 0}
+        # data_list.append(data)
+        # status_dict['data'] = data_list
+        # res = Helper.async_post(MATCH_STATUS, status_dict)
+        # if res:
+        #     if "成功" in res:
+        #         self.db.match_status35.insert(status_dict)
+        #         logger.info('{},赛事结果状态交成功, {}'.format('lq', res))
+        #         logger.info(status_dict)
+        #     else:
+        #         logger.warning('{},赛事结果状态交失败, {}'.format('lq', res))
+        #         logger.warning(status_dict)
+        # else:
+        #     logger.warning('{},赛事结果状态接口异常提交失败, {}'.format('lq', res))
+        #     logger.warning(status_dict)
         reactor.callFromThread(out.callback, item)

+ 20 - 22
hg3535/pipeline/roll_wangqiu.py

@@ -4,9 +4,10 @@ import time
 import logging
 import json
 from ..utils.helper import Helper
-from ..settings import M_HOST, M_USER, M_PASSWORD, M_POST, M_DB, LEAGUE_URL, ODDS_URL, MATCH_URL, MATCH_RESULT, MATCH_STATUS
+from ..settings import M_HOST, M_USER, M_PASSWORD, M_POST, M_DB, LEAGUE_URL, ODDS_URL, MATCH_URL, MATCH_RESULT
 from twisted.internet import defer, reactor
 
+
 class Roll_Wangqiupipeline(object):
     def open_spider(self, spider):
         self.mongo = pymongo.MongoClient(host=M_HOST, username=M_USER, password=M_PASSWORD, port=M_POST,
@@ -68,10 +69,8 @@ class Roll_Wangqiupipeline(object):
         # 第几节
         jijie = item['jijie']
         # # 球队得分
-        # qiudui = item['qiudui']
         pt = 4
         # 取不到 暂时注掉
-        # match_date, match_time = new_times(ctime)
         # 每局比分
         score_dict = item['score_dict']
         # 让盘
@@ -281,23 +280,22 @@ class Roll_Wangqiupipeline(object):
                 logger.warning("网球接口数据异常, 提交失败, {}".format(e))
         else:
             logger.info('网球滚球结果记录为空, 不提交')
-
-        status_dict = {"game_code": 'wq', "title": "match_status", "source": "hg3535"}
-        data_list = []
-        data = {'match_id': match_id, 'status': 1, "is_rollball": 0, "is_today": 0, "is_morningplate": 0,
-                "is_stringscene": 0, "is_horn": 0}
-        data_list.append(data)
-        status_dict['data'] = data_list
-        res = Helper.async_post(MATCH_STATUS, status_dict)
-        if res:
-            if "成功" in res:
-                self.db.match_status35.insert(status_dict)
-                logger.info('{},赛事结果状态交成功, {}'.format('wq', res))
-                logger.info(status_dict)
-            else:
-                logger.warning('{},赛事结果状态交失败, {}'.format('wq', res))
-                logger.warning(status_dict)
-        else:
-            logger.warning('{},赛事结果状态接口异常提交失败, {}'.format('wq', res))
-            logger.warning(status_dict)
+        # status_dict = {"game_code": 'wq', "title": "match_status", "source": "hg3535"}
+        # data_list = []
+        # data = {'match_id': match_id, 'status': 1, "is_rollball": 0, "is_today": 0, "is_morningplate": 0,
+        #         "is_stringscene": 0, "is_horn": 0}
+        # data_list.append(data)
+        # status_dict['data'] = data_list
+        # res = Helper.async_post(MATCH_STATUS, status_dict)
+        # if res:
+        #     if "成功" in res:
+        #         self.db.match_status35.insert(status_dict)
+        #         logger.info('{},赛事结果状态交成功, {}'.format('wq', res))
+        #         logger.info(status_dict)
+        #     else:
+        #         logger.warning('{},赛事结果状态交失败, {}'.format('wq', res))
+        #         logger.warning(status_dict)
+        # else:
+        #     logger.warning('{},赛事结果状态接口异常提交失败, {}'.format('wq', res))
+        #     logger.warning(status_dict)
         reactor.callFromThread(out.callback, item)

+ 36 - 38
hg3535/pipeline/roll_zuqiu.py

@@ -589,24 +589,24 @@ class Roll_Zuqiupipeline(object):
                     logger.warning(r_data_dict)
             except Exception as e:
                 logger.warning('滚球数据接口异常,提交失败, {}'.format(e))
-        status_dict = {"game_code": 'zq', "title": "match_status", "source": "hg3535"}
-        data_list = []
-        data = {'match_id': match_id, 'status': 1, "is_rollball": 0, "is_today": 0, "is_morningplate": 0,
-                "is_stringscene": 0, "is_horn": 0}
-        data_list.append(data)
-        status_dict['data'] = data_list
-        res = Helper.async_post(MATCH_STATUS, status_dict)
-        if res:
-            if "成功" in res:
-                self.db.match_status35.insert(status_dict)
-                logger.info('{},赛事结果状态交成功, {}'.format('zq', res))
-                logger.info(status_dict)
-            else:
-                logger.warning('{},赛事结果状态交失败, {}'.format('zq', res))
-                logger.warning(status_dict)
-        else:
-            logger.warning('{},赛事结果状态接口异常提交失败, {}'.format('zq', res))
-            logger.warning(status_dict)
+        # status_dict = {"game_code": 'zq', "title": "match_status", "source": "hg3535"}
+        # data_list = []
+        # data = {'match_id': match_id, 'status': 1, "is_rollball": 0, "is_today": 0, "is_morningplate": 0,
+        #         "is_stringscene": 0, "is_horn": 0}
+        # data_list.append(data)
+        # status_dict['data'] = data_list
+        # res = Helper.async_post(MATCH_STATUS, status_dict)
+        # if res:
+        #     if "成功" in res:
+        #         self.db.match_status35.insert(status_dict)
+        #         logger.info('{},赛事结果状态交成功, {}'.format('zq', res))
+        #         logger.info(status_dict)
+        #     else:
+        #         logger.warning('{},赛事结果状态交失败, {}'.format('zq', res))
+        #         logger.warning(status_dict)
+        # else:
+        #     logger.warning('{},赛事结果状态接口异常提交失败, {}'.format('zq', res))
+        #     logger.warning(status_dict)
 
         #   角球分割处理--------------------------------------------------------------------------------------------------
         if horn_team:
@@ -1115,26 +1115,24 @@ class Roll_Zuqiupipeline(object):
                         logger.warning(r_data_dict)
                 except Exception as e:
                     logger.warning('滚球数据接口异常, 角球结果提交失败, {}'.format(e))
-
-            status_dict = {"game_code": 'zq', "title": "match_status", "source": "hg3535"}
-            data_list = []
-            data = {'match_id': match_id, 'status': 1, "is_rollball": 0, "is_today": 0, "is_morningplate": 0,
-                    "is_stringscene": 0, "is_horn": 0}
-            data_list.append(data)
-            status_dict['data'] = data_list
-            res = Helper.async_post(MATCH_STATUS, status_dict)
-            if res:
-                if "成功" in res:
-                    self.db.match_status35.insert(status_dict)
-                    logger.info('{},赛事结果状态交成功, {}'.format('zq', res))
-                    logger.info(status_dict)
-                else:
-                    logger.warning('{},赛事结果状态交失败, {}'.format('zq', res))
-                    logger.warning(status_dict)
-            else:
-                logger.warning('{},赛事结果状态接口异常提交失败, {}'.format('zq', res))
-                logger.warning(status_dict)
-
+            # status_dict = {"game_code": 'zq', "title": "match_status", "source": "hg3535"}
+            # data_list = []
+            # data = {'match_id': match_id, 'status': 1, "is_rollball": 0, "is_today": 0, "is_morningplate": 0,
+            #         "is_stringscene": 0, "is_horn": 0}
+            # data_list.append(data)
+            # status_dict['data'] = data_list
+            # res = Helper.async_post(MATCH_STATUS, status_dict)
+            # if res:
+            #     if "成功" in res:
+            #         self.db.match_status35.insert(status_dict)
+            #         logger.info('{},赛事结果状态交成功, {}'.format('zq', res))
+            #         logger.info(status_dict)
+            #     else:
+            #         logger.warning('{},赛事结果状态交失败, {}'.format('zq', res))
+            #         logger.warning(status_dict)
+            # else:
+            #     logger.warning('{},赛事结果状态接口异常提交失败, {}'.format('zq', res))
+            #     logger.warning(status_dict)
         reactor.callFromThread(out.callback, item)
 
 

+ 10 - 10
hg3535/spiders/jieshu.py

@@ -36,16 +36,16 @@ class HgjieshuSpider(scrapy.Spider):
         try:
             data = json.loads(response.text)
             status = data['i'][0]
-            if not status:
-                ball = data['i'][31]
-                match_id = data['i'][2]
-                item = Hgjieshu()
-                item['ball'] = ball
-                item['match_id'] = match_id
-                # item['status'] = status
-                yield item
-            else:
-                return
+            # if not status:
+            ball = data['i'][31]
+            match_id = data['i'][2]
+            item = Hgjieshu()
+            item['ball'] = ball
+            item['match_id'] = match_id
+            item['status'] = status
+            yield item
+            # else:
+            #     return
         except Exception as e:
             logger.warning(e)
             return