|
@@ -24,7 +24,7 @@ func JsonDataMergeProcessing(j *util.Job, e *ExtractTask) map[string][]*util.Ext
|
|
|
}
|
|
|
//jsondata有值,res没有值,取jsondata值
|
|
|
if j.Result[v] == nil {
|
|
|
- if v == "budget" || v == "bidopentime" {
|
|
|
+ if v == "budget" || v == "bidamount" {
|
|
|
lockclear.Lock()
|
|
|
cfn := e.ClearFn[v]
|
|
|
lockclear.Unlock()
|
|
@@ -45,7 +45,22 @@ func JsonDataMergeProcessing(j *util.Job, e *ExtractTask) map[string][]*util.Ext
|
|
|
//AddExtLog("extract", j.SourceMid, nil, (*j.Jsondata)[v], &RegLuaInfo{ "JsonData_"+v, "", v, "", false, nil, nil}, e.TaskInfo) //抽取日志
|
|
|
//AddExtLog("clear", j.SourceMid, (*j.Jsondata)[v], (*j.Jsondata)[v], &RegLuaInfo{ "JsonData_"+v, "", v, "", false, nil, nil}, e.TaskInfo) //抽取日志
|
|
|
continue
|
|
|
- } else if v == "projectname" || v == "buyer" || v == "projectcode" || v == "agency" {
|
|
|
+ } else {
|
|
|
+ if v == "budget" || v == "bidamount" {
|
|
|
+ lockclear.Lock()
|
|
|
+ cfn := e.ClearFn[v]
|
|
|
+ lockclear.Unlock()
|
|
|
+ newNum := clear.DoClearFn(cfn, []interface{}{fmt.Sprint((*j.Jsondata)[v]), ""})
|
|
|
+ if util2.IntAll(newNum[0]) != 0 {
|
|
|
+ extFields := make([]*util.ExtField, 0)
|
|
|
+ extFields = append(extFields, &util.ExtField{Code: "JsonData_" + v, Field: v, ExtFrom: "JsonData_" + v, SourceValue: (*j.Jsondata)[v], Value: newNum[0], Score: 0.1})
|
|
|
+ j.Result[v] = extFields
|
|
|
+ //AddExtLog("extract", j.SourceMid, nil, newNum[0], &RegLuaInfo{ "JsonData_"+v, "", v, "", false, nil, nil}, e.TaskInfo) //抽取日志
|
|
|
+ //AddExtLog("clear", j.SourceMid, (*j.Jsondata)[v], newNum[0], &RegLuaInfo{ "JsonData_"+v, "", v, "", false, nil, nil}, e.TaskInfo) //抽取日志
|
|
|
+ }
|
|
|
+ continue
|
|
|
+ }
|
|
|
+
|
|
|
if strings.Trim(util2.ObjToString(j.Result[v][0].Value), " ") != strings.Trim(util2.ObjToString((*j.Jsondata)[v]), " ") {
|
|
|
tmp = append(tmp, j.Result[v][0])
|
|
|
tmp = append(tmp, &util.ExtField{Code: "JsonData_" + v, Field: v, ExtFrom: "JsonData_" + v, SourceValue: (*j.Jsondata)[v], Value: strings.Trim(util2.ObjToString((*j.Jsondata)[v]), " "), Score: j.Result[v][0].Score})
|