From 7c811247ecf143e08c576986a884bedadc57dd66 Mon Sep 17 00:00:00 2001 From: liuxiaolong <liuxiaolong@aiotlink.com> Date: 星期五, 05 六月 2020 18:29:41 +0800 Subject: [PATCH] add refresh token to resp --- controllers/cameraTask.go | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 51 insertions(+), 1 deletions(-) diff --git a/controllers/cameraTask.go b/controllers/cameraTask.go index a3130f0..7ae01fb 100644 --- a/controllers/cameraTask.go +++ b/controllers/cameraTask.go @@ -2,9 +2,14 @@ import ( "basic.com/dbapi.git" + "basic.com/pubsub/esutil.git" + "encoding/json" "fmt" "github.com/gin-gonic/gin" + "strconv" + "webserver/cache" "webserver/extend/code" + "webserver/extend/config" "webserver/extend/util" "webserver/models" ) @@ -90,7 +95,52 @@ var api dbapi.CameraTaskApi flag, data := api.FindTasksByCameraIds(mulCamera.CameraIds) if flag { - util.ResponseFormat(c,code.Success,data) + bytes, _ := json.Marshal(data) + var camTInfo []CameraTaskInfoVo + json.Unmarshal(bytes, &camTInfo) + + //澶勭悊宸茶鍒犻櫎鐨勪换鍔� + + var delTasks []models.Task + var taskApi dbapi.TaskApi + taskInfos := taskApi.FindAll() + m := make(map[string]string) + for _,ti :=range taskInfos{ + if ti.Task.Taskid != FaceExtract_VirtualTaskId{ + m[ti.Task.Taskid] = ti.Task.Taskid + } + } + localConf, _ := cache.GetServerInfo() + if localConf.AlarmIp != "" && localConf.ServerId != "" && localConf.AlarmPort>0 { + indexName := config.EsInfo.EsIndex.AiOcean.IndexName + esTaskM, e := esutil.AggregateTaskList(localConf.AlarmIp, strconv.Itoa(int(localConf.AlarmPort)), indexName, localConf.ServerId) + if e==nil && esTaskM !=nil { + for _,tM :=range esTaskM { + if _,ok := m[tM["taskId"].(string)];!ok {//琛ㄧず姝や换鍔″凡琚垹闄� + taskId := tM["taskId"].(string) + m[taskId] = taskId + delTasks = append(delTasks, models.Task{ + Taskid: taskId, + Taskname: tM["taskName"].(string), + DelFlag: true, + }) + } + } + } + } + var result []CameraTaskInfoVo + if camTInfo != nil { + for _, camIn := range camTInfo { + nIfn := CameraTaskInfoVo{ + Camera: camIn.Camera, + Polygon: camIn.Polygon, + Tasks: append(camIn.Tasks, delTasks...), + } + result = append(result, nIfn) + } + } + + util.ResponseFormat(c,code.Success, result) } else { util.ResponseFormat(c,code.ComError,data) } -- Gitblit v1.8.0