---

panlei

2019-08-01 6590c963faac55285da5f0ae7365cdd53380b4ef

---

 insertdata/insertDataToEs.go

@@ -323,8 +323,8 @@
        // 先判断一下数据带的规则标签是否有可以插入的
        flag := false
        for _, res := range msg.RuleResult["yolo"].([]ruleserver.Result) {
            logger.Info("定时器打的数字标签：",res.Others["timeLabel"].(string))
            if res.Others["timeLabel"].(string) == "01" || res.Others["timeLabel"].(string) == "10" {
            logger.Info("定时器打的数字标签：",res.Others.TimeLabel)
            if res.Others.TimeLabel == "01" || res.Others.TimeLabel == "10" {
                flag = true
            }
        }
@@ -334,18 +334,18 @@
            alarmRules := []AlarmRule{}
            url := []string{}
            for _, yoloResult := range msg.RuleResult["yolo"].([]ruleserver.Result) {
                if yoloResult.Others["timeLabel"].(string) == "01" || yoloResult.Others["timeLabel"].(string) == "10" {
                if yoloResult.Others.TimeLabel == "01" || yoloResult.Others.TimeLabel == "10" {
                    // 拼出sdkname
                    logger.Info("应该进来才对的")
                    sdkNames = sdkNames + yoloResult.SdkName
                    alarm := ChangeToString(yoloResult.DefenceState, yoloResult.AlarmLevel)
                    alarmRules = append(alarmRules, AlarmRule{yoloResult.RuleGroupId, alarm, yoloResult.RuleText, yoloResult.DefenceState})
                    // 上传缓存数据的图片拿到url
                    if yoloResult.Others["cacheData"] != nil {
                    if yoloResult.Others.CacheData != nil {
                        //InsertYolo(msg.RuleResult["cacheData"].(ruleserver.ResultMsg))
                        // 把缓存的数据上传后得到地址存进去
                        // 解压缩并上传图片
                        msgs := yoloResult.Others["cacheData"].([]ruleserver.ResultMsg)
                        msgs := yoloResult.Others.CacheData
                        for _, msg1 := range msgs {
                            bdata, err := util.UnCompress(msg1.Data)
                            if err != nil {
@@ -366,16 +366,9 @@
            }
            linkFlag := false
            for _, yoloResult := range msg.RuleResult["yolo"].([]ruleserver.Result) {
                if (yoloResult.Others["timeLabel"].(string) == "01" || yoloResult.Others["timeLabel"].(string) == "10") && yoloResult.Others["linkCache"] != nil && len(yoloResult.Others["linkCache"].([]ruleserver.ResultMsg)) > 1{
                    for _, msg2 := range yoloResult.Others["linkCache"].([]ruleserver.ResultMsg) {
                if (yoloResult.Others.TimeLabel == "01" || yoloResult.Others.TimeLabel == "10") && yoloResult.Others.LinkCache != nil && len(yoloResult.Others.LinkCache) > 1{
                    for _, msg2 := range yoloResult.Others.LinkCache {
                        logger.Warn("插入联动数据")
                        for _,nihao := range msg2.RuleResult["yolo"].([]ruleserver.Result)  {
                            num := 1
                            for k,_ := range nihao.Others {
                                logger.Info("第",num,"次键：",k)
                            }
                            num++
                        }
                        //logger.Warn("哈哈哈哈哈",[0].Others["linkCache"].([]ruleserver.ResultMsg))
                        InsertYolo(msg2)
                        logger.Warn("兄弟难道你陷入了死循环吗")