From dd14647ee77aef511d76ade8e0993f67efc94844 Mon Sep 17 00:00:00 2001 From: liuxiaolong <736321739@qq.com> Date: 星期二, 27 八月 2019 11:28:53 +0800 Subject: [PATCH] fix swagger --- controllers/initForData.go | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/controllers/initForData.go b/controllers/initForData.go index af18dd4..fc0c9d4 100644 --- a/controllers/initForData.go +++ b/controllers/initForData.go @@ -52,30 +52,34 @@ util.ResponseFormat(c, code.Success, tokenRes) } +type InitForMonitorArg struct { + TreeNodes []string `json:"treeNodes"` + Tasks []string `json:"tasks"` +} + // @Summary 瀹炴椂浠诲姟鐩戞帶鏁版嵁鍒濆鍖� // @Description 瀹炴椂鐩戞帶姣斿鏁版嵁 // @Accept json // @Produce json // @Tags realTime -// @Param obj body map true "搴曞簱鏁版嵁" +// @Param obj body controllers.InitForMonitorArg true "瀹炴椂浠诲姟鐩戞帶鍙傛暟" // @Success 200 {string} json "{"code":200, msg:"鐩綍缁撴瀯鏁版嵁", success:true}" // @Failure 500 {string} json "{"code":500, msg:"杩斿洖閿欒淇℃伅", success:false}" // @Router /data/api-v/realTime/initForMonitoringData [POST] -//瀹炴椂鐩戞帶鏁版嵁鍒濆鍖� func (rc *RealTimeController) InitForMonitoringData(c *gin.Context) { - searchBody := make(map[string]interface{}, 0) - + //searchBody := make(map[string]interface{}, 0) + var searchBody InitForMonitorArg c.BindJSON(&searchBody) index := config.EsInfo.EsIndex.VideoPersons.IndexName + "," + config.EsInfo.EsIndex.Personaction.IndexName cameraIdStr := "" - cameraId := searchBody["treeNodes"].([]interface{}) + cameraId := searchBody.TreeNodes if cameraId != nil && len(cameraId) > 0 { esCameraId := strings.Replace(strings.Trim(fmt.Sprint(cameraId), "[]"), " ", "\",\"", -1) cameraIdStr = "{\"terms\":{\"cameraId\":[\"" + esCameraId + "\"]}}," } //鍒ゆ柇浠诲姟ID taskIdStr := "{\"terms\":{\"taskId\":[]}}," - taskId := searchBody["tasks"].([]interface{}) + taskId := searchBody.Tasks if taskId != nil && len(taskId) > 0 { esTaskId := strings.Replace(strings.Trim(fmt.Sprint(taskId), "[]"), " ", "\",\"", -1) taskIdStr = "{\"terms\":{\"taskId\":[\"" + esTaskId + "\"]}}," -- Gitblit v1.8.0