Browse Source

一些小的修改

yangzeyu 10 tháng trước cách đây
mục cha
commit
1fdf08bfee
2 tập tin đã thay đổi với 10 bổ sung6 xóa
  1. 3 3
      api_test.py
  2. 7 3
      utils/api_service.py

+ 3 - 3
api_test.py

@@ -37,8 +37,8 @@ import json
 
 url = "http://172.18.1.189:7860/brandanalysis/api/v1/infringe_judgement"
 url_data = {
-    'title': '李宇休闲短裤女士运动潮流系列夏季女装裤子梭织运动裤',
-    'brand_name': None,
+    'title': '李宁男子运动卫衣舒适套头圆领长袖休闲运动卫衣',
+    'brand_name': '李宁',
     'product_images': [
         'http://h2.appsimg.com/a.appsimg.com/upload/merchandise/pdcvis/613214/2024/0902/118/27466cf6-fb28-4580-9009-95a3763e06bf.jpg',
         'http://h2.appsimg.com/a.appsimg.com/upload/merchandise/pdcvis/613214/2024/1120/169/8ca15632-9cb9-40e7-8915-e6773e17a05e.jpg'  
@@ -47,7 +47,7 @@ url_data = {
 }
 
 basic_data = {
-    'product_name': '李宇休闲短裤女士运动潮流系列夏季女装裤子梭织运动裤',
+    'product_name': '男子运动卫衣舒适套头圆领长袖休闲运动卫衣',
     'brand_name': '李宁',
     'similarity_logos': ['李宇', '李柠'],
     'product_images': [

+ 7 - 3
utils/api_service.py

@@ -29,8 +29,12 @@ class ApiService:
     @staticmethod
     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 '信息不全,无法判断'
+        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']:
             if similarity_logo in url_data['title'] or similarity_logo in url_data['brand_name']:
                 return True
@@ -109,8 +113,8 @@ class ApiService:
         license_list = ApiService.get_license_list(basic_data['brand_name'])
         if len(license_list) == 0:
             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__':
     url_data = {