From 263c7b18ce7f18f1222318f6e0e499e907895a52 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期三, 13 十一月 2019 19:33:39 +0800
Subject: [PATCH] fix
---
controllers/cameraTask.go | 123 ++++++++++++++++++++++------------------
1 files changed, 68 insertions(+), 55 deletions(-)
diff --git a/controllers/cameraTask.go b/controllers/cameraTask.go
index 7417413..0e1bc74 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"
)
@@ -74,15 +74,6 @@
Polygon CameraPolygonVo `json:"polygon"`
}
-// @Summary 鏌ヨ鎵�鏈変换鍔�
-// @Description "鏌ヨ鎵�鏈変换鍔�"
-// @Accept json
-// @Produce json
-// @Tags CameraTask
-// @Param cameraIds body controllers.MultiCamera false "鎽勫儚鏈篿d鏁扮粍"
-// @Success 200 {string} json "{"code":200, success:true, msg:"璇锋眰澶勭悊鎴愬姛", data:"鎵�鏈変换鍔′俊鎭�"}"
-// @Failure 500 {string} json "{"code":500, success:false msg:"",data:"閿欒淇℃伅鍐呭"}"
-// @Router /data/api-v/camera/alltask [post]
func (controller CameraTaskController) FindTasksByCameraIds(c *gin.Context){
var mulCamera MultiCamera
c.BindJSON(&mulCamera)
@@ -95,14 +86,25 @@
}
}
-// @Summary 鏌ヨ鎵�鏈変换鍔�
-// @Description "鏌ヨ鎵�鏈変换鍔�"
-// @Produce json
-// @Tags CameraTask
-// @Param cameraId path string true "鎽勫儚鏈篿d"
-// @Success 200 {string} json "{"code":200, success:true, msg:"", data:""}"
-// @Failure 500 {string} json "{"code":500, success:false, msg:"", data:""}"
-// @Router /data/api-v/camera/task/{cameraId} [get]
+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)
+ }
+ }
+}
+
func (controller CameraTaskController) CameraTaskAll(c *gin.Context) {
cameraId := c.Param("cameraId")
if cameraId == "" {
@@ -118,16 +120,6 @@
}
}
-
-// @Summary 鎽勫儚鏈轰繚瀛樹换鍔�
-// @Description 鎽勫儚鏈轰繚瀛樹换鍔�
-// @Accept json
-// @Produce json
-// @Tags camera
-// @Param args body controllers.CameraTaskSaveArg 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/camera/saveTask [post]
func (ac CameraController) CameraTaskSave(c *gin.Context) {
var saveBody CameraTaskSaveArg
err := c.BindJSON(&saveBody)
@@ -147,15 +139,6 @@
}
}
-// @Summary 鍒犻櫎鎽勫儚鏈虹殑浠诲姟
-// @Description 鍒犻櫎鎽勫儚鏈虹殑浠诲姟
-// @Produce json
-// @Tags camera
-// @Param cameraId path string true "鎽勫儚鏈篿d"
-// @Param taskId path 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/camera/delTask/{cameraId}/{taskId} [delete]
func (ac CameraController) CameraDelTask(c *gin.Context) {
cameraId := c.Param("cameraId")
taskId := c.Param("taskId")
@@ -173,40 +156,70 @@
}
}
-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 淇濆瓨浠诲姟鏄惁涓嬩紶鏁版嵁浠ュ強缁勬姤璀︾瓑绾�
-// @Accept json
-// @Produce json
-// @Tags CameraTask
-// @Param TransAndAlarmLevel body controllers.TransAndAlarmLevelVo 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 {
+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)
}
+}
+
+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"`
+}
+
+func (controller CameraTaskController) UpdateCameraTaskStatus(c *gin.Context) {
+ var paramVo CameraTaskStatusVo
+ if err := c.BindJSON(¶mVo);err !=nil {
+ util.ResponseFormat(c,code.RequestParamError,"鍙傛暟鏈夎")
+ return
+ }
+ var api dbapi.CameraTaskApi
+ flag, data := api.UpdateCameraTaskStatus(paramVo.CameraId, paramVo.TaskId, paramVo.Status)
+ if flag {
+ if data.(string) == "姝や换鍔′负鍋滅敤鐘舵�侊紝璇峰湪浠诲姟绠＄悊涓紑鍚紒"{
+ util.ResponseFormat(c,code.TaskStoped,data)
+ } else {
+ util.ResponseFormat(c,code.UpdateSuccess,data)
+ }
+ } else {
+ util.ResponseFormat(c,code.ComError,data)
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0