Merge branch 'dev3.1.2' of http://192.168.3.207:10080/qmx/jy-data-extract into dev3.1.2

src/jy/cluster/aliecs.go

@@ -44,7 +44,7 @@ func RunInstances(TaskName string, num, hours int) {
 				[]string{"InternetMaxBandwidthOut", "0"},
 				[]string{"InstanceChargeType", "PostPaid"},
 				[]string{"SpotStrategy", "SpotWithPriceLimit"},
-				[]string{"SpotPriceLimit", "1.99"},
+				[]string{"SpotPriceLimit", "4.99"},
 				[]string{"InstanceName", "extract"},
 				[]string{"UniqueSuffix", "true"},
 				[]string{"Password", Password},

src/jy/extract/extpackage.go

@@ -23,98 +23,101 @@ func PackageDetail(j *ju.Job, e *ExtractTask) {
 				sonJobResult["origin"] = pkg.Origin
 				sonJobResult["type"] = pkg.Type
 				sonJobResult["winnerorder"] = pkg.WinnerOrder
-				for k, tags := range e.Tag {
-				L:
-					for _, tag := range tags {
-						if pkg.TableKV != nil {
-							for key, val := range pkg.TableKV.Kv {
-								if tag.Key == key {
-									clearmap[k] = false
-									var tmpval interface{}
-									if len(e.ClearFn[k]) > 0 {
-										data := clear.DoClearFn(e.ClearFn[k], []interface{}{val, j.Content})
-										tmpval = data[0]
-									} else {
-										tmpval = val
-									}
-									sonJobResult[k] = tmpval
-									if packagenum == 1 {
-										field := &ju.ExtField{
-											Field:     k,
-											Code:      "package",
-											RuleText:  "package",
-											Type:      "table",
-											MatchType: "tag_string",
-											ExtFrom:   "package",
-											Value:     tmpval,
-											Score:     0,
+				//分包结果暂时不用
+				/*
+					for k, tags := range e.Tag {
+					L:
+						for _, tag := range tags {
+							if pkg.TableKV != nil {
+								for key, val := range pkg.TableKV.Kv {
+									if tag.Key == key {
+										clearmap[k] = false
+										var tmpval interface{}
+										if len(e.ClearFn[k]) > 0 {
+											data := clear.DoClearFn(e.ClearFn[k], []interface{}{val, j.Content})
+											tmpval = data[0]
+										} else {
+											tmpval = val
+										}
+										sonJobResult[k] = tmpval
+										if packagenum == 1 {
+											field := &ju.ExtField{
+												Field:     k,
+												Code:      "package",
+												RuleText:  "package",
+												Type:      "table",
+												MatchType: "tag_string",
+												ExtFrom:   "package",
+												Value:     tmpval,
+												Score:     0,
+											}
+											j.Result[k] = append(j.Result[k], field)
 										}
-										j.Result[k] = append(j.Result[k], field)
+										break L
 									}
-									break L
 								}
 							}
-						}
-						if pkg.ColonKV != nil {
-							for key, val := range pkg.ColonKV.Kv {
-								if tag.Key == key {
-									clearmap[k] = true
-									var tmpval interface{}
-									if len(e.ClearFn[k]) > 0 {
-										data := clear.DoClearFn(e.ClearFn[k], []interface{}{val, j.Content})
-										tmpval = data[0]
-									} else {
-										tmpval = val
-									}
-									sonJobResult[k] = tmpval
-									if packagenum == 1 {
-										field := &ju.ExtField{
-											Field:     k,
-											Code:      "package",
-											RuleText:  "package",
-											Type:      "colon",
-											MatchType: "tag_string",
-											ExtFrom:   "package",
-											Value:     tmpval,
-											Score:     0,
+							if pkg.ColonKV != nil {
+								for key, val := range pkg.ColonKV.Kv {
+									if tag.Key == key {
+										clearmap[k] = true
+										var tmpval interface{}
+										if len(e.ClearFn[k]) > 0 {
+											data := clear.DoClearFn(e.ClearFn[k], []interface{}{val, j.Content})
+											tmpval = data[0]
+										} else {
+											tmpval = val
+										}
+										sonJobResult[k] = tmpval
+										if packagenum == 1 {
+											field := &ju.ExtField{
+												Field:     k,
+												Code:      "package",
+												RuleText:  "package",
+												Type:      "colon",
+												MatchType: "tag_string",
+												ExtFrom:   "package",
+												Value:     tmpval,
+												Score:     0,
+											}
+											j.Result[k] = append(j.Result[k], field)
 										}
-										j.Result[k] = append(j.Result[k], field)
+										break L
 									}
-									break L
 								}
 							}
-						}
-						if pkg.SpaceKV != nil {
-							for key, val := range pkg.SpaceKV.Kv {
-								if tag.Key == key {
-									clearmap[k] = true
-									var tmpval interface{}
-									if len(e.ClearFn[k]) > 0 {
-										data := clear.DoClearFn(e.ClearFn[k], []interface{}{val, j.Content})
-										tmpval = data[0]
-									} else {
-										tmpval = val
-									}
-									sonJobResult[k] = tmpval
-									if packagenum == 1 {
-										field := &ju.ExtField{
-											Field:     k,
-											Code:      "package",
-											RuleText:  "package",
-											Type:      "space",
-											MatchType: "tag_string",
-											ExtFrom:   "package",
-											Value:     tmpval,
-											Score:     0,
+							if pkg.SpaceKV != nil {
+								for key, val := range pkg.SpaceKV.Kv {
+									if tag.Key == key {
+										clearmap[k] = true
+										var tmpval interface{}
+										if len(e.ClearFn[k]) > 0 {
+											data := clear.DoClearFn(e.ClearFn[k], []interface{}{val, j.Content})
+											tmpval = data[0]
+										} else {
+											tmpval = val
 										}
-										j.Result[k] = append(j.Result[k], field)
+										sonJobResult[k] = tmpval
+										if packagenum == 1 {
+											field := &ju.ExtField{
+												Field:     k,
+												Code:      "package",
+												RuleText:  "package",
+												Type:      "space",
+												MatchType: "tag_string",
+												ExtFrom:   "package",
+												Value:     tmpval,
+												Score:     0,
+											}
+											j.Result[k] = append(j.Result[k], field)
+										}
+										break L
 									}
-									break L
 								}
 							}
 						}
 					}
-				}
+				*/
 				//如果有中标候选人排序，优先用第一中标候选人的中标单位和中标金额覆盖该包里面相应的字段的值
 				if pkg.WinnerOrder != nil && len(pkg.WinnerOrder) > 0 {
 					firstWinnerOrder := pkg.WinnerOrder[0]