commit

aarch64/pjisuv/master/config/trigger_init.go

@@ -215,9 +215,9 @@ func InitTriggerConfig() {
 			}
 			RuleOfLine2 = append(RuleOfLine2, f)
 		} else if TopicOfMapPolygon == topic2 { //20
-			f, ok := rule.(func(data *pjisuv_msgs.PolygonStamped) string)
+			f, ok := rule.(func(data *pjisuv_msgs.PolygonStamped, param entity.PjisuvParam) string)
 			if ok != true {
-				c_log.GlobalLogger.Error("插件", triggerLocalPath, "中的Topic方法必须是(func(data *pjisuv_msgs.PolygonStamped) string):", err)
+				c_log.GlobalLogger.Error("插件", triggerLocalPath, "中的Topic方法必须是(func(data *pjisuv_msgs.PolygonStamped,param entity.PjisuvParam) string):", err)
 				continue
 			}
 			RuleOfMapPolygon = append(RuleOfMapPolygon, f)

aarch64/pjisuv/master/config/trigger_var.go

@@ -95,7 +95,7 @@ var (
 
 	//20
 	TopicOfMapPolygon = "/map_polygon"
-	RuleOfMapPolygon  []func(data *pjisuv_msgs.PolygonStamped) string
+	RuleOfMapPolygon  []func(data *pjisuv_msgs.PolygonStamped, param pjisuv_param.PjisuvParam) string
 
 	//21
 	TopicOfObstacleDisplay = "/obstacle_display"

aarch64/pjisuv/master/service/produce_window.go

@@ -619,7 +619,7 @@ func PrepareTimeWindowProducerQueue() {
 						lastTimeWindow := commonEntity.GetLastTimeWindow() // 获取最后一个时间窗口
 						var faultLabel string
 						for _, f := range masterConfig.RuleOfMapPolygon {
-							faultLabel = f(data)
+							faultLabel = f(data, pjisuvParam)
 							if faultLabel != "" {
 								saveTimeWindow(faultLabel, faultHappenTime, lastTimeWindow)
 								subscribersTimes[i] = time.Now()