不符合时间规则的逻辑修改

panlei

2019-07-04 d197779cb9a7d3d33eb6afb2ad6d1a7ea7cf6e3f

 main.go

@@ -1,10 +1,12 @@
package main

import (
   "basic.com/dbapi.git"
   "basic.com/pubsub/protomsg.git"
   "basic.com/valib/deliver.git"
   "bufio"
   "bytes"
   "flag"
   "fmt"
   "github.com/golang/protobuf/proto"
   "gocv.io/x/gocv"
@@ -12,22 +14,34 @@
   "image/color"
   "log"
   "os"
   "ruleprocess/cache"
   "ruleprocess/insertdata"
   "ruleprocess/ruleserver"
   "ruleprocess/util"
   "sync"
)

var dbIp = flag.String("dbIp","127.0.0.1","dbserver ip")
var dbPort = flag.Int("dbPort",8001,"default dbPort=8001")
var surveyPort = flag.Int("surveyPort",40007,"survey port") //心跳
var pubPort = flag.Int("pubPort",50007,"pubsub port") //数据更新
var initchan = make(chan bool)
func main() {
   //wg := sync.WaitGroup{}
   //wg.Add(1)
   //go ruleserver.TimeTicker()
   //nReciever("ipc:///tmp/sdk-2-rules-process.ipc", deliver.PushPull, 1)
   //wg.Wait()
   resp,err := DrawPolygonOnImage()
   if err != nil {
      log.Println("画框或者上传有问题")
   }
   log.Println(resp["fileUrl"].(string))
   flag.Parse()
   wg := sync.WaitGroup{}
   wg.Add(1)

   dbapi.Init(*dbIp,*dbPort)
   go cache.Init(initchan,*dbIp,*surveyPort,*pubPort)
   fmt.Println("cache init completed!!!",<- initchan)//dbserver初始化完毕

   go ruleserver.TimeTicker()
   nReciever("ipc:///tmp/sdk-2-rules-process.ipc", deliver.PushPull, 1)
   wg.Wait()
   //resp,err := DrawPolygonOnImage()
   //if err != nil {
   //   log.Println("画框或者上传有问题")
   //}
   //log.Println(resp["fileUrl"].(string))
}
func nReciever(url string, m deliver.Mode, count int) {
   c := deliver.NewServer(m, url)
@@ -96,7 +110,7 @@
   }
   i := protomsg.Image{}
   err = proto.Unmarshal(bdata, &i)

   log.Println("----------------看看有几个算法：",len(m.Tasklab.Sdkinfos))
   for _, sdkinfo := range m.Tasklab.Sdkinfos { // yolo算法
      if sdkinfo.Sdktype == "Yolo" {
         arg := ruleserver.SdkData{}
@@ -117,13 +131,13 @@
         arg.IsStatic = false
         if len(sdkinfo.Sdkdata) > 1 {
            // 大于1才有数据
            fmt.Println("----------------------------------------------------",m.Cid)
            yoloParam := protomsg.ParamYoloObj{}
            err = proto.Unmarshal(sdkinfo.Sdkdata, &yoloParam)
            if err != nil {
               fmt.Println("解析YOLO sdk数据时出现错误", err)
               continue
            }
            log.Println("------当前算法name",sdkinfo.SdkName,"--------------看看yolo中有几个目标：",len(yoloParam.Infos))
            for _, info := range yoloParam.Infos {
               if info.Typ == 0 {
                  photoMap := ruleserver.PhotoMap{Rects: rectFormat(info.RcObj), Score: float64(info.Prob)*100,IsYolo:true}
@@ -154,13 +168,13 @@
         arg.KeepRight = false
         arg.IsStatic = false
         if len(sdkinfo.Sdkdata) > 1 {
            fmt.Println("----------------------------------------------------",m.Caddr)
            faceParam := protomsg.ParamFacePos{}
            err = proto.Unmarshal(sdkinfo.Sdkdata, &faceParam)
            if err != nil {
               fmt.Println("解析FACE sdk数据时出现错误", err)
               continue
            }
            log.Println("------当前算法name",sdkinfo.SdkName,"--------------看看人脸检测中有几个目标：",len(faceParam.Faces))
            for _, info := range faceParam.Faces {
               photoMap := ruleserver.PhotoMap{Rects: rectFormat(info.Pos.RcFace), Score: float64(info.Pos.Quality)*100, IsYolo:false,ThftRes:*(info.Result)}
               arg.Photo = append(arg.Photo, photoMap)
@@ -188,13 +202,13 @@
         arg.KeepRight = false
         arg.IsStatic = false
         if len(sdkinfo.Sdkdata) > 1 {
            fmt.Println("----------------------------------------------------",m.Caddr)
            faceParam := protomsg.ParamFaceFeature{}
            err = proto.Unmarshal(sdkinfo.Sdkdata, &faceParam)
            if err != nil {
               fmt.Println("解析FACE sdk数据时出现错误", err)
               continue
            }
            log.Println("------当前算法name",sdkinfo.SdkName,"--------------看看人脸提取中有几个目标：",len(faceParam.ExtComp))
            for _, extComp := range faceParam.ExtComp {
               baseinfos := protomsg.Binfos{}
               err1 := proto.Unmarshal(extComp.Comp, &baseinfos)