From 2e2f869cc7c24b0e2cf2d1f6f60bc01fde327210 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期三, 26 六月 2019 20:00:04 +0800
Subject: [PATCH] fix bug

---
 controllers/cameraTask.go |   94 +++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 78 insertions(+), 16 deletions(-)

diff --git a/controllers/cameraTask.go b/controllers/cameraTask.go
index 4080663..4066ceb 100644
--- a/controllers/cameraTask.go
+++ b/controllers/cameraTask.go
@@ -2,10 +2,11 @@
 
 import (
 	"basic.com/dbapi.git"
-	"webserver/extend/code"
-	"webserver/extend/util"
 	"fmt"
 	"github.com/gin-gonic/gin"
+	"webserver/extend/code"
+	"webserver/extend/util"
+	"webserver/models"
 )
 
 type CameraTaskController struct {
@@ -19,7 +20,7 @@
 
 type CameraTaskVo struct {
 	Id          string `json:"id"`
-	CameraIds   string `json:"camera_ids"`
+	CameraId   string `json:"camera_id"`
 	TaskId      string `json:"task_id"` //浠诲姟id  鏉ヨ嚜浜庝换鍔¤〃
 	TimeRule    string `json:"time_rule"`
 	ReactRule   string `json:"react_rule"`
@@ -29,7 +30,7 @@
 	Enable      int    `json:"enable"`                //榛樿鍚敤
 	Sort        int    `json:"sort"`    //浠诲姟鎺掑簭
 	IsFull      int    `json:"is_full"` //鍙傛暟鏄惁璁剧疆瀹屾暣
-	LinkGroupId string `json:"link_group_id"` //鑱斿姩浠诲姟缁�
+	LinkTaskId string `json:"link_task_id"` //鑱斿姩浠诲姟缁�
 }
 
 type CameraTaskSaveArg struct {
@@ -61,6 +62,16 @@
 	SdkArgValue string `json:"sdk_arg_value"` //绠楁硶鍙傛暟鍊艰缃�
 	RuleWithPre string `json:"rule_with_pre"` //涓庝笅涓�鏉＄殑閫昏緫杩愮畻绗�
 	GroupId string `json:"group_id"`
+}
+
+type LinkCameraTasksVo struct {
+
+}
+
+type CameraTaskInfoVo struct {
+	Camera models.Camera `json:"camera"`
+	Tasks []models.Task `json:"tasks"`
+	Polygon CameraPolygonVo `json:"polygon"`
 }
 
 // @Summary 鏌ヨ鎵�鏈変换鍔�
@@ -162,37 +173,88 @@
 	}
 }
 
-type TransAndAlarmLevelVo struct {
+type DataTransVo struct {
 	CameraIds []string `json:"camera_ids"`
 	TaskId string `json:"task_id"`
 	IsDataTrans int `json:"is_data_trans"`
-	GroupLevels []GroupAlarmLevelVo `json:"group_levels"`
 }
 type GroupAlarmLevelVo struct {
 	GroupId string `json:"group_id"`
 	AlarmLevel int `json:"alarm_level"`
 }
 
-// @Summary 淇濆瓨浠诲姟鏄惁涓嬩紶鏁版嵁浠ュ強缁勬姤璀︾瓑绾�
-// @Description 淇濆瓨浠诲姟鏄惁涓嬩紶鏁版嵁浠ュ強缁勬姤璀︾瓑绾�
+// @Summary 淇濆瓨浠诲姟鏄惁涓嬩紶鏁版嵁
+// @Description 淇濆瓨浠诲姟鏄惁涓嬩紶鏁版嵁
 // @Accept json
 // @Produce json
 // @Tags CameraTask
-// @Param TransAndAlarmLevel body controllers.TransAndAlarmLevelVo true "璇锋眰鍙傛暟缁撴瀯"
+// @Param TransAndAlarmLevel body controllers.DataTransVo true "璇锋眰鍙傛暟缁撴瀯"
 // @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/saveTransAndAlarmLevel [post]
-func (controller CameraTaskController) SaveTransAndAlarmLevel(c *gin.Context) {
-	var vo TransAndAlarmLevelVo
-	if err := c.BindJSON(&vo);err!=nil {
+// @Router /data/api-v/cameraTask/saveIsDataTrans [post]
+func (controller CameraTaskController) SaveIsDataTrans(c *gin.Context) {
+	var transVo DataTransVo
+	if err := c.BindJSON(&transVo);err!=nil {
 		util.ResponseFormat(c,code.RequestParamError,"鍙傛暟鏈夎")
 		return
 	}
-	fmt.Println("SaveTransAndAlarmLevel.vo:",vo)
 	var api dbapi.CameraTaskApi
-	paramBody := util.Struct2Map(vo)
+	paramBody := util.Struct2Map(transVo)
 
-	flag ,data := api.SaveTransAndAlarmLevel(paramBody)
+	flag ,data := api.SaveIsDataTrans(paramBody)
+	if flag {
+		util.ResponseFormat(c,code.Success,data)
+	} else {
+		util.ResponseFormat(c,code.ComError,data)
+	}
+}
+
+// @Summary 淇濆瓨瑙勫垯缁勬姤璀︾瓑绾�
+// @Description 淇濆瓨瑙勫垯缁勬姤璀︾瓑绾�
+// @Produce json
+// @Tags CameraTask
+// @Param GroupLevel body controllers.GroupAlarmLevelVo true "alarmLevel"
+// @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/saveAlarmLevelByGroup [post]
+func (controller CameraTaskController) SaveAlarmLevelByGroup(c *gin.Context) {
+	var groupLevelVo GroupAlarmLevelVo
+	if err := c.BindJSON(&groupLevelVo);err !=nil {
+		util.ResponseFormat(c,code.RequestParamError,"鍙傛暟鏈夎")
+		return
+	}
+
+	var api dbapi.CameraTaskApi
+	flag,data := api.SaveAlarmLevelByGroup(groupLevelVo.GroupId,groupLevelVo.AlarmLevel)
+	if flag {
+		util.ResponseFormat(c,code.Success,data)
+	} else {
+		util.ResponseFormat(c,code.ComError,data)
+	}
+}
+
+type CameraTaskStatusVo struct {
+	CameraId string `json:"cameraId"`
+	TaskId string `json:"taskId"`
+	Status int `json:"status"`
+}
+
+// @Summary 鏇存柊浠诲姟鐘舵��
+// @Description 鏇存柊浠诲姟鐘舵��
+// @Produce json
+// @Tags CameraTask
+// @Param CameraTaskStatus body controllers.CameraTaskStatusVo true "鍙傛暟缁撴瀯浣�"
+// @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/updateCameraTaskStatus [post]
+func (controller CameraTaskController) UpdateCameraTaskStatus(c *gin.Context) {
+	var paramVo CameraTaskStatusVo
+	if err := c.BindJSON(&paramVo);err !=nil {
+		util.ResponseFormat(c,code.RequestParamError,"鍙傛暟鏈夎")
+		return
+	}
+	var api dbapi.CameraTaskApi
+	flag, data := api.UpdateCameraTaskStatus(paramVo.CameraId, paramVo.TaskId, paramVo.Status)
 	if flag {
 		util.ResponseFormat(c,code.Success,data)
 	} else {

--
Gitblit v1.8.0