add w h

sunty

2020-08-23 44c0510dc671b1171a9e0c612c29fca6ec2b17c3

add w h

 EsApi.go

@@ -201,7 +201,8 @@
            "updateTime",
            "picMaxUrl",
            "targetInfo.belongsTargetId",
            "targetInfo.targetLocation"
            "targetInfo.targetLocation",
            "picWH"
        ]
    }
}`
@@ -285,7 +286,7 @@
                            }
                        ],
                        "_source":{
                            "includes":["baseInfo.targetId","cameraId","cameraName","cameraAddr","targetInfo.targetScore","targetInfo.picSmUrl","showLabels","baseInfo.tableId","baseInfo.tableName","baseInfo.bwType","baseInfo.targetName","baseInfo.compareScore","picDate","picMaxUrl"]
                            "includes":["baseInfo.targetId","cameraId","cameraName","cameraAddr","targetInfo.targetScore","targetInfo.picSmUrl","showLabels","baseInfo.tableId","baseInfo.tableName","baseInfo.bwType","baseInfo.targetName","baseInfo.compareScore","picDate","picMaxUrl","picWH"]
                        }
                    }
                }

 EsClient.go

@@ -533,7 +533,7 @@
            if startTime != "" {
                sinTime, _ := time.ParseInLocation("2006-01-02 15:04:05", startTime, loc)
                stayTime = math.Abs(sinTime.Sub(mTime).Seconds())
                if  stayTime <= thresholdTime {
                if stayTime <= thresholdTime {
                    startTime = tmpTime
                    hitsSources[len(hitsSources)-1]["endTime"] = tmpTime
                    continue
@@ -564,6 +564,7 @@
            tmpHitSource["stayTime"] = stayTime
            tmpHitSource["endTBackGroundPicUrl"] = source["picMaxUrl"].([]interface{})
            tmpHitSource["endTFacePicUrl"] = targetInfo["picSmUrl"].(string)
            tmpHitSource["picWH"] = source["picWH"].(map[string]interface{})
            hitsSources = append(hitsSources, tmpHitSource)
        }
        allSource = append(allSource, hitsSources...)
@@ -607,6 +608,9 @@
        stayTime := endT.Sub(startT).Seconds()
        source["stayTime"] = stayTime
        source["endBackGroundPicUrl"] = pixMaxUrl[len(pixMaxUrl)-1]
        if info["picWH"] != nil {
            source["picWH"] = info["picWH"].(map[string]interface{})
        }
        sources = append(sources, source)
    }