|
@@ -29,8 +29,12 @@ class ApiService:
|
|
|
@staticmethod
|
|
@staticmethod
|
|
|
def similarity_logo_judgement(url_data, basic_data):
|
|
def similarity_logo_judgement(url_data, basic_data):
|
|
|
"""近似商标侵权判定"""
|
|
"""近似商标侵权判定"""
|
|
|
- if url_data['title'] == None or url_data['brand_name'] == None or basic_data['similarity_logos'] == None or len(basic_data['similarity_logos']) == 0:
|
|
|
|
|
|
|
+ if basic_data['similarity_logos'] == None or len(basic_data['similarity_logos']) == 0:
|
|
|
return '信息不全,无法判断'
|
|
return '信息不全,无法判断'
|
|
|
|
|
+ if url_data['title'] == None:
|
|
|
|
|
+ url_data['title'] = ''
|
|
|
|
|
+ if url_data['brand_name'] == None:
|
|
|
|
|
+ url_data['brand_name'] = ''
|
|
|
for similarity_logo in basic_data['similarity_logos']:
|
|
for similarity_logo in basic_data['similarity_logos']:
|
|
|
if similarity_logo in url_data['title'] or similarity_logo in url_data['brand_name']:
|
|
if similarity_logo in url_data['title'] or similarity_logo in url_data['brand_name']:
|
|
|
return True
|
|
return True
|
|
@@ -109,8 +113,8 @@ class ApiService:
|
|
|
license_list = ApiService.get_license_list(basic_data['brand_name'])
|
|
license_list = ApiService.get_license_list(basic_data['brand_name'])
|
|
|
if len(license_list) == 0:
|
|
if len(license_list) == 0:
|
|
|
return '授权列表空,无法判定'
|
|
return '授权列表空,无法判定'
|
|
|
- result = ApiService.agent.license_product_judgement(url_data['title'], license_list)
|
|
|
|
|
- return result
|
|
|
|
|
|
|
+ result = json.loads(ApiService.agent.license_product_judgement(url_data['title'], license_list))
|
|
|
|
|
+ return result['in_list']
|
|
|
|
|
|
|
|
if __name__ == '__main__':
|
|
if __name__ == '__main__':
|
|
|
url_data = {
|
|
url_data = {
|