From 5c9c95f73259d6bfb8c3b6adef7377d05174c456 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 20 六月 2019 17:51:52 +0800
Subject: [PATCH] Merge branch 'master' of https://192.168.1.14/r/ruleprocess
---
ruleserver/ruleToformula.go | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
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