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

src/udpfileserver/main.go

@@ -71,8 +71,8 @@ func processUdpMsg(act byte, data []byte, ra *net.UDPAddr) {
 				limit = sum
 			}
 			for i := 0; i < pageNum; i++ {
-				query = bson.M{"_id": bson.M{"$gte": bson.ObjectIdHex(gid)}}
-				log.Println("page=", i+1,"query=", query)
+				query = bson.M{"_id": bson.M{"$gte": bson.ObjectIdHex(gid), "$lte": bson.ObjectIdHex(lid)}}
+				log.Println("page=", i+1,"query=", query,limit)
 				list, b := mongodbutil.Mgo.Find(MgoC,query,nil,bson.M{"_id": 1,MgoFileFiled:1},false,0, limit)
 				if !b{
 					log.Println("查询失败")
@@ -80,11 +80,13 @@ func processUdpMsg(act byte, data []byte, ra *net.UDPAddr) {
 				}
 
 				for _,v:=range *list {
+					gid = qu.BsonIdToSId(v["_id"])
+					jsq++
 					updateNum :=0
 					qmap := qu.ObjToMap(v)
 					mid := (*qmap)["_id"]
 					if v, ok := (*qmap)[MgoFileFiled].(map[string]interface{}); !ok {
-						//log.Println(mid, "mgo 没有字段", MgoFileFiled)
+						log.Println(mid, "mgo 没有字段", MgoFileFiled)
 						continue
 					} else {
 						switch v["attachments"].(type) {
@@ -98,7 +100,7 @@ func processUdpMsg(act byte, data []byte, ra *net.UDPAddr) {
 									ChanB <- true
 									if qu.ObjToString(fileinfo["fid"]) ==""{
 										<-ChanB
-										log.Println(mid, "mgo ", MgoFileFiled,"没有fid ",fileinfo)
+										log.Println(mid, "mgo ", MgoFileFiled,"没有fid ")
 										continue
 									}
 									save(mid,attk, qmap, &fileinfo,&updateNum)
@@ -107,8 +109,6 @@ func processUdpMsg(act byte, data []byte, ra *net.UDPAddr) {
 							}
 						}
 					}
-					gid = qu.BsonIdToSId(v["_id"])
-					jsq++
 				}
 			}
 			log.Println("处理查询数据结束...",jsq,time.Now().Sub(stime))
@@ -184,6 +184,7 @@ func save(mid interface{},attk string, qmap, fileinfo *map[string]interface{},up
 		} else {
 			(*fileinfo)["content"] = rdata["context"]
 		}
+		(*fileinfo)["expend"] = rdata["expend"]
 		//log.Println((*fileinfo))
 
 		(*qmap)[MgoFileFiled].(map[string]interface{})["attachments"].(map[string]interface{})[attk]=*fileinfo