实体redis新增有招投标数据的省市区

BaseDataMaintenance/maintenance/enterprise/enterprise2Redis.py

@@ -65,7 +65,7 @@ class enterprise2Redis():
                                   port=9200)
         body = {
             "_source": ["name", 'credit_code',
-                        "zhao_biao_number", "zhong_biao_number", "dai_li_number", "bid_number"],
+                        "zhao_biao_number","zhong_biao_number","dai_li_number","bid_number",'province','city','district'],
             'query': {  # 查询命令
                 "bool": {
                     'must': [
@@ -135,6 +135,12 @@ class enterprise2Redis():
             dai_li_number = dai_li_number if dai_li_number else 0
             bid_number = item.get("bid_number", 0)
             bid_number = bid_number if bid_number else 0
+            province = item.get("province", "")
+            province = province if province else "未知"
+            city = item.get("city", "")
+            city = city if city else "未知"
+            district = item.get("district", "")
+            district = district if district else "未知"
 
             num = 0
             for business in [credit_code]: # 新增实体只判断credit_code
@@ -146,18 +152,32 @@ class enterprise2Redis():
             if isLegal >= 0:
                 if num >= 1 and len(name) > 4:
                     legal_name_num += 1
-                    _json = {"have_business": 1, "zhao_biao_number": zhao_biao_number,
-                             "zhong_biao_number": zhong_biao_number,
-                             "dai_li_number": dai_li_number, "bid_number": bid_number,
-                             "credit_code":credit_code}
+                    if bid_number > 0:# 有招标数据时，添加公司实体省市区
+                        _json = {"have_business": 1, "zhao_biao_number": zhao_biao_number,
+                                 "zhong_biao_number": zhong_biao_number,
+                                 "dai_li_number": dai_li_number, "bid_number": bid_number,
+                                 "credit_code":credit_code,"province":province,"city":city,
+                                 "district":district}
+                    else:
+                        _json = {"have_business": 1, "zhao_biao_number": zhao_biao_number,
+                                 "zhong_biao_number": zhong_biao_number,
+                                 "dai_li_number": dai_li_number, "bid_number": bid_number,
+                                 "credit_code": credit_code}
                     _json = json.dumps(_json, ensure_ascii=False)
                     add_redis_list.append((name, _json))
                 elif num == 0 and bid_number > 0 and len(name) > 4:
                     legal_name_num += 1
-                    _json = {"have_business": 0, "zhao_biao_number": zhao_biao_number,
-                             "zhong_biao_number": zhong_biao_number,
-                             "dai_li_number": dai_li_number, "bid_number": bid_number,
-                             "credit_code":credit_code}
+                    if bid_number > 0:# 有招标数据时，添加公司实体省市区
+                        _json = {"have_business": 0, "zhao_biao_number": zhao_biao_number,
+                                 "zhong_biao_number": zhong_biao_number,
+                                 "dai_li_number": dai_li_number, "bid_number": bid_number,
+                                 "credit_code":credit_code,"province":province,"city":city,
+                                 "district":district}
+                    else:
+                        _json = {"have_business": 0, "zhao_biao_number": zhao_biao_number,
+                                 "zhong_biao_number": zhong_biao_number,
+                                 "dai_li_number": dai_li_number, "bid_number": bid_number,
+                                 "credit_code": credit_code}
                     _json = json.dumps(_json, ensure_ascii=False)
                     add_redis_list.append((name, _json))
 
@@ -253,7 +273,7 @@ class enterprise2Redis():
         scheduler = BlockingScheduler()
         # self.monitor_enterprise2redis()
         # scheduler.add_job(self.monitor_enterprise2redis,"cron",minute="*/10")
-        scheduler.add_job(self.monitor_enterprise2redis,"cron",hour="*/3")
+        scheduler.add_job(self.monitor_enterprise2redis,"cron",hour="*/1")
         scheduler.start()
 
 # 新实体合法判断