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

src/jy/extract/newextractcity.go

@@ -442,6 +442,7 @@ func (e *ExtractTask) NewGetCityByOthers(j *ju.Job, sm *SortMap, pscore, cscore,
 								break
 							} else if p_full == tmpPbrief {
 								c_full = cfMap.Name
+								PCDScore(j, "province", tmpPbrief, 4+ts, true) //
 								PCDScore(j, "city", c_full, 4+ts, true)
 								break
 							} else if p_full != "" && p_full != tmpPbrief {
@@ -460,6 +461,7 @@ func (e *ExtractTask) NewGetCityByOthers(j *ju.Job, sm *SortMap, pscore, cscore,
 								if c_full == "" {
 									c_full = c.Name
 									PCDScore(j, "city", c_full, 4+ts, true)
+									PCDScore(j, "province", tmpPbrief, 4+ts, true) //
 								}
 								isOk = true
 								districtOk = true
@@ -534,10 +536,12 @@ func (e *ExtractTask) NewGetCityByOthers(j *ju.Job, sm *SortMap, pscore, cscore,
 							} else if p_sim == tmpPbrief {
 								c_sim = cbMap.Brief
 								PCDScore(j, "city", cbMap.Name, 3+ts, false)
+								PCDScore(j, "province", tmpPbrief, 3+ts, false)
 								break
 							} else if p_sim != "" && p_sim != tmpPbrief { //上海宝冶集团有限公司南京分公司 北京朝阳中西医结合急诊抢救中心
 								delete(j.SimAreaScore, p_sim)
-								p_sim = text
+								c_sim = text      //
+								p_sim = tmpPbrief //
 								PCDScore(j, "province", tmpPbrief, 3+ts, false)
 								PCDScore(j, "city", cbMap.Name, 3+ts, false)
 							}
@@ -549,13 +553,14 @@ func (e *ExtractTask) NewGetCityByOthers(j *ju.Job, sm *SortMap, pscore, cscore,
 						for _, dfull_city := range dfull_citys {
 							for dfull, c := range dfull_city { //dfull:简称对应的全称
 								tmpPbrief := c.P.Brief
-								if p_sim == tmpPbrief || p_full == tmpPbrief { //省份一致
+								if p_sim == tmpPbrief { //省份一致
 									d_sim = text
 									PCDScore(j, "district", dfull, 2+ts, false)
 									if c_sim == "" {
 										c_sim = c.Brief
 										PCDScore(j, "city", c.Name, 2+ts, false)
 									}
+									PCDScore(j, "province", tmpPbrief, 2+ts, false) //
 								} else if p_sim == "" {
 									if !repeatDb[dfull] {
 										PCDScoreByDistrictSim("d", dfull, 1+ts, pscore, cscore, dscore)

src/main_test.go

@@ -28,7 +28,7 @@ func Test_han(t *testing.T) {
 func Test_task(t *testing.T) {
 	Mgo = MgoFactory(1, 3, 120, "192.168.3.207:27082", "extract_kf")
 	//extract.StartExtractTaskId("5b8f804025e29a290415aee1")5c528686698414055c47b115
-	extract.StartExtractTestTask("5cdd3025698414032c8322b1", "5d2bcde8a5cb26b9b7551802", "1", "mxs_v1", "mxs_v1")
+	extract.StartExtractTestTask("5cdd3025698414032c8322b1", "58369e4161a0721f1583247a", "1", "mxs_v1", "mxs_v1")
 	//extract.StartExtractTestTask("5c3d75c96984142998eb00e1", "5c2a3d28a5cb26b9b76144dd", "100", "mxs_v3", "mxs_v3")
 	time.Sleep(5 * time.Second)
 }

udp_ocr_conter/config.json

@@ -8,13 +8,13 @@
   "mongodb_filefiled": "projectinfo",
   "json_sidfiled": "gtid",
   "json_eidfiled": "lteid",
-  "toudpip": "127.0.0.1",
-  "toudpport": "1481",
+  "toudpip": "172.17.146.148",
+  "toudpport": "1581",
   "broadcast": false,
   "broadcast_ips": "127.0.0.1;192.168.1.2;192.168.1.3;192.168.1.4",
   "broadcast_port": 1490,
   "http_port": "12345",
-  "cornstr": "* * * * * ?",
+  "cornstr": "0 0 0 1 1 ? ",
   "corntime_consuming": 300,
   "pernum": 5,
   "time_consuming_limit": 60,

udp_ocr_conter/main.go

@@ -231,8 +231,9 @@ func processUdpMsg(act byte, data []byte, ra *net.UDPAddr) {
 			go config.Udpclient.WriteUdp([]byte(`{"id":"`+qu.ObjToString(tmp["start"])+`","permission":"ocr_task","is_start":"true"}`), mu.OP_TYPE_DATA, ra) //起始位置
 			go config.Udpclient.WriteUdp([]byte(`{"id":"`+newId.(bson.ObjectId).Hex()+`","permission":"ocr_task"}`), mu.OP_TYPE_DATA, ra)                    //分发任务
 			totmp := make(map[string]string)
-			totmp["sid"] = qu.ObjToString(tmp[qu.ObjToString("start")])
-			totmp["eid"] = qu.ObjToString(tmp[qu.ObjToString(config.EidField)])
+			totmp["gtid"] = qu.ObjToString(tmp[qu.ObjToString("start")])
+			totmp["lteid"] = qu.ObjToString(tmp[qu.ObjToString(config.EidField)])
+			totmp["stype"] = "fujian"
 			tobyte, _ := json.Marshal(totmp)
 			go config.Udpclient.WriteUdp(tobyte, mu.OP_TYPE_DATA, &net.UDPAddr{
 				IP:   net.ParseIP(qu.ObjToString(config.Sysconfig["toudpip"])),

udp_ocr_conter/src/corntask/task_corn.go

@@ -49,16 +49,16 @@ var Auto = func() {
 			for tmpIid, _ := range cluster.CID {
 				ttt := mongodb.FindOne("ocr_ecs", bson.M{"InstanceId": tmpIid})
 				log.Println("5分钟后释放实例", tmpIid)
-				config.Udpclient.WriteUdp([]byte("5分钟后释放实例"), mu.OP_DELETE_DOWNLOADERCODES, &net.UDPAddr{
-					IP:   net.ParseIP(util.ObjToString((*ttt)["ip_nw"])),
-					Port: util.IntAll(config.Sysconfig["broadcast_port"]),
-				})
-				go func(tmpIid string) {
+				go func(tmpIid string,ttt *map[string]interface{}) {
 					time.Sleep(time.Minute * 5)
+					config.Udpclient.WriteUdp([]byte("5分钟后释放实例"), mu.OP_DELETE_DOWNLOADERCODES, &net.UDPAddr{
+						IP:   net.ParseIP(util.ObjToString((*ttt)["ip_nw"])),
+						Port: util.IntAll(config.Sysconfig["broadcast_port"]),
+					})
 					mongodb.Del("ocr_ecs", bson.M{"InstanceId": tmpIid})
 					cluster.DeleteInstance(tmpIid)
 					log.Println("5分钟后释放实例完成", tmpIid)
-				}(tmpIid)
+				}(tmpIid,ttt)
 			}
 		} else {
 			var tmpnum int
@@ -69,16 +69,16 @@ var Auto = func() {
 				tmpIid := k
 				ttt := mongodb.FindOne("ocr_ecs", bson.M{"InstanceId": tmpIid})
 				log.Println("5分钟后释放实例", tmpIid)
-				config.Udpclient.WriteUdp([]byte("5分钟后释放实例"), mu.OP_DELETE_DOWNLOADERCODES, &net.UDPAddr{
-					IP:   net.ParseIP(util.ObjToString((*ttt)["ip_nw"])),
-					Port: util.IntAll(config.Sysconfig["broadcast_port"]),
-				})
-				go func(tmpIid string) {
+				go func(tmpIid string,ttt *map[string]interface{}) {
 					time.Sleep(time.Minute * 5)
+					config.Udpclient.WriteUdp([]byte("5分钟后释放实例"), mu.OP_DELETE_DOWNLOADERCODES, &net.UDPAddr{
+						IP:   net.ParseIP(util.ObjToString((*ttt)["ip_nw"])),
+						Port: util.IntAll(config.Sysconfig["broadcast_port"]),
+					})
 					mongodb.Del("ocr_ecs", bson.M{"InstanceId": tmpIid})
 					cluster.DeleteInstance(tmpIid)
 					log.Println("5分钟后释放实例完成", tmpIid)
-				}(tmpIid)
+				}(tmpIid,ttt)
 				tmpnum--
 			}
 		}