Browse Source

节点存储

fengweiqiang 5 years ago
parent
commit
55cc0f16c0
3 changed files with 60 additions and 58 deletions
  1. 58 56
      udp_ocr_conter/main.go
  2. 1 1
      udp_ocr_conter/src/config/config.go
  3. 1 1
      udp_ocr_conter/src/info/taskinfo.go

+ 58 - 56
udp_ocr_conter/main.go

@@ -54,43 +54,43 @@ func main() {
 	mux.HandleFunc("/favicon.ico", func(writer http.ResponseWriter, request *http.Request) {
 		writer.WriteHeader(http.StatusOK)
 	})
-	mux.HandleFunc("/udpkz", func(writer http.ResponseWriter, request *http.Request) {
-		tplogin, err := template.ParseFiles("src/web/login.html")
-		if err != nil {
-			log.Println(err)
-			writer.Write([]byte( "页面找不到了~"))
-			return
-		}
-		cookie, _ := request.Cookie("username")
-		if cookie == nil {
-			http.RedirectHandler("/login", http.StatusUnauthorized)
-			tplogin.Execute(writer, "请先登录")
-			return
-		}
-		if cookie.Value != "0c83f57c786a0b4a39efab23731c7ebc" {
-			http.RedirectHandler("/login", http.StatusUnauthorized)
-			tplogin.Execute(writer, "密钥错误")
-			return
-		}
-		err = request.ParseForm()
-		if err !=nil{
-			writer.WriteHeader(http.StatusBadGateway)
-			writer.Write([]byte(err.Error()))
-			return
-		}
-		data := request.Form.Get("do")
-		//log.Println(data)
-		if data == "start"{
-			config.Sys.Lock()
-			config.IsRun = true
-			config.Sys.Unlock()
-		}else if data =="stop"{
-			config.Sys.Lock()
-			config.IsRun = false
-			config.Sys.Unlock()
-		}
-		writer.WriteHeader(http.StatusOK)
-	})
+	//mux.HandleFunc("/udpkz", func(writer http.ResponseWriter, request *http.Request) {
+	//	tplogin, err := template.ParseFiles("src/web/login.html")
+	//	if err != nil {
+	//		log.Println(err)
+	//		writer.Write([]byte( "页面找不到了~"))
+	//		return
+	//	}
+	//	cookie, _ := request.Cookie("username")
+	//	if cookie == nil {
+	//		http.RedirectHandler("/login", http.StatusUnauthorized)
+	//		tplogin.Execute(writer, "请先登录")
+	//		return
+	//	}
+	//	if cookie.Value != "0c83f57c786a0b4a39efab23731c7ebc" {
+	//		http.RedirectHandler("/login", http.StatusUnauthorized)
+	//		tplogin.Execute(writer, "密钥错误")
+	//		return
+	//	}
+	//	err = request.ParseForm()
+	//	if err !=nil{
+	//		writer.WriteHeader(http.StatusBadGateway)
+	//		writer.Write([]byte(err.Error()))
+	//		return
+	//	}
+	//	data := request.Form.Get("do")
+	//	//log.Println(data)
+	//	if data == "start"{
+	//		config.Sys.Lock()
+	//		config.IsRun = true
+	//		config.Sys.Unlock()
+	//	}else if data =="stop"{
+	//		config.Sys.Lock()
+	//		config.IsRun = false
+	//		config.Sys.Unlock()
+	//	}
+	//	writer.WriteHeader(http.StatusOK)
+	//})
 	mux.HandleFunc("/login", func(writer http.ResponseWriter, request *http.Request) {
 		tp, err := template.ParseFiles("src/web/login.html")
 		if err != nil {
@@ -313,34 +313,36 @@ func processUdpMsg(act byte, data []byte, ra *net.UDPAddr) {
 		if newId.(bson.ObjectId).Hex() >= eid {
 			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)                    //分发任务
-			if config.IsRun {
-				tmpdatas := mongodb.Find("ocr_task", bson.M{"isrun":"stop"}, `{"_id":1}`, nil, false, -1, -1)
+			//if config.IsRun {
+			//	tmpdatas := mongodb.Find("ocr_task", bson.M{"isrun":"stop"}, `{"_id":1}`, nil, false, -1, -1)
 				totmp := make(map[string]string)
 				totmp["stype"] = "fujian"
 				totmp["lteid"] = qu.ObjToString(tmp[qu.ObjToString(config.EidField)])
-				if tmpdatas == nil || len(*tmpdatas) == 0{
+				//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"]})
-					}
-				}
+				//}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)
+				//	}
+				//}
 				tobyte, _ := json.Marshal(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处理完成,发送下个节点", string(tobyte))
+				//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))
 
 				mongodb.Del("ocr_task", bson.M{"_id": ObjectId.(bson.ObjectId)})
 				tmp["end_time"] = time.Now().Unix()
+				mongodb.Save("ocr_flie_over",totmp)
 				mongodb.Update("ocr_task_bak", bson.M{"_id": ObjectId.(bson.ObjectId)}, map[string]interface{}{"$set": tmp}, false, false)
-			}else {
-				tmp["isrun"] = "stop"
-				mongodb.Update("ocr_task",
-					bson.M{"_id": ObjectId.(bson.ObjectId)}, tmp, false, false)
-			}
+			//}else {
+			//	tmp["isrun"] = "stop"
+			//	mongodb.Update("ocr_task",
+			//		bson.M{"_id": ObjectId.(bson.ObjectId)}, tmp, false, false)
+			//}
 			config.Sys.Unlock()
 			return
 		}

+ 1 - 1
udp_ocr_conter/src/config/config.go

@@ -14,7 +14,7 @@ var Sysconfig map[string]interface{}
 var MgoIP, MgoDB, MgoC, MgoFileFiled, SidField, EidField string
 var Sys sync.RWMutex
 var Isjjr bool//节假日
-var IsRun bool = true
+//var IsRun bool = true
 
 func init() {
 	util.ReadConfig(&Sysconfig)

+ 1 - 1
udp_ocr_conter/src/info/taskinfo.go

@@ -14,7 +14,7 @@ func QueryInfo() map[string]interface{} {
 	now := time.Now()
 	data := make(map[string]interface{})
 	config.Sys.Lock()
-	data["isrun"] = config.IsRun
+	//data["isrun"] = config.IsRun
 	config.Sys.Unlock()
 	taskArr := mongodb.Find("ocr_task", bson.M{"isrun":bson.M{
 		"$ne":"stop",