Ver Fonte

no message

Jianghan há 5 anos atrás
pai
commit
20bf5daa18
2 ficheiros alterados com 19 adições e 17 exclusões
  1. 17 15
      src/service/repair_rule.go
  2. 2 2
      src/udptask/udptask.go

+ 17 - 15
src/service/repair_rule.go

@@ -105,20 +105,16 @@ func (jy *RepairRule) RepairNewSave() {
 	cur_id := JYMgo.Save(JyCollNameOne, *updata)
 	if cur_id != "" {
 		log.Println("当前新增id:", cur_id)
-		//新增es
-		//client := elastic.GetEsConn()
-		//defer elastic.DestoryEsConn(client)
-		//_, err := client.Index().Index(EsIndex).Type(EsType).Id(cur_id).BodyJson(util.ObjToMap(*updata)).Do()
-		//if err != nil {
-		//	log.Println("保存到ES出错", err)
-		//}
 
 		//调udp生索引
 		indexNode := *qu.ObjToMap(Sysconfig["indexNode"])
 		param := map[string]interface{}{"coll": JyCollNameOne}
 		by, _ := json.Marshal(map[string]interface{}{
-			"gtid":  cur_id,
-			"lteid": cur_id,
+			"query": map[string]interface{}{
+				"_id": bson.M{
+					"$gte": bson.ObjectIdHex(cur_id),
+					"$lte": bson.ObjectIdHex(cur_id),
+				}},
 			"stype": qu.ObjToString(indexNode["stype"]),
 			"param": param,
 		})
@@ -316,10 +312,13 @@ func (jy *RepairRule) RepairSave() {
 
 			//调udp生索引
 			indexNode := *qu.ObjToMap(Sysconfig["indexNode"])
-			param := map[string]interface{}{"coll": coll}
+			param := map[string]interface{}{"coll": JyCollNameOne}
 			by, _ := json.Marshal(map[string]interface{}{
-				"gteid": id,
-				"lteid": id,
+				"query": map[string]interface{}{
+					"_id": bson.M{
+						"$gte": bson.ObjectIdHex(id),
+						"$lte": bson.ObjectIdHex(id),
+					}},
 				"stype": qu.ObjToString(indexNode["stype"]),
 				"param": param,
 			})
@@ -621,10 +620,13 @@ func ModifyData(tmp map[string]interface{}, user map[string]interface{}) (err ma
 	}
 
 	indexNode := *qu.ObjToMap(Sysconfig["indexNode"])
-	param := map[string]interface{}{"coll": coll}
+	param := map[string]interface{}{"coll": JyCollNameOne}
 	by, _ := json.Marshal(map[string]interface{}{
-		"gteid": id,
-		"lteid": id,
+		"query": map[string]interface{}{
+			"_id": bson.M{
+				"$gte": bson.ObjectIdHex(id),
+				"$lte": bson.ObjectIdHex(id),
+			}},
 		"stype": qu.ObjToString(indexNode["stype"]),
 		"param": param,
 	})

+ 2 - 2
src/udptask/udptask.go

@@ -40,12 +40,12 @@ func processUdpMsg(act byte, data []byte, ra *net.UDPAddr) {
 			//go Udpclient.WriteUdp(by, mu.OP_NOOP, ra) //回应上一个节点
 		}
 	case mu.OP_NOOP: //下个节点回应
-		log.Println("接收回应:", string(data))
+		qu.Debug("接收回应:", string(data))
 		var rep map[string]interface{}
 		err := json.Unmarshal(data, &rep)
 		if err != nil { //空数据
 			//
-			log.Println("回应空:",rep)
+
 		} else { //正确
 			if qu.ObjToString(rep["stype"]) == "startTask" {
 				updateMgoIsuse("1", qu.ObjToString(rep["taskid"]))