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/cameraTaskArgs.go |  105 +++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 82 insertions(+), 23 deletions(-)

diff --git a/controllers/cameraTaskArgs.go b/controllers/cameraTaskArgs.go
index 5a17256..e28e5ec 100644
--- a/controllers/cameraTaskArgs.go
+++ b/controllers/cameraTaskArgs.go
@@ -2,26 +2,17 @@
 
 import (
 	"basic.com/dbapi.git"
-	"webserver/extend/code"
-	"webserver/extend/util"
 	"github.com/gin-gonic/gin"
+	"strconv"
+	"webserver/extend/code"
+	"basic.com/valib/logger.git"
+	"webserver/extend/util"
 )
 
 type CameraTaskArgsController struct {
 
 }
 
-
-// @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")
@@ -40,14 +31,39 @@
 	}
 }
 
-// @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) 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)
+	}
+}
+
+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)
+	}
+}
+
 func (controller CameraTaskArgsController)DeleteByGroup(c *gin.Context) {
 	groupId := c.Query("groupId")
 	if groupId == "" {
@@ -55,11 +71,54 @@
 		return
 	}
 	var api dbapi.CameraTaskArgsApi
-	flag,data:=api.DeleteByGroup(groupId)
+	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
+}
+
+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)
 	}
-
 }
\ No newline at end of file

--
Gitblit v1.8.0