From bd7c50d2e4e505d84b78ce12159001ba7b9f346c Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期一, 22 七月 2019 15:28:26 +0800
Subject: [PATCH] add so

---
 controllers/cameraTask.go |   79 ++++++++++++++++++++++++++++++++-------
 1 files changed, 65 insertions(+), 14 deletions(-)

diff --git a/controllers/cameraTask.go b/controllers/cameraTask.go
index 7417413..4066ceb 100644
--- a/controllers/cameraTask.go
+++ b/controllers/cameraTask.go
@@ -2,10 +2,10 @@
 
 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"
 )
 
@@ -173,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