From c2ef56536ce95b2623b5e649c3df88bca14f28c0 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 20 六月 2019 17:49:33 +0800
Subject: [PATCH] 解压缩图片
---
ruleserver/ruleToformula.go | 8 ++++----
main.go | 23 ++++++++++++++++-------
2 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/main.go b/main.go
index 64321ca..6b5506e 100644
--- a/main.go
+++ b/main.go
@@ -4,7 +4,7 @@
"fmt"
"ruleprocess/ruleserver"
"sync"
-
+ "analysis/work"
"basic.com/pubsub/protomsg.git"
"basic.com/valib/deliver.git"
"github.com/golang/protobuf/proto"
@@ -39,7 +39,8 @@
} else {
arg := ruleserver.ArgsFromSdk{}
m := paramFormat(msg,&arg)
- arg.MainJudge()
+ fmt.Println("瑙ｆ瀽鍑烘潵鐨勬暟鎹細",arg)
+ ruleserver.MainJudge(&arg)
// 鎶奱rg閲岀殑鎵撶殑鏍囩鎷垮嚭鏉ョ粰m鍐嶅皝瑁呬竴灞�
resultMag := ruleserver.ResultMsg{SdkMessage: m, RuleResult: arg.RuleResult}
fmt.Println("鎵撳畬鏍囩鍚庣殑缁撴灉锛�",resultMag)
@@ -50,18 +51,26 @@
// 灏嗗閮ㄤ紶杩涙潵鐨剆dk鏁版嵁鍖呰В鎴� ArgsFromSdk
func paramFormat(msg []byte,arg *ruleserver.ArgsFromSdk) protomsg.SdkMessage {
+ defer func() {
+ if err := recover();err != nil{
+ fmt.Println("瑙ｅ寘杩囩▼鐨勯敊璇�",err.(string))
+ }
+
+ }()
// 鍙嶅簭鍒楀寲鏁版嵁寰楀埌sdk鍏ュ弬
m := protomsg.SdkMessage{}
err := proto.Unmarshal(msg, &m)
if err != nil {
- fmt.Println("瑙ｆ瀽msg鏃跺嚭鐜伴敊璇�", err)
- return m
+ panic("瑙ｆ瀽msg鏃跺嚭鐜伴敊璇�")
}
arg.CameraId = m.Cid
arg.TaskId = m.Tasklab.Taskid
-
+ bdata,err := UnCompress(m.Data)
+ if err != nil {
+ panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
+ }
i := protomsg.Image{}
- err = proto.Unmarshal(m.Data, &i)
+ err = proto.Unmarshal(bdata, &i)
arg.ImageWidth = int(i.Width)
arg.ImageHeight = int(i.Height)
// 鏆傛椂鍐欐锛宻dk杩樻病鏈夎繖淇╃畻娉�
@@ -69,7 +78,7 @@
arg.IsStatic = false
fmt.Println("浠巑ongos涓嬁鍒扮殑鏁版嵁鍖呴暱搴︿负锛�", len(msg))
for _, sdkinfo := range m.Tasklab.Sdkinfos {
- if sdkinfo.Sdktype == "yolo" {
+ if sdkinfo.Sdktype == "Yolo" {
yoloParam := protomsg.ParamYoloObj{}
err = proto.Unmarshal(sdkinfo.Sdkdata, &yoloParam)
if err != nil {
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index 6eaf1c1..dd8b75f 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -146,7 +146,7 @@
}
// 瑙勫垯涓诲嚱鏁板叆鍙�
-func (arg *ArgsFromSdk) MainJudge() {
+func MainJudge(arg *ArgsFromSdk) {
cameraPolygons := GetPolygons(arg.CameraId)
list := AreaMapList{}
for _, polygon := range cameraPolygons {
@@ -257,7 +257,7 @@
// 鏍规嵁cameraId鍘绘洿鏂版垨鑰呮彃鍏ョ粨鏋�,鐒跺悗鍒ゆ柇鏄惁鏁扮粍鏄惁鍙互寰楀嚭鎶ヨ鐨勭粨璁�
// 寰�鑱斿姩浠诲姟鐨勭粨鏋滄暟缁勯噷鏀惧�兼垨鏇存柊
for _, va := range timeEle.RuleResults {
- if aml.areaMapList[0].cameraId != "" && va.CameraId == aml.areaMapList[0].cameraId {
+ if arg.CameraId != "" && va.CameraId == arg.CameraId {
va.Result = strconv.FormatBool(isOk)
}
}
@@ -291,7 +291,7 @@
fmt.Println("杩欏抚鍥惧儚鍦ㄤ换鍔′笅鐨勪竴鏁存潯瑙勫垯涓嬶紙鑱斿姩浠诲姟涓嬪氨鏄窡鏈憚鍍忔満鍍忕浉鍏崇殑灏忚鍒欙級鐨勫垽鏂粨鏋滀负false")
// 鎵�浠ヤ篃瑕佸幓缁撴灉鏁扮粍閲屾斁鍊兼垨鏇存柊
for _, va := range timeEle.RuleResults {
- if aml.areaMapList[0].cameraId != "" && va.CameraId == aml.areaMapList[0].cameraId { // aml.areaMapList[0].cameraId 闅忎究鎵句竴涓暟鎹�
+ if arg.CameraId != "" && va.CameraId == arg.CameraId { // arg.CameraId 闅忎究鎵句竴涓暟鎹�
va.Result = strconv.FormatBool(isOk)
}
}
@@ -369,7 +369,7 @@
// 瀵瑰崟甯у浘鍍忕殑鍒ゆ柇 鏄垗寮冿紙鎴栬�呰瀵逛簬鏌愪簺闇�姹傚彲浠ユ斁ES鏁版嵁搴撲竴浠斤級杩樻槸杩斿洖
func judge(aml *AreaMapList, arg *ArgsFromSdk) {
// 寰楀埌灞炰簬璇ユ憚鍍忔満鐨勮嫢骞茬粍浠诲姟鐨勫畬鏁磋鍒欙紙璺熸瘡涓�鏉″畬鏁磋鍒欐瘮杈冧箣鍚庡緱鍑烘湰寮犲浘鍍忓浜庢煇涓鍒欐槸鍚︽姤璀︾殑缁撴灉銆傛斁杩沵ap锛屾瘮濡傛湰甯у浘鍍忕殑id锛屾墍纰版挒鎴愬姛鐨勮鍒檌d锛�
- taskRuleList := GetRuleGroup(aml.areaMapList[0].cameraId)
+ taskRuleList := GetRuleGroup(arg.CameraId)
if len(taskRuleList) > 0 {
for _, taskRule := range taskRuleList {
ruleList := taskRule.GroupRules // 鑾峰彇鐨勬槸task涓嬮潰鐨勪换鍔＄粍
--
Gitblit v1.8.0