Skip to content

Z
zhichan
Commit 388a9e33 by xuxu
Options

增加接口缓存问题及es集群挂了的备用状况

parent 6bbb6883
Showing with 266 additions and 38 deletions
specialname/dao/literal_meaning_dao.py 0 → 100644
from db.mod_db import DataBase
from common.sql_utils import to_sql_in
class WordDao:
def __init__(self, db=None):
if db is None:
self.dataBase = DataBase()
else:
self.dataBase = db
def select_explain_dao(self, word):
return self.dataBase.fetch_all(
'select * from check_name_literal_meaning where word = "%s" ' % (word))
specialname/dao/literal_meaning_es.py
...@@ -22,5 +22,4 @@ class ExplainEs: ...@@ -22,5 +22,4 @@ class ExplainEs:
} }
} }
} }
print(query)
return self.esBase.select(index=index,body=query) return self.esBase.select(index=index,body=query)
specialname/dao/preference_select.py
...@@ -13,7 +13,6 @@ class Preference: ...@@ -13,7 +13,6 @@ class Preference:
return self.dataBase.fetch_all( return self.dataBase.fetch_all(
'select * from check_name_preference_select where select_meaning = "%s" and state = 1 limit 4' % type) 'select * from check_name_preference_select where select_meaning = "%s" and state = 1 limit 4' % type)
def select_meaning(self): def select_meaning(self):
print("haha")
return self.dataBase.fetch_all("select DISTINCT(select_meaning) from check_name_preference_select limit 5") return self.dataBase.fetch_all("select DISTINCT(select_meaning) from check_name_preference_select limit 5")
def select_word(self,word_list): def select_word(self,word_list):
......
specialname/dao/treasure_name_dao.py 0 → 100644
from db.mod_db import DataBase
from common.sql_utils import to_sql_in
class NameDao:
def __init__(self, db=None):
if db is None:
self.dataBase = DataBase()
else:
self.dataBase = db
# def select_name_dao(self, name_type, name_size, city, cate, size):
# # print('select * from check_name_treasure_name where gsb_city = "%s" and name_size = %s and gsb_company_cate = "%s" and name_type = "%s" and state = 1 limit %s' % (city,name_size,cate,name_type,size))
# return self.dataBase.fetch_all(
# 'select * from check_name_treasure_name where gsb_city = "%s" and name_size = %s and gsb_company_cate = "%s" and name_type = "%s" and state = 1 order by rand() limit %s' % (city,name_size,cate,name_type,size))
def select_null_dao(self,size):
return self.dataBase.fetch_all(
'select * from check_name_treasure_name where name_type is null and state = 1 order by rand() limit %s' % (size))
def select_name_dao(self, name_type, name_size, size):
# print('select * from check_name_treasure_name where gsb_city = "%s" and name_size = %s and gsb_company_cate = "%s" and name_type = "%s" and state = 1 limit %s' % (city,name_size,cate,name_type,size))
return self.dataBase.fetch_all(
'select * from check_name_treasure_name where name_size = %s and name_type = "%s" and state = 1 order by rand() limit %s' % (
name_size, name_type, size))
specialname/dao/treasure_name_es.py
...@@ -8,7 +8,52 @@ class NameEs: ...@@ -8,7 +8,52 @@ class NameEs:
self.esBase = EsBase() self.esBase = EsBase()
else: else:
self.esBase = es self.esBase = es
def select_name(self,name_type,name_size,city,cate,size): # def select_name(self,name_type,name_size,city,cate,size):
# query = {
# "from": 0,
# "size": size,
# "query": {
# "bool": {
# "must": [
# {
# "term": {
# "name_type": name_type
# }
# },
# {
# "term": {
# "name_size": name_size
# }
# },
# {
# "term": {
# "gsb_city": city
# }
# },
# {
# "term": {
# "gsb_company_cate": cate
# }
# },
# {
# "term": {
# "state": 1
# }
# },
#
# ]
# }
# },
# "sort": {
# "_script": {
# "script": "Math.random()",
# "type": "number",
# "order": "asc"
# }
# }
# }
# return self.esBase.select(index=index,body=query)
def select_name(self,name_type,name_size,size):
query = { query = {
"from": 0, "from": 0,
"size": size, "size": size,
...@@ -27,16 +72,6 @@ class NameEs: ...@@ -27,16 +72,6 @@ class NameEs:
}, },
{ {
"term": { "term": {
"gsb_city": city
}
},
{
"term": {
"gsb_company_cate": cate
}
},
{
"term": {
"state": 1 "state": 1
} }
}, },
...@@ -52,7 +87,6 @@ class NameEs: ...@@ -52,7 +87,6 @@ class NameEs:
} }
} }
} }
print(query)
return self.esBase.select(index=index,body=query) return self.esBase.select(index=index,body=query)
def select_null(self,size): def select_null(self,size):
query = { query = {
...@@ -67,7 +101,6 @@ class NameEs: ...@@ -67,7 +101,6 @@ class NameEs:
}, },
"size":size "size":size
} }
print(query)
return self.esBase.select(index=index, body=query) return self.esBase.select(index=index, body=query)
specialname/main.py
...@@ -4,18 +4,34 @@ from flask_cors import CORS ...@@ -4,18 +4,34 @@ from flask_cors import CORS
from service.name_recommend import company_name_explain from service.name_recommend import company_name_explain
from service.preference_selecter import preference_select from service.preference_selecter import preference_select
from common import common_result from common import common_result
import datetime
server = Flask(__name__,static_url_path="",static_folder="") server = Flask(__name__,static_url_path="",static_folder="")
server.config['JSON_AS_ASCII'] = False server.config['JSON_AS_ASCII'] = False
CORS(server,supports_credentials=True) #跨域请求 CORS(server,supports_credentials=True) #跨域请求
base_result = []
now_time = str(datetime.datetime.now())[:10]
#偏好选项信息 #偏好选项信息
@server.route('/preference_select', methods=['POST']) @server.route('/preference_select', methods=['POST'])
def preference_select_info(): def preference_select_info():
if request.method == 'POST': if request.method == 'POST':
global base_result
global now_time
now = str(datetime.datetime.now())[:10]
if now != now_time:
now_time = now
base_result = []
if len(base_result) == 0:
base_result = preference_select()
if len(base_result) == 0:
base_result = preference_select() base_result = preference_select()
return common_result.to_result(base_result) return common_result.to_result(base_result)
...@@ -24,18 +40,11 @@ def preference_select_info(): ...@@ -24,18 +40,11 @@ def preference_select_info():
def treasure_name_info(): def treasure_name_info():
if request.method == 'POST': if request.method == 'POST':
request_data = request.json request_data = request.json
if not request_data or not request_data.get('city') or not request_data.get('preference') or not request_data.get('cate'): if not request_data or not request_data.get('city') or not request_data.get('preference') or not request_data.get('cate'):
return common_result.to_result(None, 300, "参数错误") return common_result.to_result(None, 300, "参数错误")
result = company_name_explain(request_data) result = company_name_explain(request_data)
return common_result.to_result(result) return common_result.to_result(result)
if __name__ == '__main__': if __name__ == '__main__':
# server.run(debug=True,host='0.0.0.0',port=80) # server.run(debug=True,host='0.0.0.0',port=80)
# global base_result server.run(debug=True, host='192.168.201.35', port=8089)
# base_result = preference_select() \ No newline at end of file
# print(base_result)
# base_result =
server.run(debug=True, host='192.168.201.35', port=8081)
\ No newline at end of file
specialname/service/preference_selecter.py
from dao.preference_select import Preference from dao.preference_select import Preference
def preference_select(): def preference_select():
all_list = [] all_list = []
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment