xg

src/jy/extract/extract.go

@@ -776,13 +776,11 @@ func AnalysisSaveResult(j *ju.Job, task *TaskInfo) {
 			resulttmp[k] = v
 		}
 	}
-	//采购单位库，中标单位库
-	//	if ju.Config["buyerwinner"].(bool) {
-	//		BuyerAndWinner(resulttmp)
-	//	}
+
 	//质量审核
 	if ju.Config["qualityaudit"].(bool) {
 		QualityAudit(resulttmp)
+
 	}
 	b, p, c, d := TransmitData(resulttmp, _id) //抽取省份城市
 	//log.Println("抽取省份，城市，县结果=====", b, p, c, d)
@@ -872,8 +870,8 @@ func QualityAudit(resulttmp map[string]interface{}) {
 
 //Redis匹配
 func RedisMatch(field, fv string, val map[string]interface{}) {
-	i := redis.GetInt(field, fv) //查找redis
-	if i == 0 {                  //reids未找到，执行规则匹配
+	i := redis.GetInt(field, field+"_"+fv) //查找redis
+	if i == 0 {                            //reids未找到，执行规则匹配
 		val[field+"_isredis"] = false
 		RuleMatch(field, fv, val) //规则匹配
 	} else { //redis找到，打标识存库

src/jy/extract/extractInit.go

@@ -352,6 +352,7 @@ func (e *ExtractTask) InitTag() {
 
 //获取fields
 func getALLFields() map[string]string {
+
 	fields := map[string]string{}
 	list, _ := db.Mgo.Find("fields", `{}`, nil, `{"s_field":1,"s_name"}`, false, -1, -1)
 	for _, v := range *list {
@@ -362,6 +363,7 @@ func getALLFields() map[string]string {
 
 //加载clear函数
 func (e *ExtractTask) InitClearFn() {
+	defer qu.Catch()
 	list, _ := db.Mgo.Find("cleanup", `{"s_version":"`+e.TaskInfo.Version+`","delete":false}`, nil, nil, false, -1, -1)
 	fn := map[string][]string{}
 	for _, tmp := range *list {
@@ -426,6 +428,7 @@ func (e *ExtractTask) InitCityAll() {
 
 //初始化城市省份敏感词
 func InitDFA() {
+	defer qu.Catch()
 	AreaGet = DFA{}
 	AreaProvinceGet = DFA{}
 	AreaStreet = DFA{}
@@ -560,6 +563,7 @@ func InitDFA() {
 }
 
 func InitAuditRecogField() {
+	defer qu.Catch()
 	RecogFieldMap = make(map[string]map[string]interface{})
 	recogFieldList, _ := db.Mgo.Find("rc_field", `{"delete":false}`, `{"_id":1}`, `{"s_recogfield":1,"s_recogfield_prerule":1}`, false, -1, -1)
 	for _, f := range *recogFieldList {
@@ -569,6 +573,7 @@ func InitAuditRecogField() {
 }
 
 func InitAuditClass() {
+	defer qu.Catch()
 	FidClassMap = make(map[string][]map[string]interface{})
 	class, _ := db.Mgo.Find("rc_class", `{"delete":false}`, `{"i_order":1}`, nil, false, -1, -1)
 	for _, c := range *class {
@@ -584,6 +589,7 @@ func InitAuditClass() {
 
 //加载规则
 func InitAuditRule() {
+	defer qu.Catch()
 	var rureg *regexp.Regexp
 	var rs []rune
 	var ru string

src/main.go

@@ -17,6 +17,8 @@ func init() {
 	qu.ReadConfig(&util.Config)
 	util.InitMgoPool()
 	redis.InitRedisBySize(qu.ObjToString(util.Config["redis"]), 50, 30, 240)
+	//	log.Println(redis.GetInt("winner", "winner_佛山市龙沃电气科技有限公司"))
+	//	log.Println(redis.GetInt("buyer", "buyer_徐州市中际招投标咨询服务有限公司"))
 }
 
 func main() {

src/main_test.go

@@ -11,10 +11,10 @@ import (
 )
 
 func Test_task(t *testing.T) {
-	Mgo = MgoFactory(1, 3, 120, "192.168.3.207:27082", "extract_v3")
+	Mgo = MgoFactory(1, 3, 120, "192.168.3.207:27082", "extract_kf")
 	//extract.StartExtractTaskId("5b8f804025e29a290415aee1")
-	extract.StartExtractTestTask("5be107e600746bf92debf080", "5a999f3140d2d9bbe820dbb1", "5", "mxs_v3", "mxs_v3")
-	//extract.StartExtractTestTask("5b8f804025e29a290415aee1", "5beb99eaa5cb26b9b74c104b", "20", "mxs_v3", "mxs_v3")
+	//extract.StartExtractTestTask("5be107e600746bf92debf080", "5a999f3140d2d9bbe820dbb1", "5", "mxs_v3", "mxs_v3")
+	extract.StartExtractTestTask("5b8f804025e29a290415aee1", "5beb99eaa5cb26b9b74c104b", "10", "mxs_v3", "mxs_v3")
 	time.Sleep(5 * time.Second)
 }