Commit db7edf37 by 黄静

hj

parent f81759dc
......@@ -58,7 +58,6 @@ class DataBase:
# 数据库连接
@property
def connectMySQL(self):
conn = False
try:
conn = pymysql.connect(host=self._dbhost,
user=self._dbuser,
......@@ -79,6 +78,7 @@ class DataBase:
res = ''
if (self._conn):
try:
self._conn.ping(reconnect=True)
self._cursor.execute(sql)
res = self._cursor.fetchall()
except Exception as data:
......@@ -89,6 +89,7 @@ class DataBase:
res = ''
if (self._conn):
try:
self._conn.ping(reconnect=True)
self._cursor.execute(sql)
res = self._cursor.fetchone()
except Exception as data:
......@@ -101,6 +102,7 @@ class DataBase:
if (self._conn):
try:
print(sql,"==============================")
self._conn.ping(reconnect=True)
self._cursor.execute(sql, params)
self._conn.commit()
flag = True
......@@ -114,6 +116,7 @@ class DataBase:
flag = False
if (self._conn):
try:
self._conn.ping(reconnect=True)
self._cursor.execute(sql)
flag = True
self._conn.commit()
......
......@@ -67,6 +67,8 @@ def hx_30s(companyName):
}
'''
def final_hx (company_industry,hx_info_dict):
print('hx_info_dicthx_info_dict',hx_info_dict)
lable_data = []
data = []
productData_dict ={}
industryData_dict ={}
......@@ -78,21 +80,19 @@ def final_hx (company_industry,hx_info_dict):
industryData_dict['label_data'] = company_industry_list
industryData_dict['label_type'] = '行业标签'
data.append(industryData_dict)
productData = hx_info_dict['product'].replace('[','').replace(']','').replace("'",'').replace(" ",'').split(',')
print('productData',productData)
print(type(productData))
if productData and productData != ['']:
if len(productData)>2:
lable_data = productData[0:2]
else:
lable_data = productData
print("jdksjdskjsk",type(hx_info_dict['product']))
if hx_info_dict['product']:
productData = hx_info_dict['product'].replace('[','').replace(']','').replace("'",'').replace(" ",'').split(',')
if productData and productData != ['']:
if len(productData)>2:
lable_data = productData[0:2]
else:
lable_data = productData
else:
lable_data = []
productData_dict['label_data'] = lable_data
productData_dict['label_type'] = '产品标签'
data.append(productData_dict)
knowledgeData = hx_info_dict['knowledge_info'].replace('[','').replace(']','').replace("'",'').replace(" ",'').split(',')
print(knowledgeData,"knowledgeData=====")
knowledgeData_list =[]
......@@ -103,7 +103,6 @@ def final_hx (company_industry,hx_info_dict):
knowledgeData_dict['label_data'] = knowledgeData_list
knowledgeData_dict['label_type'] = '资产标签'
data.append(knowledgeData_dict)
baseData = hx_info_dict['company_base'].replace('[', '').replace(']', '').replace("'", '').replace(" ",'').split(',')
branchData_list = []
for base_item in baseData:
......@@ -114,6 +113,7 @@ def final_hx (company_industry,hx_info_dict):
branchLable_dict['label_data'] = branchData_list
branchLable_dict['label_type'] = '分公司标签'
data.append(branchLable_dict)
print('datadatadata',data)
return data
......@@ -134,6 +134,7 @@ def tj_30s_hx(server):
hx_info_dict = hx_30s(standard_company_name)
print(hx_info_dict, "hx_info_dict===")
data = final_hx(industryLable, hx_info_dict)
print('data111',data)
hx_30s_result = {"status": 0, "msg": "成功", "data": data}
except Exception as error:
hx_30s_result = {"status": -1, "msg": "失败", "data": error}
......
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