From a079474001cae43352504c6cad5d2c31fcdb3f6a Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 07 十一月 2019 20:05:34 +0800
Subject: [PATCH] fix bug
---
ruleserver/ruleToformula.go | 7 +------
ruleserver/geoPolygon.go | 6 +++---
2 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/ruleserver/geoPolygon.go b/ruleserver/geoPolygon.go
index 6f64108..ec304a4 100644
--- a/ruleserver/geoPolygon.go
+++ b/ruleserver/geoPolygon.go
@@ -43,7 +43,7 @@
//PintIsInPolygon 鍒ゆ柇鐐规槸鍚﹀湪澶氳竟褰㈠唴閮�
//point涓鸿鍒ゆ柇鐨勫潗鏍囩偣
//polygon鏄杈瑰舰鍚勭偣鏁扮粍
-func pintIsInPolygon(point Pointfloat, polygon []Point, widthScale float64, heightScale float64) bool {
+func pintIsInPolygon(point structure.Pointfloat, polygon []Point, widthScale float64, heightScale float64) bool {
var nCross int = 0
for i := 0; i < len(polygon); i++ {
@@ -76,14 +76,14 @@
func getLocation(rect structure.Rect, n int) ([]structure.Pointfloat, float64) {
xArr := make([]float64, n) // 鐢ㄥ垏鐗囦笉鐢ㄦ暟缁勶紝鏁扮粍涓嶈兘鐢ㄥ彉閲忓畾涔夐暱搴�
yArr := make([]float64, n)
- pointArr := make([]Pointfloat, 0, n*n)
+ pointArr := make([]structure.Pointfloat, 0, n*n)
for i := 0; i < n; i++ {
xArr[i] = rect.X + (rect.Width/float64(2*n))*float64(2*i+1)
yArr[i] = rect.Y + (rect.Height/float64(2*n))*float64(2*i+1)
}
for i := 0; i < n; i++ {
for j := 0; j < n; j++ {
- point := Pointfloat{X: xArr[i], Y: yArr[j]}
+ point := structure.Pointfloat{X: xArr[i], Y: yArr[j]}
pointArr = append(pointArr, point)
}
}
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index c9407ed..d252a1f 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -2,21 +2,15 @@
import (
"basic.com/pubsub/protomsg.git"
- "basic.com/valib/logger.git"
"github.com/knetic/govaluate"
"plugin"
"ruleprocess/cache"
- "ruleprocess/structure"
"ruleprocess/logger"
"ruleprocess/structure"
"sort"
"strconv"
"strings"
"sync"
- "time"
-
- "basic.com/pubsub/protomsg.git"
- "github.com/knetic/govaluate"
)
@@ -436,6 +430,7 @@
// 濡傛灉鏈夋寔缁椂闂存潯浠剁淮鎶ゅ紑鍚竴涓畾鏃跺櫒
func duration(rule *protomsg.Rule, groupId string, am *structure.AreaMap, args *structure.SdkDatas, message *protomsg.SdkMessage) string{
+ cacheId := ""
if rule.PolygonId == am.AreaId { // 棣栧厛瑙勫垯鎵�瀵瑰簲鐨勫尯鍩焛d瑕佽窡鍖哄煙鏁版嵁鐨刬d瀵圭殑涓� 閰嶇疆鐨勭畻娉曡瀵圭殑涓�
if rule.SdkArgAlias == "duration" { //
//logger.Info("褰撳墠灏忚鍒欐槸锛�---------", rule)
--
Gitblit v1.8.0