fengweiqiang 5 жил өмнө
parent
commit
811d4fdbc7
1 өөрчлөгдсөн 32 нэмэгдсэн , 30 устгасан
  1. 32 30
      udp_ocr_conter/main.go

+ 32 - 30
udp_ocr_conter/main.go

@@ -275,8 +275,8 @@ func processUdpMsg(act byte, data []byte, ra *net.UDPAddr) {
 		tmp["start"] = tmp[qu.ObjToString(config.SidField)]
 		tmp["import_time"] = time.Now().Unix()
 		tmp["isrun"] = "run"
-		bytes, _ := json.Marshal(tmp)
-		b := mongodb.Save("ocr_task", string(bytes))
+		//bytes, _ := json.Marshal(tmp)
+		b := mongodb.Save("ocr_task", &tmp)
 		//mongodb.Save("ocr_task_bak", string(bytes))
 		log.Println("保存id:", b)
 	case mu.OP_NOOP: //其他节点回应消息打印
@@ -288,8 +288,8 @@ func processUdpMsg(act byte, data []byte, ra *net.UDPAddr) {
 			return
 		}
 		config.Sys.Lock()
-		datas := mongodb.Find("ocr_task", bson.M{"isrun":bson.M{
-			"$ne":"stop",
+		datas := mongodb.Find("ocr_task", bson.M{"isrun": bson.M{
+			"$ne": "stop",
 		}}, `{"_id":1}`, nil, false, -1, -1)
 		if len(*datas) == 0 {
 			go config.Udpclient.WriteUdp([]byte("没有新数据"), mu.OP_TYPE_DATA, ra)
@@ -315,35 +315,37 @@ func processUdpMsg(act byte, data []byte, ra *net.UDPAddr) {
 			go config.Udpclient.WriteUdp([]byte(`{"id":"`+newId.(bson.ObjectId).Hex()+`","permission":"ocr_task"}`), mu.OP_TYPE_DATA, ra)                    //分发任务
 			//if config.IsRun {
 			//	tmpdatas := mongodb.Find("ocr_task", bson.M{"isrun":"stop"}, `{"_id":1}`, nil, false, -1, -1)
-				totmp := make(map[string]interface{})
-				totmp["stype"] = "fujian"
-				totmp["lteid"] = qu.ObjToString(tmp[qu.ObjToString(config.EidField)])
-				//if tmpdatas == nil || len(*tmpdatas) == 0{
-					totmp["gtid"] = qu.ObjToString(tmp[qu.ObjToString("start")])
-				//}else {
-				//	totmp["gtid"] = qu.ObjToString((*tmpdatas)[0][qu.ObjToString("start")])
-				//	for i,_:=range (*tmpdatas){
-				//		mongodb.Del("ocr_task",bson.M{"_id":(*tmpdatas)[i]["_id"]})
-				//		mongodb.Save("ocr_flie_over",totmp)
-				//	}
-				//}
-				tmpSumNum := mongodb.Count("bidding", bson.M{"_id": bson.M{
-					"$gte": bson.ObjectIdHex(qu.ObjToString(tmp[qu.ObjToString("start")])),
-					"$lte": bson.ObjectIdHex(eid),
-				}})
-				totmp["count"] = tmpSumNum
-				tobyte, _ := json.Marshal(totmp)
-				mongodb.Save("ocr_flie_over",string(tobyte))
+			totmp := make(map[string]interface{})
+			totmp["stype"] = "fujian"
+			totmp["lteid"] = qu.ObjToString(tmp[qu.ObjToString(config.EidField)])
+			//if tmpdatas == nil || len(*tmpdatas) == 0{
+			totmp["gtid"] = qu.ObjToString(tmp[qu.ObjToString("start")])
+			//}else {
+			//	totmp["gtid"] = qu.ObjToString((*tmpdatas)[0][qu.ObjToString("start")])
+			//	for i,_:=range (*tmpdatas){
+			//		mongodb.Del("ocr_task",bson.M{"_id":(*tmpdatas)[i]["_id"]})
+			//		mongodb.Save("ocr_flie_over",totmp)
+			//	}
+			//}
+			tmpSumNum := mongodb.Count("bidding", bson.M{"_id": bson.M{
+				"$gte": bson.ObjectIdHex(qu.ObjToString(tmp[qu.ObjToString("start")])),
+				"$lte": bson.ObjectIdHex(eid),
+			}})
+			totmp["count"] = tmpSumNum
+			totmp["isused"] = false
+			totmp["import_time"] = time.Now().Unix()
+			tobyte, _ := json.Marshal(totmp)
+			mongodb.Save("ocr_flie_over", &totmp)
 			//go config.Udpclient.WriteUdp(tobyte, mu.OP_TYPE_DATA, &net.UDPAddr{
-				//	IP:   net.ParseIP(qu.ObjToString(config.Sysconfig["toudpip"])),
-				//	Port: qu.IntAll(config.Sysconfig["toudpport"]),
-				//})
-				log.Println("ocr_task处理完成,ocr_flie_over存储数据", string(tobyte))
+			//	IP:   net.ParseIP(qu.ObjToString(config.Sysconfig["toudpip"])),
+			//	Port: qu.IntAll(config.Sysconfig["toudpport"]),
+			//})
+			log.Println("ocr_task处理完成,ocr_flie_over存储数据", string(tobyte))
 
-				mongodb.Del("ocr_task", bson.M{"_id": ObjectId.(bson.ObjectId)})
-				tmp["end_time"] = time.Now().Unix()
+			mongodb.Del("ocr_task", bson.M{"_id": ObjectId.(bson.ObjectId)})
+			tmp["end_time"] = time.Now().Unix()
 
-				//mongodb.Update("ocr_task_bak", bson.M{"start": ObjectId.(bson.ObjectId)}, map[string]interface{}{"$set": tmp}, false, false)
+			//mongodb.Update("ocr_task_bak", bson.M{"start": ObjectId.(bson.ObjectId)}, map[string]interface{}{"$set": tmp}, false, false)
 			//}else {
 			//	tmp["isrun"] = "stop"
 			//	mongodb.Update("ocr_task",