~jinersong/ruleprocess.git

			@@ -19,12 +19,15 @@
			"ruleprocess/util"
			)

			var weedfsUrl,videoPersonUrl,personAction string
			var weedfsUrl, videoPersonUrl, personAction string

			type conf struct {
			PhotoUrl string `yaml:"photoUrl"`
			Videopersons string `yaml:"videopersons"`
			Personaction string `yaml:"personaction"`
			PhotoUrl string `yaml:"photoUrl"`
			VideoPersons string `yaml:"videoPersons"`
			PersonAction string `yaml:"personAction"`
			ServerIp string `yaml:"serverIp"`
			ServerPort string `yaml:"serverPort"`
			DbTablePersons string `yaml:"dbTablePersons"`
			}

			func init() {
			@@ -37,41 +40,41 @@
			//把yaml形式的字符串解析成struct类型
			yaml.Unmarshal(data, &c)
			weedfsUrl = c.PhotoUrl
			videoPersonUrl = c.Videopersons
			personAction = c.Personaction
			videoPersonUrl = c.VideoPersons
			personAction = c.PersonAction
			}

			// 人脸的数据结构
			type PerVideoPicture struct {
			Id string `json:"id"`
			CameraId string `json:"cameraId"`
			CameraAddr string `json:"cameraAddr"`
			PicDate string `json:"picDate"`
			PicMaxUrl string `json:"picMaxUrl"`
			TaskId string `json:"taskId"`
			TaskName string `json:"taskName"`
			SdkName string `json:"sdkName"`
			Content string `json:"content"`
			LikeDate string `json:"likeDate"`
			Sex string `json:"sex"`
			Age int32 `json:"age"`
			AgeDescription string `json:"ageDescription"`
			Race string `json:"race"`
			SmileLevel int32 `json:"smileLevel"`
			BeautyLevel int32 `json:"beautyLevel"`
			FaceFeature string `json:"faceFeature"`
			PicSmUrl []string `json:"picSmUrl"`
			VideoUrl string `json:"videoUrl"`
			AnalyServerId string `json:"analyServerId"`
			AnalyServerName string `json:"analyServerName"`
			AnalyServerIp string `json:"analyServerIp"`
			ClusterId string `json:"clusterId"`
			DetectScore float64 `json:"detectScore"`
			IsAlarm int `json:"isAlarm"`
			IsAckAlarm int `json:"isAckAlarm"`
			IsCollect int `json:"isCollect"`
			IsDelete int `json:"isDelete"`
			BaseInfo []*ruleserver.BaseInfo`json:"baseInfo"`
			Id string `json:"id"`
			CameraId string `json:"cameraId"`
			CameraAddr string `json:"cameraAddr"`
			PicDate string `json:"picDate"`
			PicMaxUrl string `json:"picMaxUrl"`
			TaskId string `json:"taskId"`
			TaskName string `json:"taskName"`
			SdkName string `json:"sdkName"`
			Content string `json:"content"`
			LikeDate string `json:"likeDate"`
			Sex string `json:"sex"`
			Age int32 `json:"age"`
			AgeDescription string `json:"ageDescription"`
			Race string `json:"race"`
			SmileLevel int32 `json:"smileLevel"`
			BeautyLevel int32 `json:"beautyLevel"`
			FaceFeature string `json:"faceFeature"`
			PicSmUrl []string `json:"picSmUrl"`
			VideoUrl string `json:"videoUrl"`
			AnalyServerId string `json:"analyServerId"`
			AnalyServerName string `json:"analyServerName"`
			AnalyServerIp string `json:"analyServerIp"`
			ClusterId string `json:"clusterId"`
			DetectScore float64 `json:"detectScore"`
			IsAlarm int `json:"isAlarm"`
			IsAckAlarm int `json:"isAckAlarm"`
			IsCollect int `json:"isCollect"`
			IsDelete int `json:"isDelete"`
			BaseInfo []*ruleserver.BaseInfo `json:"baseInfo"`
			}

			// yolo行为的数据结构
			@@ -206,9 +209,12 @@
			logger.Info("json parse error ", err)
			return
			}
			err1 := EsReq("POST", videoPersonUrl, requstbody)
			resp1, err1 := EsReq("POST", videoPersonUrl, requstbody)
			if err1 != nil {
			logger.Error("上传ES出错！---", err1)
			} else {
			logger.Info("插入es返回的信息：", resp1)
			ruleserver.AddLxMessage(&protomsg.VideotapeInfo{EsDataId: resp1["_id"].(string), CameraId: msg.Cid, TaskId: msg.Tasklab.Taskid, ImgId: i.Id, SdkIds: []string{}})
			}
			}
			}
			@@ -275,9 +281,13 @@
			logger.Info("json parse error ", err)
			return
			}
			err1 := EsReq("POST", videoPersonUrl, requstbody)
			resp1, err1 := EsReq("POST", videoPersonUrl, requstbody)

			if err1 != nil {
			logger.Error("上传ES出错！---", err1)
			} else {
			logger.Info("插入es返回的信息：", resp1)
			ruleserver.AddLxMessage(&protomsg.VideotapeInfo{EsDataId: resp1["_id"].(string), CameraId: msg.Cid, TaskId: msg.Tasklab.Taskid, ImgId: i.Id, SdkIds: []string{}})
			}
			//if msg.RuleResult["cacheData"] != nil {
			// InsertFace(msg.RuleResult["cacheData"].(ruleserver.ResultMsg))
			@@ -307,7 +317,7 @@
			if len(alarmRules) > 0 {
			isAlarm = 1
			//resp, err = util.PostFormBufferData(weedfsUrl, i, uuid.NewV4().String())
			resp, err = util.DrawPolygonOnImage(msg.Cid, i, msg.RuleResult["yolo"].([]ruleserver.Result))
			resp, err = util.DrawPolygonOnImage(msg.Cid, i, msg.RuleResult["yolo"].([]ruleserver.Result), weedfsUrl)
			if err != nil {
			logger.Error("画框或上传图片服务器出错", err)
			} else {
			@@ -359,10 +369,13 @@
			return

			}
			err = EsReq("POST", personAction, requstbody)
			if err != nil {
			resp1, err2 := EsReq("POST", personAction, requstbody)
			if err2 != nil {
			logger.Error("往ES插入数据失败", err)
			} else {
			logger.Debug("插入es返回的数据信息是：", resp1)
			// 发出录像信号
			ruleserver.AddLxMessage(&protomsg.VideotapeInfo{EsDataId: resp1["_id"].(string), CameraId: msg.Cid, TaskId: msg.Tasklab.Taskid, ImgId: i.Id, SdkIds: []string{}})
			logger.Warn("__________________________________________往ES插入yolo数据成功")
			//os.Exit(1)
			}
			@@ -382,7 +395,7 @@
			i := protomsg.Image{}
			err = proto.Unmarshal(bdata, &i)
			//resp, err = util.PostFormBufferData(weedfsUrl, i, uuid.NewV4().String())
			resp, err := util.DrawPolygonOnImage(msg.Cid, i, msg.RuleResult["yolo"].([]ruleserver.Result))
			resp, err := util.DrawPolygonOnImage(msg.Cid, i, msg.RuleResult["yolo"].([]ruleserver.Result), weedfsUrl)
			if err != nil {
			logger.Error("画框或上传图片服务器出错", err)
			} else {
			@@ -429,10 +442,12 @@
			return

			}
			err = EsReq("POST", personAction, requstbody)
			if err != nil {
			resp1, err1 := EsReq("POST", personAction, requstbody)
			if err1 != nil {
			logger.Error("往ES插入数据失败", err)
			} else {
			logger.Info("插入es返回的信息：", resp1)
			ruleserver.AddLxMessage(&protomsg.VideotapeInfo{EsDataId: resp1["_id"].(string), CameraId: msg.Cid, TaskId: msg.Tasklab.Taskid, ImgId: i.Id, SdkIds: []string{}})
			logger.Warn("__________________________________________往ES插入yolo数据成功")
			//os.Exit(1)
			}