Эх сурвалжийг харах

Merge remote-tracking branch 'origin/master'

luojiehua 1 жил өмнө
parent
commit
c3b2a3f1e3

+ 21 - 11
BaseDataMaintenance/maintenance/enterprise/enterprise2Redis.py

@@ -244,30 +244,40 @@ class enterprise2Redis():
 
 # 新实体合法判断
 def isLegalNewName(enterprise_name):
-    # head_character_list = ["[",'【',"(",'(']
-    # tail_character_list = ["]",'】',")",')']
     # 名称开头判断
     if re.search("^[\da-zA-Z][^\da-zA-Z]|"
                  "^[^\da-zA-Z\u4e00-\u9fa5\[【((]|"
                  "^[\[【((].{,1}[\]】))]|"
                  "^[0〇]|"
-                 "^(20[0-2][0-9]|[0-2]?[0-9]年|[0-1]?[0-9]月|[0-3]?[0-9]日)",enterprise_name):
+                 "^(20[0-2][0-9]|[0-2]?[0-9]年|[0-1]?[0-9]月|[0-3]?[0-9]日)", enterprise_name):
         return -1
-    if len(re.findall("[\u4e00-\u9fa5]",enterprise_name))<2:
+    if len(re.findall("[\u4e00-\u9fa5]", enterprise_name)) < 2:
         return -1
-    if len(re.findall("[\u4e00-\u9fa5]",enterprise_name))/len(enterprise_name) < 0.5:
+    if len(re.findall("[\u4e00-\u9fa5]", enterprise_name)) / len(enterprise_name) < 0.5:
         return -1
-    if re.search("╳|*|\*|×|xx|XX",enterprise_name):
+    if re.search("╳|*|\*|×|xx|XX|\s", enterprise_name):
         return -1
-    if re.search("个人|个体|测试",enterprise_name):
+    if re.search("[区市镇乡县洲州路街]$", enterprise_name) and not re.search("(超市|门市|保护区|园区|景区|校区|社区|服务区|工区|小区|集市|花市|夜市|学区|旅游区|矿区|林区|度假区|示范区|菜市)$", enterprise_name):
         return -1
-    if re.search("^(省|自治[县州区]|市|县|区|镇|乡|街道)",enterprise_name) and not re.search("^(镇江|乡宁|镇原|镇海|镇安|镇巴|镇坪|镇赉|镇康|镇沅|镇雄|镇远|镇宁|乡城|镇平|市中|市南|市北)",enterprise_name):
+    if re.search("^个人|^个体|测试$", enterprise_name):
         return -1
-    if re.search("\d{1,2}:\d{2}(:\d{2})?|(rar|xlsx|zip|png|jpg|swf|docx|txt|pdf|PDF|doc|xls|bmp|&?nbsp)",enterprise_name):
+    if re.search("个人|个体", enterprise_name):
+        _split = re.split("个人|个体", enterprise_name)
+        if len(_split[0]) <= 5:
+            return -1
+    if re.search("测试", enterprise_name) and len(enterprise_name) < 8:
         return -1
-    if re.search("(招标|代理)(人|机构)|联系(人|方式)|中标|评[标审选委]|候选|第.名|^(项目|业主)",enterprise_name):
+    if re.search("^(省|自治[县州区]|市|县|区|镇|乡|街道)", enterprise_name) and not re.search(
+            "^(镇江|乡宁|镇原|镇海|镇安|镇巴|镇坪|镇赉|镇康|镇沅|镇雄|镇远|镇宁|乡城|镇平|市中|市南|市北)", enterprise_name):
         return -1
-    if re.search("[a-zA-Z\d一二三四五六七八九十]{1,2}(包|标段?)|第.批",enterprise_name):
+    if re.search("\d{1,2}:\d{2}(:\d{2})?|(rar|xlsx|zip|png|jpg|swf|docx|txt|pdf|PDF|doc|xls|bmp|&?nbsp)",
+                 enterprise_name):
+        return -1
+    if re.search("(招标|代理)(人|机构)|联系(人|方式)|中标|候选|第.名|^(项目|业主)", enterprise_name):
+        return -1
+    if re.search("评[标选委审]", enterprise_name) and not re.search("评[标选委审].{0,2}中心", enterprise_name):
+        return -1
+    if re.search("[a-zA-Z\d一二三四五六七八九十]{1,2}(标段?)|第.批$", enterprise_name):
         return 0
     return 1