From 6e8ebf781ac457b7ec77f7e4c9ade4c3d36002bc Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 07 十一月 2019 18:42:05 +0800
Subject: [PATCH] merge master
---
ruleserver/readyDataForRule.go | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ruleserver/readyDataForRule.go b/ruleserver/readyDataForRule.go
index 8dab014..7aa9db4 100644
--- a/ruleserver/readyDataForRule.go
+++ b/ruleserver/readyDataForRule.go
@@ -3,6 +3,7 @@
import (
"basic.com/dbapi.git"
"basic.com/pubsub/protomsg.git"
+ "basic.com/valib/logger.git"
"encoding/json"
"errors"
"fmt"
@@ -13,7 +14,6 @@
"nanomsg.org/go-mangos/transport/tcp"
"net"
"ruleprocess/cache"
- "ruleprocess/logger"
"ruleprocess/structure"
"strconv"
"time"
@@ -123,14 +123,14 @@
// 灏嗗瓧绗︿覆鏍煎紡鐨勫潗鏍囧簭鍒楀寲涓篜oint鏍煎紡
-func Json2points(areaPoints string) []structure.Point {
- var pts []structure.Point
+func Json2points(areaPoints string) []Point {
+ var pts []Point
if areaPoints == "[]" || areaPoints == "" {
logger.Error("=====================姝ゅ尯鍩熶负鍏ㄩ儴鍖哄煙")
- pts = append(pts, structure.Point{0, 0})
- pts = append(pts, structure.Point{0, 540})
- pts = append(pts, structure.Point{960, 540})
- pts = append(pts, structure.Point{960, 0})
+ pts = append(pts, Point{0, 0})
+ pts = append(pts, Point{0, 540})
+ pts = append(pts, Point{960, 540})
+ pts = append(pts, Point{960, 0})
} else {
err := json.Unmarshal([]byte(areaPoints), &pts)
if err != nil {
--
Gitblit v1.8.0