|
|
@@ -11,7 +11,6 @@ import (
|
|
|
"path"
|
|
|
qu "qfw/util"
|
|
|
"strings"
|
|
|
- "sync"
|
|
|
"sync/atomic"
|
|
|
"time"
|
|
|
)
|
|
|
@@ -19,7 +18,6 @@ import (
|
|
|
var udpclient mu.UdpClient //udp对象
|
|
|
var Sysconfig map[string]interface{}
|
|
|
var MgoIP, MgoDB, MgoC, MgoFileFiled, GetDataIp, GetDataPort string
|
|
|
-var sys sync.RWMutex
|
|
|
var ChanA, ChanB = make(chan bool), make(chan bool, 1)
|
|
|
var tmpNUM int32
|
|
|
|
|
|
@@ -80,7 +78,6 @@ func processUdpMsg(act byte, data []byte, ra *net.UDPAddr) {
|
|
|
close(ChanA)
|
|
|
}
|
|
|
log.Println("data:", string(data), ra.String())
|
|
|
- sys.Lock()
|
|
|
var mapInfo map[string]interface{}
|
|
|
err := json.Unmarshal(data, &mapInfo)
|
|
|
if err != nil {
|
|
|
@@ -90,14 +87,12 @@ func processUdpMsg(act byte, data []byte, ra *net.UDPAddr) {
|
|
|
time.Sleep(time.Second * 30)
|
|
|
}
|
|
|
go udpclient.WriteUdp([]byte(`{"permission":"get_ocr_task"}`), mu.OP_GET_DOWNLOADERCODE, ra)
|
|
|
- sys.Unlock()
|
|
|
return
|
|
|
}
|
|
|
if qu.ObjToString(mapInfo["permission"]) != "ocr_task" {
|
|
|
log.Println("数据异常 :", string(data), ra.String())
|
|
|
time.Sleep(time.Second * 30)
|
|
|
go udpclient.WriteUdp([]byte(`{"permission":"get_ocr_task"}`), mu.OP_GET_DOWNLOADERCODE, ra)
|
|
|
- sys.Unlock()
|
|
|
return
|
|
|
}
|
|
|
ObjectId := qu.ObjToString(mapInfo["id"])
|
|
|
@@ -105,10 +100,8 @@ func processUdpMsg(act byte, data []byte, ra *net.UDPAddr) {
|
|
|
log.Println("获取数据id错误", mapInfo, ra.String())
|
|
|
time.Sleep(time.Second * 30)
|
|
|
go udpclient.WriteUdp([]byte(`{"permission":"get_ocr_task"}`), mu.OP_GET_DOWNLOADERCODE, ra)
|
|
|
- sys.Unlock()
|
|
|
return
|
|
|
}
|
|
|
- sys.Unlock()
|
|
|
log.Println("获取数据成功:", mapInfo, ra.String())
|
|
|
data, _ := mongodbutil.Mgo.FindById(MgoC, ObjectId, bson.M{"_id": 1, MgoFileFiled: 1})
|
|
|
if len(*data) == 0 {
|
fengweiqiang