From 7af9bc6b2a6a5beffccb19205afd263da1853f45 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期六, 22 六月 2019 18:09:14 +0800
Subject: [PATCH] ---
---
ruleserver/ruleToformula.go | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index 6f6ffbf..e4be299 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -188,11 +188,17 @@
// 灏嗗瓧绗︿覆鏍煎紡鐨勫潗鏍囧簭鍒楀寲涓篜oint鏍煎紡
func Json2points(areaPoints string) []Point {
var pts []Point
-
- err := json.Unmarshal([]byte(areaPoints), &pts)
- if err != nil {
- fmt.Println("json.Unmarshal閿欒", err)
- panic("搴忓垪鍖栧潗鏍囧紓甯革紝绋嬪簭閫�鍑�")
+ if areaPoints == "" {
+ 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 {
+ fmt.Println("json.Unmarshal閿欒", err)
+ panic("搴忓垪鍖栧潗鏍囧紓甯革紝绋嬪簭閫�鍑�")
+ }
}
return pts
}
@@ -311,9 +317,8 @@
flag := splice1(&areaMap)
if flag != "" {
fmt.Println("寮鸿鎷煎噾涓�涓汉鏁版槸鍚﹀ぇ浜�0鐨勭粨鏋�", flag)
- completeFormula = completeFormula + groupRule.Rules[j].RuleWithPre + "" + flag
+ completeFormula = flag
}
-
}
for j := 0; j < len(groupRule.Rules); j++ {
// 杩欐杩囩殑鏄椂闂磋鍒欙紙鏃堕棿娈电瓑锛�
--
Gitblit v1.8.0