From 7ce84b3d1e45d35c7c9f73561893039a05c16995 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期五, 20 十二月 2019 19:38:18 +0800
Subject: [PATCH] fix unTargz
---
controllers/cameraTask.go | 46 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 44 insertions(+), 2 deletions(-)
diff --git a/controllers/cameraTask.go b/controllers/cameraTask.go
index 4066ceb..77fa907 100644
--- a/controllers/cameraTask.go
+++ b/controllers/cameraTask.go
@@ -74,6 +74,7 @@
Polygon CameraPolygonVo `json:"polygon"`
}
+// @Security ApiKeyAuth
// @Summary 鏌ヨ鎵�鏈変换鍔�
// @Description "鏌ヨ鎵�鏈変换鍔�"
// @Accept json
@@ -95,6 +96,37 @@
}
}
+// @Security ApiKeyAuth
+// @Summary 鎽勫儚鏈烘坊鍔犱竴涓换鍔�
+// @Description 鎽勫儚鏈烘坊鍔犱竴涓换鍔�
+// @Accept x-www-form-urlencoded
+// @Produce json
+// @Tags CameraTask
+// @Param cameraId formData string true "鎽勫儚鏈篿d"
+// @Param taskId formData string true "浠诲姟id"
+// @Success 200 {string} json "{"code":200, success:true, msg:"璇锋眰澶勭悊鎴愬姛", data:"鍗曚釜鎽勫儚鏈虹殑鍏ㄩ儴淇℃伅"}"
+// @Failure 500 {string} json "{"code":500, success:false, msg:"",data:"閿欒淇℃伅鍐呭"}"
+// @Router /data/api-v/cameraTask/addTask [post]
+func (ctc CameraTaskController) AddTask(c *gin.Context) {
+ cameraId := c.PostForm("cameraId")
+ taskId := c.PostForm("taskId")
+ if cameraId == "" || taskId == "" {
+ util.ResponseFormat(c,code.RequestParamError,"鍙傛暟鏈夎")
+ return
+ }
+ var api dbapi.CameraTaskApi
+ if b,data := api.AddTask(cameraId, taskId);b {
+ util.ResponseFormat(c,code.AddSuccess, data)
+ } else {
+ if data.(string) == "姝ゅ浗鏍囨憚鍍忔満宸插湪鍏跺畠鏈嶅姟鍣ㄩ厤缃换鍔★紒" {
+ util.ResponseFormat(c,code.AddTaskErr, data)
+ } else {
+ util.ResponseFormat(c,code.ComError, data)
+ }
+ }
+}
+
+// @Security ApiKeyAuth
// @Summary 鏌ヨ鎵�鏈変换鍔�
// @Description "鏌ヨ鎵�鏈変换鍔�"
// @Produce json
@@ -118,7 +150,7 @@
}
}
-
+// @Security ApiKeyAuth
// @Summary 鎽勫儚鏈轰繚瀛樹换鍔�
// @Description 鎽勫儚鏈轰繚瀛樹换鍔�
// @Accept json
@@ -147,6 +179,7 @@
}
}
+// @Security ApiKeyAuth
// @Summary 鍒犻櫎鎽勫儚鏈虹殑浠诲姟
// @Description 鍒犻櫎鎽勫儚鏈虹殑浠诲姟
// @Produce json
@@ -183,6 +216,7 @@
AlarmLevel int `json:"alarm_level"`
}
+// @Security ApiKeyAuth
// @Summary 淇濆瓨浠诲姟鏄惁涓嬩紶鏁版嵁
// @Description 淇濆瓨浠诲姟鏄惁涓嬩紶鏁版嵁
// @Accept json
@@ -209,8 +243,10 @@
}
}
+// @Security ApiKeyAuth
// @Summary 淇濆瓨瑙勫垯缁勬姤璀︾瓑绾�
// @Description 淇濆瓨瑙勫垯缁勬姤璀︾瓑绾�
+// @Accept json
// @Produce json
// @Tags CameraTask
// @Param GroupLevel body controllers.GroupAlarmLevelVo true "alarmLevel"
@@ -239,8 +275,10 @@
Status int `json:"status"`
}
+// @Security ApiKeyAuth
// @Summary 鏇存柊浠诲姟鐘舵��
// @Description 鏇存柊浠诲姟鐘舵��
+// @Accept json
// @Produce json
// @Tags CameraTask
// @Param CameraTaskStatus body controllers.CameraTaskStatusVo true "鍙傛暟缁撴瀯浣�"
@@ -256,7 +294,11 @@
var api dbapi.CameraTaskApi
flag, data := api.UpdateCameraTaskStatus(paramVo.CameraId, paramVo.TaskId, paramVo.Status)
if flag {
- util.ResponseFormat(c,code.Success,data)
+ if data.(string) == "姝や换鍔′负鍋滅敤鐘舵�侊紝璇峰湪浠诲姟绠＄悊涓紑鍚紒"{
+ util.ResponseFormat(c,code.TaskStoped,data)
+ } else {
+ util.ResponseFormat(c,code.UpdateSuccess,data)
+ }
} else {
util.ResponseFormat(c,code.ComError,data)
}
--
Gitblit v1.8.0