From 90f568cf48fcc3131b45a2081dea40015eae5c5b Mon Sep 17 00:00:00 2001 From: panlei <2799247126@qq.com> Date: 星期六, 16 十一月 2019 18:00:33 +0800 Subject: [PATCH] 把数据格式化以及装配放进so --- ruleserver/readyDataForRule.go | 31 +------------------------------ 1 files changed, 1 insertions(+), 30 deletions(-) diff --git a/ruleserver/readyDataForRule.go b/ruleserver/readyDataForRule.go index 3b1388f..5fb9ac4 100644 --- a/ruleserver/readyDataForRule.go +++ b/ruleserver/readyDataForRule.go @@ -93,35 +93,6 @@ //logger.Info("鍒濇淇濈暀涓や綅鎴恠tr::::",value2) return value2 } -// 鍙栧嚭鏌愪釜鏃堕棿瑙勫垯鐨勭鍑犲ぉ鐨勮鍒欐闆嗗悎 -func GetTimeById(id string, index int) []structure.TimeRange { - _, cameraTimeRule := cache.GetTimeRuleById(id) - var timeRangeList []structure.Day - err := json.Unmarshal([]byte(cameraTimeRule.TimeRule), &timeRangeList) - if err != nil { - logger.Error("鍙栨椂闂磋鍒欐椂鍙嶅簭鍒楀寲閿欒锛�") - } - for _, timerange := range timeRangeList { - if timerange.Day == index { - //logger.Println("鍙栧埌鐨勬椂闂磋鍒欙細", timerange.TimeRange) - return timerange.TimeRange - } - } - return nil -} - -// 鏍规嵁浼犲叆鐨勫瓧绗︿覆寰楀埌鍏跺湪涓�鍛ㄥ唴鐨勭储寮� 鍛ㄤ竴鍒板懆鏃ュ垎鍒搴�1鍒�7 -func getIndexOfWeek(weekday string) int { - var weekdays = [7]string{"Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"} - for k, value := range weekdays { - if value == weekday { - return k + 1 // 鍥犱负鏁版嵁搴撲腑瀛樼殑鏄�1-7浠h〃鐨勫懆涓�鍒板懆鏃� - } - } - return 0 -} - - // 灏嗗瓧绗︿覆鏍煎紡鐨勫潗鏍囧簭鍒楀寲涓篜oint鏍煎紡 func Json2points(areaPoints string) []structure.Point { @@ -275,7 +246,7 @@ // 杩欐瑕佸榻愯〃杈惧紡閲屾墍闇�瑕佺殑鎵�鏈夊弬鏁� a.TargetNum++ uuid := uuid.NewV4().String() - arg1 := structure.Arg{obj.Id,uuid,obj.Score, PgsInterPercent(areaPoints, obj.Rects, widthScale, heigthScale), float64(obj.Rects.Width * obj.Rects.Height), a.AreaJson,obj.IsYolo, obj.Rects, obj.Feature, obj.ThftRes, []*structure.BaseInfo{},"",structure.ResultMsg{}} + arg1 := structure.Arg{obj.Id,uuid,obj.Score, PgsInterPercent(areaPoints, obj.Rects, widthScale, heigthScale), float64(obj.Rects.Width * obj.Rects.Height), a.AreaJson,obj.IsYolo, obj.Rects, obj.Car,obj.Feature, obj.ThftRes, []*structure.BaseInfo{},"",structure.ResultMsg{}} //logger.Println("鏀捐繘鍘荤殑arg锛�-------", arg1) a.Args = append(a.Args, &arg1) a.FilterData = append(a.FilterData, &arg1) -- Gitblit v1.8.0