From 1511749768934568ecdf58986f6f4100bf062881 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期六, 22 六月 2019 16:17:13 +0800
Subject: [PATCH] 算法补>0
---
util/upload.go | 5 +++--
insertdata/insertDataToEs.go | 8 ++++----
ruleserver/ruleToformula.go | 25 +++++++++++++++++++++----
main.go | 8 ++++----
4 files changed, 32 insertions(+), 14 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index d41ff73..a1c8c97 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -86,7 +86,7 @@
type AlarmRule struct {
GroupId string `json:"groupId"`
- AlarmLevel string `json:"alarmLevel"`
+ AlarmLevel int32 `json:"alarmLevel"`
RuleText string `json:"ruleText"`
}
@@ -98,7 +98,7 @@
faceParam := protomsg.ParamFacePos{}
err1 := proto.Unmarshal(sdkinfo.Sdkdata, &faceParam)
if err1 != nil {
- fmt.Println("瑙ｆ瀽sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err1)
+ fmt.Println("瑙ｆ瀽FACE sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err1)
continue
}
for _, face := range faceParam.Faces {
@@ -161,7 +161,7 @@
yoloObj := protomsg.ParamYoloObj{}
err1 := proto.Unmarshal(sdkinfo.Sdkdata, &yoloObj)
if err1 != nil {
- fmt.Println("瑙ｆ瀽sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err1)
+ fmt.Println("瑙ｆ瀽YOLO sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err1)
continue
}
alarmRules := []AlarmRule{}
@@ -214,7 +214,7 @@
return
}
- err = EsReq("POST", "http://192.168.1.182:9200/videopersons/perVideoPicture", requstbody)
+ err = EsReq("POST", "http://192.168.1.182:9200/personaction/perVideoAction", requstbody)
if err != nil {
fmt.Println("es can not execute right.")
}
diff --git a/main.go b/main.go
index 333df4b..b293bc8 100644
--- a/main.go
+++ b/main.go
@@ -44,7 +44,7 @@
ruleserver.MainJudge(&arg)
// 鎶奱rg閲岀殑鎵撶殑鏍囩鎷垮嚭鏉ョ粰m鍐嶅皝瑁呬竴灞�
resultMag := ruleserver.ResultMsg{SdkMessage: m, RuleResult: arg.RuleResult}
- fmt.Println("鎵撳畬鏍囩鍚庣殑缁撴灉锛�",resultMag)
+ //fmt.Println("鎵撳畬鏍囩鍚庣殑缁撴灉锛�",resultMag)
// 灏嗘墦瀹屾爣绛剧殑鏁版嵁鎻掑叆鍒癊S
insertdata.InsertToEs(resultMag)
@@ -86,7 +86,7 @@
yoloParam := protomsg.ParamYoloObj{}
err = proto.Unmarshal(sdkinfo.Sdkdata, &yoloParam)
if err != nil {
- fmt.Println("瑙ｆ瀽sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
+ fmt.Println("瑙ｆ瀽FACE sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
continue
}
for _, info := range yoloParam.Infos {
@@ -99,11 +99,11 @@
faceParam := protomsg.ParamFacePos{}
err = proto.Unmarshal(sdkinfo.Sdkdata, &faceParam)
if err != nil {
- fmt.Println("瑙ｆ瀽sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
+ fmt.Println("瑙ｆ瀽YOLO sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
continue
}
for _, info := range faceParam.Faces {
- photoMap := ruleserver.PhotoMap{Rects:nil, Score: float64(info.Pos.Quality)}
+ photoMap := ruleserver.PhotoMap{Rects:ruleserver.Rect{}, Score: float64(info.Pos.Quality)}
arg.Photo = append(arg.Photo, photoMap)
}
}
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index ca5f321..6f6ffbf 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -300,14 +300,21 @@
filterRule(groupRule.Rules[j], &areaMap)
}
for j := 0; j < len(groupRule.Rules); j++ {
- // 鍐嶈繃鍏朵粬鏁版嵁 杩欐鐩存帴寰楀埌缁撴灉锛堢湡鎴栧亣锛�
+ // 鍐嶈繃鍏朵粬鏁版嵁 杩欐鐩存帴寰楀埌缁撴灉锛堢湡鎴栧亣锛� 杩囩洰鏍囨暟閲�
flag := transferParameters(groupRule.Rules[j], &areaMap)
if flag != "" {
fmt.Println("寰楀嚭鐨勭粨鏋�", flag)
completeFormula = completeFormula + groupRule.Rules[j].RuleWithPre + "" + flag
}
}
+ if completeFormula == "" {
+ flag := splice1(&areaMap)
+ if flag != "" {
+ fmt.Println("寮鸿鎷煎噾涓�涓汉鏁版槸鍚﹀ぇ浜�0鐨勭粨鏋�", flag)
+ completeFormula = completeFormula + groupRule.Rules[j].RuleWithPre + "" + flag
+ }
+ }
for j := 0; j < len(groupRule.Rules); j++ {
// 杩欐杩囩殑鏄椂闂磋鍒欙紙鏃堕棿娈电瓑锛�
flag := timeRuleResult(groupRule.Rules[j], &areaMap)
@@ -316,10 +323,12 @@
completeFormula = completeFormula + groupRule.Rules[j].RuleWithPre + "" + flag
}
}
+
for j := 0; j < len(groupRule.Rules); j++ {
// 鏈�鍚庤繃鎸佺画鏃堕棿绛夋椂闂寸淮搴︾殑鏉′欢
duration(groupRule.Rules[j], &areaMap)
}
+
}
fmt.Println("鎷煎嚭鐨勬暟瀛﹀叕寮忎负:==== ", completeFormula)
if completeFormula != "" {
@@ -405,13 +414,12 @@
formula = strconv.FormatFloat(arg.size, 'f', -1, 64) + " " + rule.Operator + " " + rule.SdkArgValue // 寰楀埌瀛楃涓插叕寮�
}
expression, _ := govaluate.NewEvaluableExpression(formula) // 寰楀埌鏁板鍏紡
- result, _ := expression.Evaluate(nil) // 寰楀埌鏁板鍏紡鐨勭粨鏋�
+ result, _ := expression.Evaluate(nil) // 寰楀埌鏁板鍏紡鐨勭粨鏋�
if result.(bool) {
am.filterData = append(am.filterData, arg) // 寰楀埌绗﹀悎鏉′欢鐨勮繃婊ゆ暟鎹�
}
}
am.targetNum = len(am.filterData) // 鎶婄鍚堟潯浠剁殑鐩爣鏁伴噺鏇存柊鍒皌argetNum瀛楁
- //fmt.Println("绛涢�夊畬鍚庣殑鍐呭锛�", am)
}
}
}
@@ -439,7 +447,14 @@
}
}
}
-
+// 鍐椾綑鎷兼帴
+func splice1 (am *AreaMap) string {
+ args := am.targetNum
+ formula := strconv.Itoa(args) + " " + ">" + "0"
+ expression, _ := govaluate.NewEvaluableExpression(formula) // 寰楀埌鏁板鍏紡
+ result, _ := expression.Evaluate(nil) // 寰楀埌鏁板鍏紡鐨勭粨鏋�
+ return strconv.FormatBool(result.(bool))
+}
// 缁欐暟鎹簱鐨勮鍒欒〃杈惧紡浠ｅ弬 args: 涓�鏉″瓙瑙勫垯锛屽尯鍩熸暟鎹�
func transferParameters(rule *protomsg.Rule, am *AreaMap) string {
if rule.PolygonId == am.areaId { // 棣栧厛瑙勫垯鎵�瀵瑰簲鐨勫尯鍩焛d瑕佽窡鍖哄煙鏁版嵁鐨刬d瀵圭殑涓�
@@ -473,6 +488,8 @@
} else {
return "false"
}
+ } else {
+
}
}
diff --git a/util/upload.go b/util/upload.go
index ce86bc1..9c7e6a2 100644
--- a/util/upload.go
+++ b/util/upload.go
@@ -5,6 +5,7 @@
"encoding/json"
"errors"
"fmt"
+ uuid "github.com/satori/go.uuid"
"io"
"log"
"mime/multipart"
@@ -12,10 +13,10 @@
"time"
)
var weedfsUri = "http://192.168.1.182:9500/submit"
-func PostFormData(uri string, filename, paramName string, file multipart.File) (maps map[string]interface{}, err0 error) {
+func PostFormData(uri string) (maps map[string]interface{}, err0 error) {
body := &bytes.Buffer{}
writer := multipart.NewWriter(body)
- _, err := writer.CreateFormFile(paramName, filename)
+ _, err := writer.CreateFormFile("file", uuid.NewV4().String())
if err != nil {
return nil, err
}
--
Gitblit v1.8.0