From 9adc54d7d40a48a50ae04db81ae4fa58c9699742 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期二, 18 六月 2019 14:28:16 +0800
Subject: [PATCH] add rules of cameraTaskArgs and linkTaskArgs

---
 controllers/cameraPolygon.go  |    4 -
 controllers/cameraTask.go     |   15 ++++++-
 controllers/cameraTaskArgs.go |   77 ++++++++++++++++++++++++++++++++++++++
 models/model.go               |    3 +
 router/router.go              |    2 +
 5 files changed, 94 insertions(+), 7 deletions(-)

diff --git a/controllers/cameraPolygon.go b/controllers/cameraPolygon.go
index 4739845..07cf6b1 100644
--- a/controllers/cameraPolygon.go
+++ b/controllers/cameraPolygon.go
@@ -2,10 +2,9 @@
 
 import (
 	"basic.com/dbapi.git"
+	"github.com/gin-gonic/gin"
 	"webserver/extend/code"
 	"webserver/extend/util"
-	"fmt"
-	"github.com/gin-gonic/gin"
 )
 
 type CameraPolygonController struct {
@@ -45,7 +44,6 @@
 func (controller CameraPolygonController) Save(c *gin.Context) {
 	paramBody := make(map[string]interface{},0)
 	c.BindJSON(&paramBody)
-	fmt.Println(paramBody)
 	var api dbapi.CameraApi
 	flag, data := api.SaveCameraPolygon(paramBody)
 	if flag {
diff --git a/controllers/cameraTask.go b/controllers/cameraTask.go
index 4080663..7417413 100644
--- a/controllers/cameraTask.go
+++ b/controllers/cameraTask.go
@@ -6,6 +6,7 @@
 	"webserver/extend/util"
 	"fmt"
 	"github.com/gin-gonic/gin"
+	"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 {
@@ -63,6 +64,16 @@
 	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 鏌ヨ鎵�鏈変换鍔�
 // @Description "鏌ヨ鎵�鏈変换鍔�"
 // @Accept json
diff --git a/controllers/cameraTaskArgs.go b/controllers/cameraTaskArgs.go
index 5a17256..5ccf893 100644
--- a/controllers/cameraTaskArgs.go
+++ b/controllers/cameraTaskArgs.go
@@ -2,9 +2,9 @@
 
 import (
 	"basic.com/dbapi.git"
+	"github.com/gin-gonic/gin"
 	"webserver/extend/code"
 	"webserver/extend/util"
-	"github.com/gin-gonic/gin"
 )
 
 type CameraTaskArgsController struct {
@@ -40,6 +40,30 @@
 	}
 }
 
+// @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 [get]
+func (controller CameraTaskArgsController) GetLinkRulesByCameraIds(c *gin.Context) {
+	var cameraIds MultiCamera
+	if err := c.BindJSON(&cameraIds);err !=nil {
+		util.ResponseFormat(c,code.RequestParamError,"鍙傛暟鏈夎")
+		return
+	}
+	var api dbapi.CameraTaskArgsApi
+	flag,data := api.GetLinkRulesByCameraIds()
+	if flag {
+		util.ResponseFormat(c,code.Success,data)
+	} else {
+		util.ResponseFormat(c,code.ComError,data)
+	}
+}
+
 // @SUmmary 鏍规嵁鍒嗙粍id鍒犻櫎鎽勫儚鏈虹畻娉曡鍒�
 // @Description 鏍规嵁鍒嗙粍id鍒犻櫎鎽勫儚鏈虹畻娉曡鍒�
 // @Produce json
@@ -62,4 +86,55 @@
 		util.ResponseFormat(c,code.ComError,data)
 	}
 
+}
+
+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
+}
+
+// @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)
+	}
 }
\ No newline at end of file
diff --git a/models/model.go b/models/model.go
index 795b894..23cdb9a 100644
--- a/models/model.go
+++ b/models/model.go
@@ -136,4 +136,5 @@
 type Point struct {
 	X string `json:"x"`
 	Y string `json:"y"`
-}
\ No newline at end of file
+}
+
diff --git a/router/router.go b/router/router.go
index 84fa94c..b29bb37 100644
--- a/router/router.go
+++ b/router/router.go
@@ -65,6 +65,8 @@
 	cameraTaskArgsApi :=r.Group(urlPrefix + "/cameraTaskArgs")
 	{
 		cameraTaskArgsApi.GET("/deleteByGroup",cameraTaskArgsController.DeleteByGroup)
+		cameraTaskArgsApi.GET("/getLinkRulesByCameraIds",cameraTaskArgsController.GetLinkRulesByCameraIds)
+		cameraTaskArgsApi.POST("saveLinkRulesByGroup",cameraTaskArgsController.SaveLinkRulesByGroup)
 	}
 
 	cameraTaskApi := r.Group(urlPrefix + "/cameraTask")

--
Gitblit v1.8.0