From eef73867db718d4a6b706d591508d3e22c9949df Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期二, 04 八月 2020 15:26:43 +0800
Subject: [PATCH] update esutil

---
 controllers/cameraTaskArgs.go |  408 +++++++++++++++++++++++++++++----------------------------
 1 files changed, 206 insertions(+), 202 deletions(-)

diff --git a/controllers/cameraTaskArgs.go b/controllers/cameraTaskArgs.go
index ebc6b1b..56fc57c 100644
--- a/controllers/cameraTaskArgs.go
+++ b/controllers/cameraTaskArgs.go
@@ -1,204 +1,208 @@
 package controllers
 
-import (
-	"basic.com/dbapi.git"
-	"basic.com/valib/logger.git"
-	"github.com/gin-gonic/gin"
-	"strconv"
-	"strings"
-	"webserver/extend/code"
-	"webserver/extend/util"
-)
-
-type CameraTaskArgsController struct {
-
-}
-
-// @Security ApiKeyAuth
-// @Summary 鏍规嵁鎽勫儚鏈篿d鍜屼换鍔d鏌ヨ绠楁硶閰嶇疆璇︽儏
-// @Description 鏍规嵁鎽勫儚鏈篿d鍜屼换鍔d鏌ヨ绠楁硶閰嶇疆璇︽儏
-// @Produce json
-// @Tags CameraTaskArgs
-// @Param cameraId query string true "鎽勫儚鏈篿d"
-// @Param taskId query string true "浠诲姟id"
-// @Param set_type query string 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/getRulesByCameraAndTask [get]
-func (controller CameraTaskArgsController) FindByCameraAndTask(c *gin.Context) {
-	cameraId := c.Query("cameraId")
-	taskId := c.Query("taskId")
-	setType := c.Query("set_type")
-	if cameraId == "" || taskId == "" || setType == "" {
-		util.ResponseFormat(c,code.RequestParamError,"鎽勫儚鏈篿d鍜屼换鍔d涓嶈兘涓虹┖")
-		return
-	}
-	var api dbapi.CameraTaskArgsApi
-	flag,data := api.FindByCameraAndTask(cameraId,taskId,setType)
-
-	if flag {
-		util.ResponseFormat(c, code.Success, data)
-	} else {
-		util.ResponseFormat(c, code.ComError, data)
-	}
-}
-
-// @Security ApiKeyAuth
-// @Summary 鏍规嵁澶氫釜鎽勫儚鏈篿d鏌ヨ鑱斿姩浠诲姟瑙勫垯璁剧疆
-// @Description 鏍规嵁澶氫釜鎽勫儚鏈篿d鏌ヨ鑱斿姩浠诲姟瑙勫垯璁剧疆
-// @Accept json
-// @Produce json
-// @Tags CameraTaskArgs
-// @Param cameraIds body controllers.MultiCamera true "鎽勫儚鏈篿ds"
-// @Success 200 {string} json "{"code":200, success:true, msg:"", data:""}"
-// @Failure 500 {string} json "{"code":500, success:false, msg:"",data:""}"
-// @Router /data/api-v/cameraTaskArgs/getLinkRulesByCameraIds [post]
-func (controller CameraTaskArgsController) GetLinkRulesByCameraIds(c *gin.Context) {
-	var cameraIdsVo MultiCamera
-	if err := c.BindJSON(&cameraIdsVo);err !=nil {
-		util.ResponseFormat(c,code.RequestParamError,"鍙傛暟鏈夎")
-		return
-	}
-	var api dbapi.CameraTaskArgsApi
-	paramBody := util.Struct2Map(cameraIdsVo)
-	flag,data := api.GetLinkRulesByCameraIds(paramBody)
-	if flag {
-		util.ResponseFormat(c,code.Success,data)
-	} else {
-		util.ResponseFormat(c,code.ComError,data)
-	}
-}
-
-// @Security ApiKeyAuth
-// @Summary 鏍规嵁鍒嗙粍id鍒囨崲甯冮槻鎴栨挙闃�
-// @Description 鏍规嵁鍒嗙粍id鍒囨崲甯冮槻鎴栨挙闃�
-// @Accept x-www-form-urlencoded
-// @Produce json
-// @Tags CameraTaskArgs
-// @Param groupId formData string true "浠诲姟绠楁硶鍙傛暟鍒嗙粍id"
-// @Param defenceState formData bool true "甯冮槻鐘舵��,false:鎾ら槻锛宼rue锛氬竷闃�"
-// @Success 200 {string} json "{"code":200, success:true, msg:"", data:""}"
-// @Failure 500 {string} json "{"code":500, success:false, msg:"",data:""}"
-// @Router /data/api-v/cameraTaskArgs/updateDefenceStateByGroup [post]
-func (controller CameraTaskArgsController) UpdateDefenceStateByGroup(c *gin.Context){
-	groupId := c.PostForm("groupId")
-	str := c.PostForm("defenceState")
-	logger.Debug("defenceState:",str)
-	defenceState, err := strconv.ParseBool(str)
-	if groupId =="" || err !=nil{
-		util.ResponseFormat(c, code.RequestParamError, "鍙傛暟鏈夎")
-		return
-	}
-	var api dbapi.CameraTaskArgsApi
-	if b,data := api.UpdateDefenceStateByGroup(groupId,defenceState);b{
-		util.ResponseFormat(c,code.UpdateSuccess,data)
-	} else {
-		util.ResponseFormat(c,code.ComError,data)
-	}
-}
-
-// @Security ApiKeyAuth
-// @SUmmary 鏍规嵁鍒嗙粍id鍒犻櫎鎽勫儚鏈虹畻娉曡鍒�
-// @Description 鏍规嵁鍒嗙粍id鍒犻櫎鎽勫儚鏈虹畻娉曡鍒�
-// @Produce json
-// @Tags CameraTaskArgs
-// @Param groupId query 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/cameraTaskArgs/deleteByGroup [get]
-func (controller CameraTaskArgsController)DeleteByGroup(c *gin.Context) {
-	groupId := c.Query("groupId")
-	if groupId == "" {
-		util.ResponseFormat(c, code.RequestParamError, "id蹇呭～")
-		return
-	}
-	var api dbapi.CameraTaskArgsApi
-	flag,data := api.DeleteByGroup(groupId)
-	if flag {
-		util.ResponseFormat(c,code.Success,data)
-	} else {
-		util.ResponseFormat(c,code.ComError,"鍒犻櫎澶辫触")
-	}
-
-}
-
-type SaveLinkRulesGroupVo struct {
-	LinkTaskId string `json:"link_task_id"`//鑱斿姩浠诲姟id
-	GroupId string `json:"group_id"`//鍒嗙粍id
-	GroupText string `json:"group_text"`//缁勮鍒欐枃瀛�
-	Rules []LinkRuleArgVo `json:"rules"`//缁勫唴鐨勮鍒�
-}
-
-type LinkRuleArgVo struct {
-	TaskId string `json:"task_id"`
-	CameraTaskArgs
-}
-
-type CameraTaskArgs struct {
-	Id string `json:"id"`
-	CameraTaskId string `json:"camera_task_id"`//camera_tasks琛ㄧ殑涓婚敭锛屾憚鍍忔満鍜屼换鍔″叧鑱攊d鎴栬�呰仈鍔ㄤ换鍔d
-	CameraId string 	`json:"camera_id"`//鎽勫儚鏈篿d
-	PolygonId string `json:"polygon_id"`//澶氳竟褰d
-	SdkId string `json:"sdk_id"`//绠楁硶id
-	SdkArgAlias string `json:"sdk_arg_alias"`//绠楁硶鍙傛暟鍒悕
-	Operator string `json:"operator"`//璁＄畻鏂瑰紡=,>,>=绛夌瓑
-	OperatorType string `json:"operator_type"`//璁＄畻鐨勫�肩被鍨�
-	SdkArgValue string `json:"sdk_arg_value"` //绠楁硶鍙傛暟鍊艰缃�
-	Sort int `json:"sort"`//鎺掑簭
-	RuleWithPre string `json:"rule_with_pre"`//涓庝笂涓�鏉¤褰曠殑閫昏緫杩愮畻瑙勫垯锛�&&,||锛�
-	GroupId string `json:"group_id"`//鍒嗙粍id
-}
-
-// @Security ApiKeyAuth
-// @Summary 淇濆瓨鑱斿姩浠诲姟瑙勫垯鍙傛暟
-// @Description 淇濆瓨鑱斿姩浠诲姟瑙勫垯鍙傛暟
-// @Accept json
-// @Produce json
-// @Param saveBody body controllers.SaveLinkRulesGroupVo 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/cameraTaskArgs/saveLinkRulesByGroup [post]
-func (controller CameraTaskArgsController) SaveLinkRulesByGroup(c *gin.Context) {
-	var saveBody SaveLinkRulesGroupVo
-	if err := c.BindJSON(&saveBody);err !=nil {
-		util.ResponseFormat(c,code.RequestParamError,"鍙傛暟鏈夎")
-		return
-	}
-	var api dbapi.CameraTaskArgsApi
-	paramBody := util.Struct2Map(saveBody)
-	flag,data := api.SaveLinkRulesByGroup(paramBody)
-	if flag {
-		util.ResponseFormat(c,code.Success,data)
-	} else {
-		util.ResponseFormat(c,code.ComError,data)
-	}
-}
-
-// @Summary 灏嗘湰鏉¤鍒欏簲鐢ㄥ埌鎵�鏈夋湰鍦拌棰�
-// @Description 灏嗘湰鏉¤鍒欏簲鐢ㄥ埌鎵�鏈夋湰鍦拌棰�
-// @Produce json
-// @Tags CameraTaskArgs
-// @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/cameraTaskArgs/ruleApply2All [post]
-func (controller CameraTaskArgsController) RuleApply2All(c *gin.Context) {
-	var saveBody CameraTaskSaveArg
-	err := c.BindJSON(&saveBody)
-	if err !=nil || saveBody.TaskId == "" || len(saveBody.CameraIds) !=1 || saveBody.GroupText == "" || len(saveBody.GroupRule) ==0 {
-		util.ResponseFormat(c, code.RequestParamError, "鍙傛暟鏈夎")
-		return
-	}
-	if !strings.HasPrefix(saveBody.CameraIds[0], File_Video_Id_Pre) && !strings.HasPrefix(saveBody.CameraIds[0], File_Img_Id_Pre) && !!strings.HasPrefix(saveBody.CameraIds[0], File_Audio_Id_Pre) {
-		util.ResponseFormat(c, code.RequestParamError, "鍙傛暟鏈夎")
-		return
-	}
-	var api dbapi.CameraTaskApi
-	paramBody := util.Struct2Map(saveBody)
-	flag, data := api.RuleApply2All(paramBody)
-	if flag {
-		util.ResponseFormat(c,code.Success,data)
-	} else {
-		util.ResponseFormat(c, code.ComError, data)
-	}
-}
\ No newline at end of file
+//import (
+//	"basic.com/dbapi.git"
+//	"basic.com/valib/logger.git"
+//	"github.com/gin-gonic/gin"
+//	"strconv"
+//	"strings"
+//	"webserver/extend/code"
+//	"webserver/extend/util"
+//)
+//
+//type CameraTaskArgsController struct {
+//
+//}
+//
+//// @Security ApiKeyAuth
+//// @Summary 鏍规嵁鎽勫儚鏈篿d鍜屼换鍔d鏌ヨ绠楁硶閰嶇疆璇︽儏
+//// @Description 鏍规嵁鎽勫儚鏈篿d鍜屼换鍔d鏌ヨ绠楁硶閰嶇疆璇︽儏
+//// @Produce json
+//// @Tags CameraTaskArgs
+//// @Param cameraId query string true "鎽勫儚鏈篿d"
+//// @Param taskId query string true "浠诲姟id"
+//// @Param set_type query string 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/getRulesByCameraAndTask [get]
+//func (controller CameraTaskArgsController) FindByCameraAndTask(c *gin.Context) {
+//	cameraId := c.Query("cameraId")
+//	taskId := c.Query("taskId")
+//	setType := c.Query("set_type")
+//	if cameraId == "" || taskId == "" || setType == "" {
+//		util.ResponseFormat(c,code.RequestParamError,"鎽勫儚鏈篿d鍜屼换鍔d涓嶈兘涓虹┖")
+//		return
+//	}
+//	var api dbapi.CameraTaskArgsApi
+//	flag,data := api.FindByCameraAndTask(cameraId,taskId,setType)
+//
+//	if flag {
+//		util.ResponseFormat(c, code.Success, data)
+//	} else {
+//		util.ResponseFormat(c, code.ComError, data)
+//	}
+//}
+//
+//// @Security ApiKeyAuth
+//// @Summary 鏍规嵁澶氫釜鎽勫儚鏈篿d鏌ヨ鑱斿姩浠诲姟瑙勫垯璁剧疆
+//// @Description 鏍规嵁澶氫釜鎽勫儚鏈篿d鏌ヨ鑱斿姩浠诲姟瑙勫垯璁剧疆
+//// @Accept json
+//// @Produce json
+//// @Tags CameraTaskArgs
+//// @Param cameraIds body controllers.MultiCamera true "鎽勫儚鏈篿ds"
+//// @Success 200 {string} json "{"code":200, success:true, msg:"", data:""}"
+//// @Failure 500 {string} json "{"code":500, success:false, msg:"",data:""}"
+//// @Router /data/api-v/cameraTaskArgs/getLinkRulesByCameraIds [post]
+//func (controller CameraTaskArgsController) GetLinkRulesByCameraIds(c *gin.Context) {
+//	var cameraIdsVo MultiCamera
+//	if err := c.BindJSON(&cameraIdsVo);err !=nil {
+//		util.ResponseFormat(c,code.RequestParamError,"鍙傛暟鏈夎")
+//		return
+//	}
+//	var api dbapi.CameraTaskArgsApi
+//	paramBody := util.Struct2Map(cameraIdsVo)
+//	flag,data := api.GetLinkRulesByCameraIds(paramBody)
+//	if flag {
+//		util.ResponseFormat(c,code.Success,data)
+//	} else {
+//		util.ResponseFormat(c,code.ComError,data)
+//	}
+//}
+//
+//// @Security ApiKeyAuth
+//// @Summary 鏍规嵁鍒嗙粍id鍒囨崲甯冮槻鎴栨挙闃�
+//// @Description 鏍规嵁鍒嗙粍id鍒囨崲甯冮槻鎴栨挙闃�
+//// @Accept x-www-form-urlencoded
+//// @Produce json
+//// @Tags CameraTaskArgs
+//// @Param groupId formData string true "浠诲姟绠楁硶鍙傛暟鍒嗙粍id"
+//// @Param defenceState formData bool true "甯冮槻鐘舵��,false:鎾ら槻锛宼rue锛氬竷闃�"
+//// @Success 200 {string} json "{"code":200, success:true, msg:"", data:""}"
+//// @Failure 500 {string} json "{"code":500, success:false, msg:"",data:""}"
+//// @Router /data/api-v/cameraTaskArgs/updateDefenceStateByGroup [post]
+//func (controller CameraTaskArgsController) UpdateDefenceStateByGroup(c *gin.Context){
+//	groupId := c.PostForm("groupId")
+//	str := c.PostForm("defenceState")
+//	logger.Debug("defenceState:",str)
+//	defenceState, err := strconv.ParseBool(str)
+//	if groupId =="" || err !=nil{
+//		util.ResponseFormat(c, code.RequestParamError, "鍙傛暟鏈夎")
+//		return
+//	}
+//	var api dbapi.CameraTaskArgsApi
+//	if b,data := api.UpdateDefenceStateByGroup(groupId,defenceState);b{
+//		util.ResponseFormat(c,code.UpdateSuccess,data)
+//	} else {
+//		util.ResponseFormat(c,code.ComError,data)
+//	}
+//}
+//
+//// @Security ApiKeyAuth
+//// @SUmmary 鏍规嵁鍒嗙粍id鍒犻櫎鎽勫儚鏈虹畻娉曡鍒�
+//// @Description 鏍规嵁鍒嗙粍id鍒犻櫎鎽勫儚鏈虹畻娉曡鍒�
+//// @Produce json
+//// @Tags CameraTaskArgs
+//// @Param groupId query 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/cameraTaskArgs/deleteByGroup [get]
+//func (controller CameraTaskArgsController)DeleteByGroup(c *gin.Context) {
+//	groupId := c.Query("groupId")
+//	if groupId == "" {
+//		util.ResponseFormat(c, code.RequestParamError, "id蹇呭～")
+//		return
+//	}
+//	var api dbapi.CameraTaskArgsApi
+//	flag,data := api.DeleteByGroup(groupId)
+//	if flag {
+//		util.ResponseFormat(c,code.Success,data)
+//	} else {
+//		util.ResponseFormat(c,code.ComError,"鍒犻櫎澶辫触")
+//	}
+//
+//}
+//
+//type SaveLinkRulesGroupVo struct {
+//	LinkTaskId string `json:"link_task_id"`//鑱斿姩浠诲姟id
+//	GroupId string `json:"group_id"`//鍒嗙粍id
+//	GroupText string `json:"group_text"`//缁勮鍒欐枃瀛�
+//	Rules []LinkRuleArgVo `json:"rules"`//缁勫唴鐨勮鍒�
+//}
+//
+//type LinkRuleArgVo struct {
+//	TaskId string `json:"task_id"`
+//	CameraTaskArgs
+//}
+//
+//type CameraTaskArgs struct {
+//	Id string `json:"id"`
+//	CameraTaskId string `json:"camera_task_id"`//camera_tasks琛ㄧ殑涓婚敭锛屾憚鍍忔満鍜屼换鍔″叧鑱攊d鎴栬�呰仈鍔ㄤ换鍔d
+//	CameraId string 	`json:"camera_id"`//鎽勫儚鏈篿d
+//	PolygonId string `json:"polygon_id"`//澶氳竟褰d
+//	SdkId string `json:"sdk_id"`//绠楁硶id
+//	SdkArgAlias string `json:"sdk_arg_alias"`//绠楁硶鍙傛暟鍒悕
+//	Operator string `json:"operator"`//璁＄畻鏂瑰紡=,>,>=绛夌瓑
+//	OperatorType string `json:"operator_type"`//璁＄畻鐨勫�肩被鍨�
+//	SdkArgValue string `json:"sdk_arg_value"` //绠楁硶鍙傛暟鍊艰缃�
+//	Sort int `json:"sort"`//鎺掑簭
+//	RuleWithPre string `json:"rule_with_pre"`//涓庝笂涓�鏉¤褰曠殑閫昏緫杩愮畻瑙勫垯锛�&&,||锛�
+//	GroupId string `json:"group_id"`//鍒嗙粍id
+//}
+//
+//// @Security ApiKeyAuth
+//// @Summary 淇濆瓨鑱斿姩浠诲姟瑙勫垯鍙傛暟
+//// @Description 淇濆瓨鑱斿姩浠诲姟瑙勫垯鍙傛暟
+//// @Accept json
+//// @Produce json
+//// @Param saveBody body controllers.SaveLinkRulesGroupVo 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/cameraTaskArgs/saveLinkRulesByGroup [post]
+//func (controller CameraTaskArgsController) SaveLinkRulesByGroup(c *gin.Context) {
+//	var saveBody SaveLinkRulesGroupVo
+//	if err := c.BindJSON(&saveBody);err !=nil {
+//		util.ResponseFormat(c,code.RequestParamError,"鍙傛暟鏈夎")
+//		return
+//	}
+//	var api dbapi.CameraTaskArgsApi
+//	paramBody := util.Struct2Map(saveBody)
+//	flag,data := api.SaveLinkRulesByGroup(paramBody)
+//	if flag {
+//		util.ResponseFormat(c,code.Success,data)
+//	} else {
+//		util.ResponseFormat(c,code.ComError,data)
+//	}
+//}
+//
+//type RuleApply2AllVo struct {
+//	CameraId   string  			  `json:"camera_id" binding:"required"`//瑙勫垯鎷ユ湁鑰卛d
+//}
+//
+//// @Summary 灏嗘湰鏉¤鍒欏簲鐢ㄥ埌鎵�鏈夋湰鍦拌棰�
+//// @Description 灏嗘湰鏉¤鍒欏簲鐢ㄥ埌鎵�鏈夋湰鍦拌棰�
+//// @Produce json
+//// @Tags CameraTaskArgs
+//// @Param args body controllers.RuleApply2AllVo 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/cameraTaskArgs/ruleApply2All [post]
+//func (controller CameraTaskArgsController) RuleApply2All(c *gin.Context) {
+//	var saveBody RuleApply2AllVo
+//	err := c.BindJSON(&saveBody)
+//	if err !=nil {
+//		util.ResponseFormat(c, code.RequestParamError, "鍙傛暟鏈夎")
+//		return
+//	}
+//	if !strings.HasPrefix(saveBody.CameraId, File_Video_Id_Pre) && !strings.HasPrefix(saveBody.CameraId, File_Img_Id_Pre) && !!strings.HasPrefix(saveBody.CameraId, File_Audio_Id_Pre) {
+//		util.ResponseFormat(c, code.RequestParamError, "鍙傛暟鏈夎")
+//		return
+//	}
+//	var api dbapi.CameraTaskApi
+//	paramBody := util.Struct2Map(saveBody)
+//	flag, data := api.RuleApply2All(paramBody)
+//	if flag {
+//		util.ResponseFormat(c,code.Success,data)
+//	} else {
+//		util.ResponseFormat(c, code.ComError, data)
+//	}
+//}
\ No newline at end of file

--
Gitblit v1.8.0