From 59e648d84df45c97c4591dd8c651fca0f20f86c1 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期六, 27 七月 2019 13:31:39 +0800
Subject: [PATCH] compareResult sort
---
controllers/cameraTaskArgs.go | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 108 insertions(+), 4 deletions(-)
diff --git a/controllers/cameraTaskArgs.go b/controllers/cameraTaskArgs.go
index 5a17256..bdf36d8 100644
--- a/controllers/cameraTaskArgs.go
+++ b/controllers/cameraTaskArgs.go
@@ -2,9 +2,11 @@
import (
"basic.com/dbapi.git"
- "webserver/extend/code"
- "webserver/extend/util"
"github.com/gin-gonic/gin"
+ "strconv"
+ "webserver/extend/code"
+ "webserver/extend/logger"
+ "webserver/extend/util"
)
type CameraTaskArgsController struct {
@@ -40,6 +42,57 @@
}
}
+// @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)
+ }
+}
+
+// @Summary 鏍规嵁鍒嗙粍id鍒囨崲甯冮槻鎴栨挙闃�
+// @Description 鏍规嵁鍒嗙粍id鍒囨崲甯冮槻鎴栨挙闃�
+// @Produce json
+// @Tags CameraTaskArgs
+// @Param groupId query string true "浠诲姟绠楁硶鍙傛暟鍒嗙粍id"
+// @Param defenceState query 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)
+ }
+}
+
// @SUmmary 鏍规嵁鍒嗙粍id鍒犻櫎鎽勫儚鏈虹畻娉曡鍒�
// @Description 鏍规嵁鍒嗙粍id鍒犻櫎鎽勫儚鏈虹畻娉曡鍒�
// @Produce json
@@ -55,11 +108,62 @@
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
+}
+
+// @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
--
Gitblit v1.8.0