From 82e97bd7595ede5f59befe3dd977c8ae11ec848c Mon Sep 17 00:00:00 2001
From: sunty <suntianyu0923@163.com>
Date: 星期一, 05 八月 2019 14:39:58 +0800
Subject: [PATCH] add Cascade modification dbtablepersons enable status
---
service/FaceSdkService.go | 32 ++++++++++++++++++++++----------
1 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/service/FaceSdkService.go b/service/FaceSdkService.go
index 8cbb403..43a4101 100644
--- a/service/FaceSdkService.go
+++ b/service/FaceSdkService.go
@@ -11,11 +11,12 @@
"sync"
"time"
"webserver/extend/logger"
+ "webserver/extend/util"
)
type FaceSdkService struct {
File []byte
- Id string
+ Id int64
Result []*protomsg.ResultFaceDetect
DeadTime time.Duration
}
@@ -24,6 +25,7 @@
Ipc_Push_Ext = "_2.ipc"
Ipc_Pull_Ext = "_1.ipc"
Ipc_Url_Pre = "ipc:///tmp///"
+ faceExtractWebCID = "virtual-face-extract-web-camera-id"
Virtual_FaceTaskId = "92496BDF-2BFA-98F2-62E8-96DD9866ABD2"
Virtual_FaceSdkId = "virtual-faceextract-sdk-pull"
Url_Service_PUSH = Ipc_Url_Pre + Virtual_FaceSdkId + Ipc_Push_Ext
@@ -54,7 +56,7 @@
func NewFaceSdkService(fileBytes []byte, deadTime time.Duration) FaceSdkService{
return FaceSdkService{
File:fileBytes,
- Id:uuid.NewV4().String(),
+ Id:time.Now().UnixNano(),
DeadTime:deadTime,
}
}
@@ -108,8 +110,8 @@
Height: height,
Timestamp: formatTimeStr,
Data: data,
- Id: timeUnix,
- Cid:s.Id,
+ Id: s.Id,
+ Cid: faceExtractWebCID,
},nil
}
@@ -195,24 +197,24 @@
}
type FeaResult struct {
- FaceM map[string][]*protomsg.ResultFaceDetect
+ FaceM map[int64][]*protomsg.ResultFaceDetect
Lock sync.Mutex
}
-func (f *FeaResult) Write(id string,faceDetectResult []*protomsg.ResultFaceDetect){
+func (f *FeaResult) Write(id int64,faceDetectResult []*protomsg.ResultFaceDetect){
f.Lock.Lock()
defer f.Lock.Unlock()
f.FaceM[id] = faceDetectResult
}
-func (f *FeaResult) Get(id string) ([]*protomsg.ResultFaceDetect,bool){
+func (f *FeaResult) Get(id int64) ([]*protomsg.ResultFaceDetect,bool){
f.Lock.Lock()
defer f.Lock.Unlock()
coms,ok := f.FaceM[id]
return coms,ok
}
-func (f *FeaResult) Delete(id string){
+func (f *FeaResult) Delete(id int64){
f.Lock.Lock()
defer f.Lock.Unlock()
delete(f.FaceM,id)
@@ -223,7 +225,7 @@
func InitService() {
logger.Debug("service init!")
imgPushChan = make(chan []byte)
- resultMap.FaceM = make(map[string][]*protomsg.ResultFaceDetect,0)
+ resultMap.FaceM = make(map[int64][]*protomsg.ResultFaceDetect,0)
client_push = deliver.NewClient(deliver.PushPull, Url_Service_PUSH)
client_pull = deliver.NewClient(deliver.PushPull, Url_Service_PULL)
defer func() {
@@ -260,7 +262,17 @@
rMsg := protomsg.SdkMessage{}
if err := proto.Unmarshal(resultBytes, &rMsg); err == nil {
logger.Debug("received MSG:", rMsg.Cid)
- perId := rMsg.Cid //鏁版嵁id
+ i := protomsg.Image{}
+ bdata, err := util.UnCompress(rMsg.Data)
+ if err !=nil {
+ logger.Debug("uncompress err:",err)
+ continue
+ }
+ err = proto.Unmarshal(bdata, &i)
+ if err !=nil {
+ continue
+ }
+ perId := i.Id //鏁版嵁id
if rMsg.Tasklab != nil && rMsg.Tasklab.Taskid == Virtual_FaceTaskId {
sdkInfos := rMsg.Tasklab.Sdkinfos
--
Gitblit v1.8.0