优化

src/jy/extract/score_jsondata.go

@@ -94,6 +94,22 @@ func JsonDataMergeProcessing(j *util.Job, e *ExtractTask) map[string][]*util.Ext
 				//AddExtLog("clear", j.SourceMid, (*j.Jsondata)[v], newNum[0], &RegLuaInfo{ "JsonData_"+v, "", v, "", false, nil, nil}, e.TaskInfo) //抽取日志
 				//}
 				continue
+			}else if v == "bidopentime"{
+				lockclear.Lock()
+				cfn := e.ClearFn[v]
+				lockclear.Unlock()
+				if len(cfn) == 0 {
+					continue
+				}
+				extFields := make([]*util.ExtField, 0)
+				if bt,ok :=(*j.Jsondata)[v].(float64);ok && bt>0{
+					extFields = append(extFields, &util.ExtField{Code: "JsonData_" + v + "_" + fmt.Sprint(jdextweight), Field: v, ExtFrom: "JsonData_" + v + "_" + fmt.Sprint(jdextweight), SourceValue: (*j.Jsondata)[v], Value: bt, Score: 0.1})
+				}else {
+					newNum := clear.DoClearFn(cfn, []interface{}{(*j.Jsondata)[v], ""})
+					extFields = append(extFields, &util.ExtField{Code: "JsonData_" + v + "_" + fmt.Sprint(jdextweight), Field: v, ExtFrom: "JsonData_" + v + "_" + fmt.Sprint(jdextweight), SourceValue: (*j.Jsondata)[v], Value: newNum[0], Score: 0.1})
+				}
+				j.Result[v] = extFields
+				continue
 			}
 			vv := strings.TrimSpace(util2.ObjToString((*j.Jsondata)[v]))
 			if vv == "" || strings.Contains(vv, "详见公告") {

src/jy/pretreated/analykv.go

@@ -401,7 +401,7 @@ func keydetail(k, v string, m *SortMap, tag string, pos int, strs [][]string, ma
 				}
 			}
 		} else if len([]rune(k)) == 2 {
-			if filter_zbje_jd.MatchString(k) { //钱
+			if !filter_zbje_jd.MatchString(k) { //钱
 				if tag != "" && filter_tag_zb.MatchString(tag) {
 					k = "中标" + k
 				} else {

src/res/fieldscore.json

@@ -600,8 +600,8 @@
                 "score": -10
             },  {
                 "describe": "包含负分",
-                "regstr": "(详(见|情)|公告|test)",
-                "score": -10
+                "regstr": "(详(见|情)|公告|test|招标人)",
+                "score": -20
             }
         ],
         "length": [
@@ -661,7 +661,7 @@
             {
                 "describe": "[gt,∞,score]",
                 "range": [
-                    14,
+                    24,
                     -1,
                     -10
                 ]

src/res/formattext.json

@@ -93,7 +93,7 @@
 		},
 		{
 			"reg": "\\n(.{2,8})联系方式[:：](.+?)\\s+\\+\\s+(.+)",
-            "separator": "\n${1}联系人：$2\n${1}联系电话：$3",
+            "separator": "\n${1}联系人：$2\n${1}联系方式：$3",
             "desc": ""
 		},
 		{
@@ -109,21 +109,16 @@
 		{
 			"reg": "(收货)(联系人)和(联系方式)[:：](.+?)/(.+)",
             "separator": "${1}${2}：${4}\n${1}${3}：${5}",
-            "desc": ""
-		},
-		{
-			"reg": "(招标人[:：][^:：，、,]+?)(联系人[:：].+)",
-            "separator": "${1}\n${2}",
             "desc": ""
 		},
 		{
 			"reg": "(?s)([^(（,，。、.;；:：\\s\u3000\u2003\u00a0]{2,8})联系人[:：]([\u4e00-\u9fa5、]+)\\s+((([（(]\\d{3,4}[)）])?(\\d{6,12}([×―—－\\-]+\\d{3,4})?|\\d{3,4}[×―—－\\-]+[\u3000\u2003\u00a0\\s]*\\d{6,12}([×―—－\\-]+\\d{4})?|(\\d{2}[×―—－\\-])+\\d{8}[×―—－\\-](\\d{3}[、])+)(转\\d{3,4})?[或/、,，;；\u3000\u2003\u00a0\\s]*)+(\\d{3,})?)",
-            "separator": "${1}联系人：${2}\n${1}联系电话：${3}",
+            "separator": "${1}联系人：${2}\n${1}联系方式：${3}",
             "desc": ""
 		},
 		{
 			"reg": "(采购[^方式]{1,8})[:：]([^:：]{3,15})[,，]([^:：]{2,5})((([（(]\\d{3,4}[)）])?(\\d{6,12}([×―—－\\-]+\\d{3,4})?|\\d{3,4}[×―—－\\-]+[\u3000\u2003\u00a0\\s]*\\d{6,12}([×―—－\\-]+\\d{4})?|(\\d{2}[×―—－\\-])+\\d{8}[×―—－\\-](\\d{3}[、])+)(转\\d{3,4})?[或/、,，;；\u3000\u2003\u00a0\\s]*)+(\\d{3,})?)",
-            "separator": "${1}：${2}\n${1}联系人：${3}\n${1}联系电话：${4}",
+            "separator": "${1}：${2}\n${1}联系人：${3}\n${1}联系方式：${4}",
             "desc": ""
 		},
 		{
@@ -143,8 +138,8 @@
 		},
 		{
 			"reg": "(?s)([^(（,，。、.;；:：\\s\u3000\u2003\u00a0]{0,8}?)(联系(方式|电话|人)和?)+[:：]([^\\d:：]{2,8}?)[（(]?[\\s\u3000\u2003\u00a0]*((([（(]\\d{3,4}[)）])?(\\d{6,12}([×―—－\\-]+\\d{3,4})?|\\d{3,4}[×―—－\\-]+[\u3000\u2003\u00a0\\s]*\\d{6,12}([×―—－\\-]+\\d{4})?|(\\d{2}[×―—－\\-])+\\d{8}[×―—－\\-](\\d{3}[、])+)(转\\d{3,4})?[或/、,，;；\u3000\u2003\u00a0\\s]*)+(\\d{3,})?)",
-            "separator": "${1}联系人：${4}\n${1}联系电话：${5}",
-            "desc": "采购人联系方式：李静  0311-66629799 or 联系电话：张先生　0917―2660282"
+            "separator": "${1}联系人：${4}\n${1}联系方式：${5}",
+            "desc": "采购人联系方式：李静  0311-66629799 or 联系方式：张先生　0917―2660282"
 		},
 		{
 			"reg": "[(（]([^）)]{2,8}联系人)[:：](.+?)[,，]((联系)?(电话|手机)(号码)?)[:：](.+)[）)]",