From da4c92f310f5e856fc7a37056616990ceac2e098 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期二, 23 六月 2020 15:13:59 +0800
Subject: [PATCH] rm task,cameraTask,cameraTaskArgs add cameraRule

---
 taskSdkRuleApi.go    |  204 +++---
 cameraApi.go         |   42 
 cameraTaskApi.go     |  378 +++++++-------
 ruleTemplateApi.go   |  101 +++
 cameraTaskArgsApi.go |  268 +++++-----
 cameraRuleApi.go     |  146 +++++
 taskApi.go           |  394 +++++++-------
 7 files changed, 890 insertions(+), 643 deletions(-)

diff --git a/cameraApi.go b/cameraApi.go
index bef1a77..794fb7f 100644
--- a/cameraApi.go
+++ b/cameraApi.go
@@ -172,27 +172,27 @@
 	return res.Success,res.Data
 }
 
-//鑾峰彇鎵�鏈夋憚鍍忔満鐨勪俊鎭互鍙婂叾鎵�鏈変换鍔�
-func (api CameraApi) FindAllCameraAndTask() (cameraTasks []protomsg.CameraAndTaskInfo){
-	url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/queryCameraAndTaskInfo"
-	client := NewClient()
-
-	body, err := client.DoGetRequest(url, nil, nil)
-	if err != nil {
-		return nil
-	}
-
-	var res Result
-	if err = json.Unmarshal(body, &res); err != nil {
-		logPrint(err)
-		return nil
-	}
-
-	bytes, _ := json.Marshal(res.Data)
-	err = json.Unmarshal(bytes, &cameraTasks)
-
-	return cameraTasks
-}
+////鑾峰彇鎵�鏈夋憚鍍忔満鐨勪俊鎭互鍙婂叾鎵�鏈変换鍔�
+//func (api CameraApi) FindAllCameraAndTask() (cameraTasks []protomsg.CameraAndTaskInfo){
+//	url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/queryCameraAndTaskInfo"
+//	client := NewClient()
+//
+//	body, err := client.DoGetRequest(url, nil, nil)
+//	if err != nil {
+//		return nil
+//	}
+//
+//	var res Result
+//	if err = json.Unmarshal(body, &res); err != nil {
+//		logPrint(err)
+//		return nil
+//	}
+//
+//	bytes, _ := json.Marshal(res.Data)
+//	err = json.Unmarshal(bytes, &cameraTasks)
+//
+//	return cameraTasks
+//}
 
 func (api CameraApi) SaveCameraPolygon(paramBody map[string]interface{}) (bool,interface{}) {
 	url := api.getBasicUrl() + DATA_URL_PREFIX + "/polygon/save"
diff --git a/cameraRuleApi.go b/cameraRuleApi.go
new file mode 100644
index 0000000..7e60a29
--- /dev/null
+++ b/cameraRuleApi.go
@@ -0,0 +1,146 @@
+package dbapi
+
+import (
+	"basic.com/pubsub/protomsg.git"
+	"encoding/json"
+	"strconv"
+)
+
+type CameraRuleApi struct{
+	Ip string
+	Port int
+}
+
+func (api CameraRuleApi) getBasicUrl() string {
+	if api.Ip == "" {
+		return BASIC_URL
+	}
+	if api.Ip == "" {
+		api.Ip = DEFAULT_IP
+	}
+	if api.Port == 0 {
+		api.Port = DEFAULT_PORT
+	}
+	return "http://"+api.Ip+":"+strconv.Itoa(api.Port)
+}
+
+func (api CameraRuleApi) Save(reqBody map[string]interface{}) bool {
+	url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/rule/save"
+	client := NewClient()
+	body, err := client.DoPostRequest(url,CONTENT_TYPE_JSON, reqBody,nil,nil)
+	if err != nil {
+		return false
+	}
+
+	var res Result
+	if err = json.Unmarshal(body, &res); err != nil {
+		return false
+	}
+	return res.Success
+}
+
+func (api CameraRuleApi) PasteRules(reqBody map[string]interface{}) bool {
+	url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/pasteRules"
+	client := NewClient()
+	body, err := client.DoPostRequest(url,CONTENT_TYPE_JSON, reqBody,nil,nil)
+	if err != nil {
+		return false
+	}
+
+	var res Result
+	if err = json.Unmarshal(body, &res); err != nil {
+		return false
+	}
+	return res.Success
+}
+
+func (api CameraRuleApi) SaveLinkRulesByGroup(reqBody map[string]interface{}) bool {
+	url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/rule/saveLinkRulesByGroup"
+	client := NewClient()
+	body, err := client.DoPostRequest(url,CONTENT_TYPE_JSON, reqBody,nil,nil)
+	if err != nil {
+		return false
+	}
+
+	var res Result
+	if err = json.Unmarshal(body, &res); err != nil {
+		return false
+	}
+	return res.Success
+}
+
+func (api RuleTemplateApi) GetLinkRulesByCameraIds(reqBody map[string]interface{}) (bool,interface{}) {
+	url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/rule/getLinkRulesByCameraIds"
+	client := NewClient()
+	body, err := client.DoPostRequest(url,CONTENT_TYPE_JSON, reqBody,nil,nil)
+	if err != nil {
+		return false,nil
+	}
+
+	var res Result
+	if err = json.Unmarshal(body, &res); err != nil {
+		return false,nil
+	}
+	return res.Success, res.Data
+}
+
+func (api CameraRuleApi) UpdateAlarmLevel(reqBody map[string]interface{}) bool {
+	url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/rule/updateAlarmLevel"
+	client := NewClient()
+	body, err := client.DoPostRequest(url,CONTENT_TYPE_JSON, reqBody,nil,nil)
+	if err != nil {
+		return false
+	}
+
+	var res Result
+	if err = json.Unmarshal(body, &res); err != nil {
+		return false
+	}
+	return res.Success
+}
+
+func (api CameraRuleApi) DeleteByGroup(groupId string) bool {
+	url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/rule/deleteByGroup"
+	client := NewClient()
+	paraM := map[string]string {
+		"groupId": groupId,
+	}
+	body, err := client.DoGetRequest(url, paraM,nil)
+	if err != nil {
+		return false
+	}
+
+	var res Result
+	if err = json.Unmarshal(body, &res); err != nil {
+		return false
+	}
+	return res.Success
+}
+
+func (api CameraRuleApi) FindAll(groupId string) (flag bool,allRules []protomsg.CameraAndRules) {
+	url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/rule/findAll"
+	client := NewClient()
+	body, err := client.DoGetRequest(url, nil,nil)
+	if err != nil {
+		return false,nil
+	}
+
+	var res Result
+	if err = json.Unmarshal(body, &res); err != nil {
+		return false,nil
+	}
+	if !res.Success {
+		return false, nil
+	}
+	bytes, err := json.Marshal(res.Data)
+	if err != nil {
+		logPrint(err)
+		return false, nil
+	}
+	err = json.Unmarshal(bytes, &allRules)
+	if err != nil {
+		logPrint(err)
+		return false, nil
+	}
+	return true, allRules
+}
\ No newline at end of file
diff --git a/cameraTaskApi.go b/cameraTaskApi.go
index 5975093..8273022 100644
--- a/cameraTaskApi.go
+++ b/cameraTaskApi.go
@@ -1,190 +1,190 @@
 package dbapi
-
-import (
-	"basic.com/pubsub/protomsg.git"
-	"encoding/json"
-	"strconv"
-)
-
-type CameraTaskApi struct {
-	Ip string
-	Port int
-}
-
-func (api CameraTaskApi) getBasicUrl() string {
-	if api.Ip == "" {
-		return BASIC_URL
-	}
-	if api.Ip == "" {
-		api.Ip = DEFAULT_IP
-	}
-	if api.Port == 0 {
-		api.Port = DEFAULT_PORT
-	}
-	return "http://"+api.Ip+":"+strconv.Itoa(api.Port)
-}
-
-func (api CameraTaskApi) FindAll() (b bool,list []protomsg.CameraTask) {
-	url := api.getBasicUrl() + DATA_URL_PREFIX + "/cameraTask/findAll"
-	client := NewClient()
-	body, err := client.DoGetRequest(url, nil, nil)
-	if err != nil {
-		return false,nil
-	}
-
-	var res Result
-	if err = json.Unmarshal(body, &res); err != nil {
-		return false,nil
-	}
-	dataBytes, _ := json.Marshal(res.Data)
-	if err := json.Unmarshal(dataBytes, &list);err !=nil {
-		return false,nil
-	}
-	return true,list
-}
-
-func (api CameraTaskApi) AddTask(cameraId string,taskId string) (bool,interface{}) {
-	url := api.getBasicUrl() + DATA_URL_PREFIX + "/cameraTask/addTask"
-	client := NewClient()
-	paramBody := map[string]interface{}{
-		"cameraId": cameraId,
-		"taskId": taskId,
-	}
-	respBody, err := client.DoPostRequest(url, CONTENT_TYPE_FORM, paramBody,nil,nil)
-	if err != nil {
-		return false,nil
-	}
-	var res Result
-	if err = json.Unmarshal(respBody, &res); err != nil {
-		return false,nil
-	}
-	return res.Success,res.Data
-}
-
-func (api CameraTaskApi) CameraTaskSave(paramBody map[string]interface{}) (bool,interface{}) {
-	url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/saveTask"
-	client := NewClient()
-	respBody, err := client.DoPostRequest(url, CONTENT_TYPE_JSON, paramBody,nil, nil)
-	if err != nil {
-		return false,nil
-	}
-	var res Result
-	if err = json.Unmarshal(respBody, &res); err != nil {
-		return false,nil
-	}
-	return res.Success,res.Data
-}
-
-func (api CameraTaskApi) PasteRules(sourceId string, targetIds []string) bool {
-	url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/pasteRules"
-	client := NewClient()
-	paramBody := map[string]interface{} {
-		"sourceId": sourceId,
-		"targetIds": targetIds,
-	}
-	respBody, err := client.DoPostRequest(url, CONTENT_TYPE_JSON, paramBody,nil, nil)
-	if err != nil {
-		return false
-	}
-	var res Result
-	if err = json.Unmarshal(respBody, &res); err != nil {
-		return false
-	}
-	return res.Success
-}
-
-func (api CameraTaskApi) FindTasksByCameraIds(cameraIds []string) (bool,interface{}) {
-	url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/alltask"
-	client := NewClient()
-	paramBody :=make(map[string]interface{})
-	paramBody["cameraIds"] = cameraIds
-	respBody, err := client.DoPostRequest(url, CONTENT_TYPE_JSON, paramBody,nil, nil)
-	if err != nil {
-		return false,nil
-	}
-	var res Result
-	if err = json.Unmarshal(respBody, &res); err != nil {
-		return false,nil
-	}
-	return res.Success,res.Data
-}
-
-func (api CameraTaskApi) CameraTaskAll(cameraId string) (bool,interface{}) {
-	url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/task/"+cameraId
-	client := NewClient()
-	paramQuery :=make(map[string]string)
-	paramQuery["cameraId"] = cameraId
-	respBody, err := client.DoGetRequest(url, paramQuery,nil)
-	if err != nil {
-		return false,nil
-	}
-	var res Result
-	if err = json.Unmarshal(respBody, &res); err != nil {
-		return false,nil
-	}
-	return res.Success,res.Data
-}
-
-func (api CameraTaskApi) DeleteCameraTask(cameraId string,taskId string) (bool,interface{}) {
-	url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/delTask/"+cameraId+"/"+taskId
-	client := NewClient()
-	respBody, err := client.DoDeleteRequest(url, CONTENT_TYPE_FORM, nil,nil)
-	if err != nil {
-		return false,nil
-	}
-	var res Result
-	if err = json.Unmarshal(respBody, &res); err != nil {
-		return false,nil
-	}
-	return res.Success,res.Data
-}
-
-func (api CameraTaskApi) SaveIsDataTrans(paramBody map[string]interface{}) (bool,interface{}){
-	url := api.getBasicUrl() + DATA_URL_PREFIX + "/cameraTask/saveIsDataTrans"
-	client := NewClient()
-	respBody, err := client.DoPostRequest(url, CONTENT_TYPE_JSON, paramBody,nil, nil)
-	if err != nil {
-		return false,nil
-	}
-	var res Result
-	if err = json.Unmarshal(respBody, &res); err != nil {
-		return false,nil
-	}
-	return res.Success,res.Data
-}
-
-func (api CameraTaskApi) SaveAlarmLevelByGroup(groupId string,alarmLevel int) (bool,interface{}){
-	url := api.getBasicUrl() + DATA_URL_PREFIX + "/cameraTask/saveAlarmLevelByGroup"
-	client := NewClient()
-	paramBody :=make(map[string]interface{},0)
-	paramBody["group_id"] = groupId
-	paramBody["alarm_level"] = alarmLevel
-	respBody, err := client.DoPostRequest(url, CONTENT_TYPE_JSON, paramBody,nil, nil)
-	if err != nil {
-		return false,nil
-	}
-	var res Result
-	if err = json.Unmarshal(respBody, &res); err != nil {
-		return false,nil
-	}
-	return res.Success,res.Data
-}
-
-//鏇存柊鎽勫儚鏈轰换鍔＄姸鎬�
-func (api CameraTaskApi) UpdateCameraTaskStatus(cameraId string,taskId string,statusInt int) (bool,interface{}){
-	url := api.getBasicUrl() + DATA_URL_PREFIX + "/cameraTask/updateCameraTaskStatus"
-	client := NewClient()
-	paramBody :=make(map[string]interface{})
-	paramBody["cameraId"] = cameraId
-	paramBody["taskId"] = taskId
-	paramBody["status"] = statusInt
-	respBody, err := client.DoPostRequest(url, CONTENT_TYPE_JSON, paramBody, nil, nil)
-	if err != nil {
-		return false,nil
-	}
-	var res Result
-	if err = json.Unmarshal(respBody, &res); err != nil {
-		return false,nil
-	}
-	return res.Success,res.Data
-}
\ No newline at end of file
+//
+//import (
+//	"basic.com/pubsub/protomsg.git"
+//	"encoding/json"
+//	"strconv"
+//)
+//
+//type CameraTaskApi struct {
+//	Ip string
+//	Port int
+//}
+//
+//func (api CameraTaskApi) getBasicUrl() string {
+//	if api.Ip == "" {
+//		return BASIC_URL
+//	}
+//	if api.Ip == "" {
+//		api.Ip = DEFAULT_IP
+//	}
+//	if api.Port == 0 {
+//		api.Port = DEFAULT_PORT
+//	}
+//	return "http://"+api.Ip+":"+strconv.Itoa(api.Port)
+//}
+//
+//func (api CameraTaskApi) FindAll() (b bool,list []protomsg.CameraTask) {
+//	url := api.getBasicUrl() + DATA_URL_PREFIX + "/cameraTask/findAll"
+//	client := NewClient()
+//	body, err := client.DoGetRequest(url, nil, nil)
+//	if err != nil {
+//		return false,nil
+//	}
+//
+//	var res Result
+//	if err = json.Unmarshal(body, &res); err != nil {
+//		return false,nil
+//	}
+//	dataBytes, _ := json.Marshal(res.Data)
+//	if err := json.Unmarshal(dataBytes, &list);err !=nil {
+//		return false,nil
+//	}
+//	return true,list
+//}
+//
+//func (api CameraTaskApi) AddTask(cameraId string,taskId string) (bool,interface{}) {
+//	url := api.getBasicUrl() + DATA_URL_PREFIX + "/cameraTask/addTask"
+//	client := NewClient()
+//	paramBody := map[string]interface{}{
+//		"cameraId": cameraId,
+//		"taskId": taskId,
+//	}
+//	respBody, err := client.DoPostRequest(url, CONTENT_TYPE_FORM, paramBody,nil,nil)
+//	if err != nil {
+//		return false,nil
+//	}
+//	var res Result
+//	if err = json.Unmarshal(respBody, &res); err != nil {
+//		return false,nil
+//	}
+//	return res.Success,res.Data
+//}
+//
+//func (api CameraTaskApi) CameraTaskSave(paramBody map[string]interface{}) (bool,interface{}) {
+//	url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/saveTask"
+//	client := NewClient()
+//	respBody, err := client.DoPostRequest(url, CONTENT_TYPE_JSON, paramBody,nil, nil)
+//	if err != nil {
+//		return false,nil
+//	}
+//	var res Result
+//	if err = json.Unmarshal(respBody, &res); err != nil {
+//		return false,nil
+//	}
+//	return res.Success,res.Data
+//}
+//
+//func (api CameraTaskApi) PasteRules(sourceId string, targetIds []string) bool {
+//	url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/pasteRules"
+//	client := NewClient()
+//	paramBody := map[string]interface{} {
+//		"sourceId": sourceId,
+//		"targetIds": targetIds,
+//	}
+//	respBody, err := client.DoPostRequest(url, CONTENT_TYPE_JSON, paramBody,nil, nil)
+//	if err != nil {
+//		return false
+//	}
+//	var res Result
+//	if err = json.Unmarshal(respBody, &res); err != nil {
+//		return false
+//	}
+//	return res.Success
+//}
+//
+//func (api CameraTaskApi) FindTasksByCameraIds(cameraIds []string) (bool,interface{}) {
+//	url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/alltask"
+//	client := NewClient()
+//	paramBody :=make(map[string]interface{})
+//	paramBody["cameraIds"] = cameraIds
+//	respBody, err := client.DoPostRequest(url, CONTENT_TYPE_JSON, paramBody,nil, nil)
+//	if err != nil {
+//		return false,nil
+//	}
+//	var res Result
+//	if err = json.Unmarshal(respBody, &res); err != nil {
+//		return false,nil
+//	}
+//	return res.Success,res.Data
+//}
+//
+//func (api CameraTaskApi) CameraTaskAll(cameraId string) (bool,interface{}) {
+//	url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/task/"+cameraId
+//	client := NewClient()
+//	paramQuery :=make(map[string]string)
+//	paramQuery["cameraId"] = cameraId
+//	respBody, err := client.DoGetRequest(url, paramQuery,nil)
+//	if err != nil {
+//		return false,nil
+//	}
+//	var res Result
+//	if err = json.Unmarshal(respBody, &res); err != nil {
+//		return false,nil
+//	}
+//	return res.Success,res.Data
+//}
+//
+//func (api CameraTaskApi) DeleteCameraTask(cameraId string,taskId string) (bool,interface{}) {
+//	url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/delTask/"+cameraId+"/"+taskId
+//	client := NewClient()
+//	respBody, err := client.DoDeleteRequest(url, CONTENT_TYPE_FORM, nil,nil)
+//	if err != nil {
+//		return false,nil
+//	}
+//	var res Result
+//	if err = json.Unmarshal(respBody, &res); err != nil {
+//		return false,nil
+//	}
+//	return res.Success,res.Data
+//}
+//
+//func (api CameraTaskApi) SaveIsDataTrans(paramBody map[string]interface{}) (bool,interface{}){
+//	url := api.getBasicUrl() + DATA_URL_PREFIX + "/cameraTask/saveIsDataTrans"
+//	client := NewClient()
+//	respBody, err := client.DoPostRequest(url, CONTENT_TYPE_JSON, paramBody,nil, nil)
+//	if err != nil {
+//		return false,nil
+//	}
+//	var res Result
+//	if err = json.Unmarshal(respBody, &res); err != nil {
+//		return false,nil
+//	}
+//	return res.Success,res.Data
+//}
+//
+//func (api CameraTaskApi) SaveAlarmLevelByGroup(groupId string,alarmLevel int) (bool,interface{}){
+//	url := api.getBasicUrl() + DATA_URL_PREFIX + "/cameraTask/saveAlarmLevelByGroup"
+//	client := NewClient()
+//	paramBody :=make(map[string]interface{},0)
+//	paramBody["group_id"] = groupId
+//	paramBody["alarm_level"] = alarmLevel
+//	respBody, err := client.DoPostRequest(url, CONTENT_TYPE_JSON, paramBody,nil, nil)
+//	if err != nil {
+//		return false,nil
+//	}
+//	var res Result
+//	if err = json.Unmarshal(respBody, &res); err != nil {
+//		return false,nil
+//	}
+//	return res.Success,res.Data
+//}
+//
+////鏇存柊鎽勫儚鏈轰换鍔＄姸鎬�
+//func (api CameraTaskApi) UpdateCameraTaskStatus(cameraId string,taskId string,statusInt int) (bool,interface{}){
+//	url := api.getBasicUrl() + DATA_URL_PREFIX + "/cameraTask/updateCameraTaskStatus"
+//	client := NewClient()
+//	paramBody :=make(map[string]interface{})
+//	paramBody["cameraId"] = cameraId
+//	paramBody["taskId"] = taskId
+//	paramBody["status"] = statusInt
+//	respBody, err := client.DoPostRequest(url, CONTENT_TYPE_JSON, paramBody, nil, nil)
+//	if err != nil {
+//		return false,nil
+//	}
+//	var res Result
+//	if err = json.Unmarshal(respBody, &res); err != nil {
+//		return false,nil
+//	}
+//	return res.Success,res.Data
+//}
\ No newline at end of file
diff --git a/cameraTaskArgsApi.go b/cameraTaskArgsApi.go
index 5321f5e..56e1d79 100644
--- a/cameraTaskArgsApi.go
+++ b/cameraTaskArgsApi.go
@@ -1,135 +1,135 @@
 package dbapi
-
-import (
-	"basic.com/pubsub/protomsg.git"
-	"encoding/json"
-	"strconv"
-)
-
-type CameraTaskArgsApi struct {
-	Ip string
-	Port int
-}
-
-func (api CameraTaskArgsApi) getBasicUrl() string {
-	if api.Ip == "" {
-		return BASIC_URL
-	}
-	if api.Ip == "" {
-		api.Ip = DEFAULT_IP
-	}
-	if api.Port == 0 {
-		api.Port = DEFAULT_PORT
-	}
-	return "http://"+api.Ip+":"+strconv.Itoa(api.Port)
-}
-
-func (api CameraTaskArgsApi) FindByCameraAndTask(cameraId string,taskId string,setType string) (bool,interface{}) {
-	url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/getRulesByCameraAndTask"
-	client := NewClient()
-	paramQuery :=make(map[string]string)
-	paramQuery["cameraId"] = cameraId
-	paramQuery["taskId"] = taskId
-	paramQuery["set_type"] = setType
-	respBody, err := client.DoGetRequest(url, paramQuery,nil)
-	if err != nil {
-		return false,nil
-	}
-	var res Result
-	if err = json.Unmarshal(respBody, &res); err != nil {
-		return false,nil
-	}
-	return res.Success,res.Data
-}
-
-func (api CameraTaskArgsApi) UpdateDefenceStateByGroup(groupId string,defenceState bool)(bool,interface{}){
-	url := api.getBasicUrl() + DATA_URL_PREFIX + "/cameraTaskArgs/updateDefenceStateByGroup"
-	client := NewClient()
-	paramBody :=make(map[string]interface{},0)
-	paramBody["groupId"] = groupId
-	paramBody["defenceState"] = defenceState
-	respBody, err := client.DoPostRequest(url,CONTENT_TYPE_FORM,paramBody,nil,nil)
-	if err != nil {
-		return false,nil
-	}
-	var res Result
-	if err = json.Unmarshal(respBody, &res); err != nil {
-		return false,nil
-	}
-	return res.Success,res.Data
-}
-
-func (api CameraTaskArgsApi) DeleteByGroup(groupId string)(bool,interface{}) {
-	url := api.getBasicUrl() + DATA_URL_PREFIX + "/cameraTaskArgs/deleteByGroup"
-	client := NewClient()
-	paramQuery :=make(map[string]string)
-	paramQuery["groupId"] = groupId
-	respBody, err := client.DoGetRequest(url, paramQuery,nil)
-	if err != nil {
-		return false,nil
-	}
-	var res Result
-	if err = json.Unmarshal(respBody, &res); err != nil {
-		return false,nil
-	}
-	return res.Success,res.Data
-}
-
-func (api CameraTaskArgsApi) FindAll() ([]protomsg.CameraTaskArgs){
-	url := api.getBasicUrl() + DATA_URL_PREFIX + "/cameraTaskArgs/findAll"
-	client := NewClient()
-	respBody, err := client.DoGetRequest(url, nil,nil)
-	if err != nil {
-		return nil
-	}
-	var res Result
-	if err = json.Unmarshal(respBody, &res); err != nil {
-		return nil
-	}
-	arr :=make([]protomsg.CameraTaskArgs,0)
-	dataBytes, _ := json.Marshal(res.Data)
-	json.Unmarshal(dataBytes,&arr)
-	return arr
-}
-
-func (api CameraTaskArgsApi) GetLinkRulesByCameraIds(paramBody map[string]interface{})(bool,interface{}){
-	url := api.getBasicUrl() + DATA_URL_PREFIX + "/cameraTaskArgs/getLinkRulesByCameraIds"
-	client := NewClient()
-	respBody, err := client.DoPostRequest(url,CONTENT_TYPE_JSON,paramBody,nil,nil)
-	if err != nil {
-		return false,nil
-	}
-	var res Result
-	if err = json.Unmarshal(respBody, &res); err != nil {
-		return false,nil
-	}
-	return res.Success,res.Data
-}
-
-func (api CameraTaskArgsApi) SaveLinkRulesByGroup(paramBody map[string]interface{}) (bool,interface{}){
-	url := api.getBasicUrl() + DATA_URL_PREFIX + "/cameraTaskArgs/saveLinkRulesByGroup"
-	client := NewClient()
-	respBody, err := client.DoPostRequest(url, CONTENT_TYPE_JSON, paramBody,nil, nil)
-	if err != nil {
-		return false,nil
-	}
-	var res Result
-	if err = json.Unmarshal(respBody, &res); err != nil {
-		return false,nil
-	}
-	return res.Success,res.Data
-}
-
-func (api CameraTaskApi) RuleApply2All(paramBody map[string]interface{}) (bool,interface{}) {
-	url := api.getBasicUrl() + DATA_URL_PREFIX + "/cameraTaskArgs/ruleApply2All"
-	client := NewClient()
-	respBody, err := client.DoPostRequest(url, CONTENT_TYPE_JSON, paramBody,nil, nil)
-	if err != nil {
-		return false,nil
-	}
-	var res Result
-	if err = json.Unmarshal(respBody, &res); err != nil {
-		return false,nil
-	}
-	return res.Success,res.Data
-}
\ No newline at end of file
+//
+//import (
+//	"basic.com/pubsub/protomsg.git"
+//	"encoding/json"
+//	"strconv"
+//)
+//
+//type CameraTaskArgsApi struct {
+//	Ip string
+//	Port int
+//}
+//
+//func (api CameraTaskArgsApi) getBasicUrl() string {
+//	if api.Ip == "" {
+//		return BASIC_URL
+//	}
+//	if api.Ip == "" {
+//		api.Ip = DEFAULT_IP
+//	}
+//	if api.Port == 0 {
+//		api.Port = DEFAULT_PORT
+//	}
+//	return "http://"+api.Ip+":"+strconv.Itoa(api.Port)
+//}
+//
+//func (api CameraTaskArgsApi) FindByCameraAndTask(cameraId string,taskId string,setType string) (bool,interface{}) {
+//	url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/getRulesByCameraAndTask"
+//	client := NewClient()
+//	paramQuery :=make(map[string]string)
+//	paramQuery["cameraId"] = cameraId
+//	paramQuery["taskId"] = taskId
+//	paramQuery["set_type"] = setType
+//	respBody, err := client.DoGetRequest(url, paramQuery,nil)
+//	if err != nil {
+//		return false,nil
+//	}
+//	var res Result
+//	if err = json.Unmarshal(respBody, &res); err != nil {
+//		return false,nil
+//	}
+//	return res.Success,res.Data
+//}
+//
+//func (api CameraTaskArgsApi) UpdateDefenceStateByGroup(groupId string,defenceState bool)(bool,interface{}){
+//	url := api.getBasicUrl() + DATA_URL_PREFIX + "/cameraTaskArgs/updateDefenceStateByGroup"
+//	client := NewClient()
+//	paramBody :=make(map[string]interface{},0)
+//	paramBody["groupId"] = groupId
+//	paramBody["defenceState"] = defenceState
+//	respBody, err := client.DoPostRequest(url,CONTENT_TYPE_FORM,paramBody,nil,nil)
+//	if err != nil {
+//		return false,nil
+//	}
+//	var res Result
+//	if err = json.Unmarshal(respBody, &res); err != nil {
+//		return false,nil
+//	}
+//	return res.Success,res.Data
+//}
+//
+//func (api CameraTaskArgsApi) DeleteByGroup(groupId string)(bool,interface{}) {
+//	url := api.getBasicUrl() + DATA_URL_PREFIX + "/cameraTaskArgs/deleteByGroup"
+//	client := NewClient()
+//	paramQuery :=make(map[string]string)
+//	paramQuery["groupId"] = groupId
+//	respBody, err := client.DoGetRequest(url, paramQuery,nil)
+//	if err != nil {
+//		return false,nil
+//	}
+//	var res Result
+//	if err = json.Unmarshal(respBody, &res); err != nil {
+//		return false,nil
+//	}
+//	return res.Success,res.Data
+//}
+//
+//func (api CameraTaskArgsApi) FindAll() ([]protomsg.CameraTaskArgs){
+//	url := api.getBasicUrl() + DATA_URL_PREFIX + "/cameraTaskArgs/findAll"
+//	client := NewClient()
+//	respBody, err := client.DoGetRequest(url, nil,nil)
+//	if err != nil {
+//		return nil
+//	}
+//	var res Result
+//	if err = json.Unmarshal(respBody, &res); err != nil {
+//		return nil
+//	}
+//	arr :=make([]protomsg.CameraTaskArgs,0)
+//	dataBytes, _ := json.Marshal(res.Data)
+//	json.Unmarshal(dataBytes,&arr)
+//	return arr
+//}
+//
+//func (api CameraTaskArgsApi) GetLinkRulesByCameraIds(paramBody map[string]interface{})(bool,interface{}){
+//	url := api.getBasicUrl() + DATA_URL_PREFIX + "/cameraTaskArgs/getLinkRulesByCameraIds"
+//	client := NewClient()
+//	respBody, err := client.DoPostRequest(url,CONTENT_TYPE_JSON,paramBody,nil,nil)
+//	if err != nil {
+//		return false,nil
+//	}
+//	var res Result
+//	if err = json.Unmarshal(respBody, &res); err != nil {
+//		return false,nil
+//	}
+//	return res.Success,res.Data
+//}
+//
+//func (api CameraTaskArgsApi) SaveLinkRulesByGroup(paramBody map[string]interface{}) (bool,interface{}){
+//	url := api.getBasicUrl() + DATA_URL_PREFIX + "/cameraTaskArgs/saveLinkRulesByGroup"
+//	client := NewClient()
+//	respBody, err := client.DoPostRequest(url, CONTENT_TYPE_JSON, paramBody,nil, nil)
+//	if err != nil {
+//		return false,nil
+//	}
+//	var res Result
+//	if err = json.Unmarshal(respBody, &res); err != nil {
+//		return false,nil
+//	}
+//	return res.Success,res.Data
+//}
+//
+//func (api CameraTaskApi) RuleApply2All(paramBody map[string]interface{}) (bool,interface{}) {
+//	url := api.getBasicUrl() + DATA_URL_PREFIX + "/cameraTaskArgs/ruleApply2All"
+//	client := NewClient()
+//	respBody, err := client.DoPostRequest(url, CONTENT_TYPE_JSON, paramBody,nil, nil)
+//	if err != nil {
+//		return false,nil
+//	}
+//	var res Result
+//	if err = json.Unmarshal(respBody, &res); err != nil {
+//		return false,nil
+//	}
+//	return res.Success,res.Data
+//}
\ No newline at end of file
diff --git a/ruleTemplateApi.go b/ruleTemplateApi.go
new file mode 100644
index 0000000..37bcb91
--- /dev/null
+++ b/ruleTemplateApi.go
@@ -0,0 +1,101 @@
+package dbapi
+
+import (
+	"basic.com/pubsub/protomsg.git"
+	"encoding/json"
+	"strconv"
+)
+
+type RuleTemplateApi struct{
+	Ip string
+	Port int
+}
+
+func (api RuleTemplateApi) getBasicUrl() string {
+	if api.Ip == "" {
+		return BASIC_URL
+	}
+	if api.Ip == "" {
+		api.Ip = DEFAULT_IP
+	}
+	if api.Port == 0 {
+		api.Port = DEFAULT_PORT
+	}
+	return "http://"+api.Ip+":"+strconv.Itoa(api.Port)
+}
+
+func (api RuleTemplateApi) Save(reqBody map[string]interface{}) bool {
+	url := api.getBasicUrl() + DATA_URL_PREFIX + "/template/rule/save"
+	client := NewClient()
+	body, err := client.DoPostRequest(url,CONTENT_TYPE_JSON, reqBody,nil,nil)
+	if err != nil {
+		return false
+	}
+
+	var res Result
+	if err = json.Unmarshal(body, &res); err != nil {
+		return false
+	}
+	return res.Success
+}
+
+func (api RuleTemplateApi) Show(id string) (bool,interface{}) {
+	url := api.getBasicUrl() + DATA_URL_PREFIX + "/template/rule/"+id
+	client := NewClient()
+	body, err := client.DoGetRequest(url, nil,nil)
+	if err != nil {
+		return false,nil
+	}
+
+	var res Result
+	if err = json.Unmarshal(body, &res); err != nil {
+		return false,nil
+	}
+	return res.Success, res.Data
+}
+
+func (api RuleTemplateApi) Delete(id string) bool {
+	url := api.getBasicUrl() + DATA_URL_PREFIX + "/template/rule/"+id
+	client := NewClient()
+	body, err := client.DoDeleteRequest(url,CONTENT_TYPE_JSON, nil,nil)
+	if err != nil {
+		return false
+	}
+
+	var res Result
+	if err = json.Unmarshal(body, &res); err != nil {
+		return false
+	}
+	return res.Success
+}
+
+func (api RuleTemplateApi) FindAll() (b bool,templates []protomsg.RuleTemplate) {
+	url := api.getBasicUrl() + DATA_URL_PREFIX + "/template/rule"
+	client := NewClient()
+	body, err := client.DoGetRequest(url,nil,nil)
+	if err != nil {
+		logPrint(err)
+		return false,nil
+	}
+
+	var res Result
+	if err = json.Unmarshal(body, &res); err != nil {
+		logPrint(err)
+		return false,nil
+	}
+	if !res.Success {
+		logPrint(err)
+		return false,nil
+	}
+	bytes,err := json.Marshal(res.Data)
+	if err != nil {
+		logPrint(err)
+		return false, nil
+	}
+	err = json.Unmarshal(bytes, &templates)
+	if err != nil {
+		logPrint(err)
+		return false, nil
+	}
+	return true, templates
+}
\ No newline at end of file
diff --git a/taskApi.go b/taskApi.go
index d44f44a..ceb10ea 100644
--- a/taskApi.go
+++ b/taskApi.go
@@ -1,198 +1,198 @@
 package dbapi
-
-import (
-	"basic.com/pubsub/protomsg.git"
-	"encoding/json"
-	"strconv"
-)
-
-type TaskApi struct {
-	Ip string
-	Port int
-}
-
-func (api TaskApi) getBasicUrl() string {
-	if api.Ip == "" {
-		return BASIC_URL
-	}
-	if api.Ip == "" {
-		api.Ip = DEFAULT_IP
-	}
-	if api.Port == 0 {
-		api.Port = DEFAULT_PORT
-	}
-	return "http://"+api.Ip+":"+strconv.Itoa(api.Port)
-}
-
-//鑾峰彇鎵�鏈変换鍔′俊鎭�(鍖呭惈绠楁硶瀹氫箟)
-func (api TaskApi) FindAll() (taskInfos []protomsg.TaskSdkInfo) {
-	url := api.getBasicUrl() + DATA_URL_PREFIX + "/task/findAll"
-	client := NewClient()
-
-	respBody, err := client.DoGetRequest(url, nil, nil)
-	if err !=nil {
-		return taskInfos
-	}
-	var res Result
-	if err = json.Unmarshal(respBody, &res); err != nil {
-		logPrint(err)
-		return taskInfos
-	}
-	bytes, _ := json.Marshal(res.Data)
-	err = json.Unmarshal(bytes, &taskInfos)
-	return taskInfos
-}
-
-func (api TaskApi) FindAllTaskDefaultArgs(scope string)(taskInfos []protomsg.TaskSdkInfo) {
-	url := api.getBasicUrl() + DATA_URL_PREFIX + "/task/findAll"
-	client := NewClient()
-	queryParam := map[string]string {
-		"scope": scope,
-	}
-	respBody, err := client.DoGetRequest(url, queryParam, nil)
-	if err !=nil {
-		return taskInfos
-	}
-	var res Result
-	if err = json.Unmarshal(respBody, &res); err != nil {
-		logPrint(err)
-		return taskInfos
-	}
-	bytes, _ := json.Marshal(res.Data)
-	err = json.Unmarshal(bytes, &taskInfos)
-	return taskInfos
-}
-
-func (api TaskApi) FindAllTaskSdkRun() (taskSdks []protomsg.TaskSdkRun) {
-	taskInfos := api.FindAll()
-	if taskInfos !=nil {
-		for _,ti :=range taskInfos{
-			if !ti.Task.Enable {
-				continue
-			}
-			tsr := protomsg.TaskSdkRun{
-				Task:ti.Task,
-			}
-			m := make(map[string]string,0)
-			for _,s := range ti.Sdks{
-				if _,ok :=m[s.SdkType];!ok{
-					m[s.SdkType] = s.SdkType
-					tsr.Sdks = append(tsr.Sdks,&protomsg.SdkRun{
-						IpcId:s.IpcId,
-						SdkType:s.SdkType,
-					})
-				}
-			}
-
-			taskSdks = append(taskSdks,tsr)
-		}
-	}
-	return taskSdks
-}
-
-func (api TaskApi) Add(paramBody map[string]interface{}) (bool,interface{}) {
-	url := api.getBasicUrl() + DATA_URL_PREFIX + "/task/addTask"
-	client := NewClient()
-	respBody, err := client.DoPostRequest(url, CONTENT_TYPE_JSON, paramBody, nil, nil)
-	if err != nil {
-		return false,nil
-	}
-	var res Result
-	if err = json.Unmarshal(respBody, &res); err != nil {
-		logPrint(err)
-		return false,nil
-	}
-	return res.Success,res.Data
-}
-
-func (api TaskApi) Delete(taskId string) (bool,interface{}){
-	url := api.getBasicUrl() + DATA_URL_PREFIX + "/task/delete"
-	client := NewClient()
-	paramQuery :=make(map[string]string,0)
-	paramQuery["taskId"] = taskId
-	respBody, err := client.DoGetRequest(url, paramQuery, nil)
-	if err != nil {
-		return false,nil
-	}
-	var res Result
-	if err = json.Unmarshal(respBody, &res); err != nil {
-		return false,nil
-	}
-	return res.Success,res.Data
-}
-
-func (api TaskApi) AddTaskSdk(paramBody map[string]interface{}) (bool,interface{}) {
-	url := api.getBasicUrl() + DATA_URL_PREFIX + "/task/addTaskSdk"
-	client := NewClient()
-	respBody, err := client.DoPostRequest(url,CONTENT_TYPE_JSON, paramBody, nil,nil)
-	if err != nil {
-		return false,nil
-	}
-	var res Result
-	if err = json.Unmarshal(respBody, &res); err != nil {
-		return false,nil
-	}
-	return res.Success,res.Data
-}
-
-func (api TaskApi) UpdateTaskName(taskId string, taskName string) bool {
-	url := api.getBasicUrl() + DATA_URL_PREFIX + "/task/updateTaskName"
-	client := NewClient()
-	paramBody := make(map[string]interface{},0)
-	paramBody["taskId"] = taskId
-	paramBody["taskName"] = taskName
-	respBody, err := client.DoPostRequest(url, CONTENT_TYPE_FORM, paramBody, nil, nil)
-	if err != nil {
-		return false
-	}
-	var res Result
-	if err = json.Unmarshal(respBody, &res); err != nil {
-		return false
-	}
-	return res.Success
-}
-
-func (api TaskApi) UpdateTaskStatus(paramBody map[string]interface{}) (bool,interface{}) {
-	url := api.getBasicUrl() + DATA_URL_PREFIX + "/task/updateTaskStatus"
-	client := NewClient()
-	respBody, err := client.DoPostRequest(url, CONTENT_TYPE_JSON, paramBody, nil, nil)
-	if err != nil {
-		return false,nil
-	}
-	var res Result
-	if err = json.Unmarshal(respBody, &res); err != nil {
-		return false,nil
-	}
-	return res.Success,res.Data
-}
-
-func (api TaskApi) DeleteTaskSdk(taskId string,sdkId string) (bool,interface{}) {
-	url := api.getBasicUrl() + DATA_URL_PREFIX + "/task/delTaskSdk"
-	client := NewClient()
-	paramQuery :=make(map[string]string,0)
-	paramQuery["taskId"] = taskId
-	paramQuery["sdkId"] = sdkId
-	respBody, err := client.DoGetRequest(url, paramQuery, nil)
-	if err != nil {
-		return false,nil
-	}
-	var res Result
-	if err = json.Unmarshal(respBody, &res); err != nil {
-		return false,nil
-	}
-	return res.Success,res.Data
-}
-
-func (api TaskApi) StatisticTaskCamera() (bool,interface{}) {
-	url := api.getBasicUrl() + DATA_URL_PREFIX + "/task/statisticTaskCamera"
-	client := NewClient()
-	respBody, err := client.DoGetRequest(url, nil, nil)
-	if err != nil {
-		return false,nil
-	}
-	var res Result
-	if err = json.Unmarshal(respBody, &res); err != nil {
-		return false,nil
-	}
-	return res.Success,res.Data
-}
\ No newline at end of file
+//
+//import (
+//	"basic.com/pubsub/protomsg.git"
+//	"encoding/json"
+//	"strconv"
+//)
+//
+//type TaskApi struct {
+//	Ip string
+//	Port int
+//}
+//
+//func (api TaskApi) getBasicUrl() string {
+//	if api.Ip == "" {
+//		return BASIC_URL
+//	}
+//	if api.Ip == "" {
+//		api.Ip = DEFAULT_IP
+//	}
+//	if api.Port == 0 {
+//		api.Port = DEFAULT_PORT
+//	}
+//	return "http://"+api.Ip+":"+strconv.Itoa(api.Port)
+//}
+//
+////鑾峰彇鎵�鏈変换鍔′俊鎭�(鍖呭惈绠楁硶瀹氫箟)
+//func (api TaskApi) FindAll() (taskInfos []protomsg.TaskSdkInfo) {
+//	url := api.getBasicUrl() + DATA_URL_PREFIX + "/task/findAll"
+//	client := NewClient()
+//
+//	respBody, err := client.DoGetRequest(url, nil, nil)
+//	if err !=nil {
+//		return taskInfos
+//	}
+//	var res Result
+//	if err = json.Unmarshal(respBody, &res); err != nil {
+//		logPrint(err)
+//		return taskInfos
+//	}
+//	bytes, _ := json.Marshal(res.Data)
+//	err = json.Unmarshal(bytes, &taskInfos)
+//	return taskInfos
+//}
+//
+//func (api TaskApi) FindAllTaskDefaultArgs(scope string)(taskInfos []protomsg.TaskSdkInfo) {
+//	url := api.getBasicUrl() + DATA_URL_PREFIX + "/task/findAll"
+//	client := NewClient()
+//	queryParam := map[string]string {
+//		"scope": scope,
+//	}
+//	respBody, err := client.DoGetRequest(url, queryParam, nil)
+//	if err !=nil {
+//		return taskInfos
+//	}
+//	var res Result
+//	if err = json.Unmarshal(respBody, &res); err != nil {
+//		logPrint(err)
+//		return taskInfos
+//	}
+//	bytes, _ := json.Marshal(res.Data)
+//	err = json.Unmarshal(bytes, &taskInfos)
+//	return taskInfos
+//}
+//
+//func (api TaskApi) FindAllTaskSdkRun() (taskSdks []protomsg.TaskSdkRun) {
+//	taskInfos := api.FindAll()
+//	if taskInfos !=nil {
+//		for _,ti :=range taskInfos{
+//			if !ti.Task.Enable {
+//				continue
+//			}
+//			tsr := protomsg.TaskSdkRun{
+//				Task:ti.Task,
+//			}
+//			m := make(map[string]string,0)
+//			for _,s := range ti.Sdks{
+//				if _,ok :=m[s.SdkType];!ok{
+//					m[s.SdkType] = s.SdkType
+//					tsr.Sdks = append(tsr.Sdks,&protomsg.SdkRun{
+//						IpcId:s.IpcId,
+//						SdkType:s.SdkType,
+//					})
+//				}
+//			}
+//
+//			taskSdks = append(taskSdks,tsr)
+//		}
+//	}
+//	return taskSdks
+//}
+//
+//func (api TaskApi) Add(paramBody map[string]interface{}) (bool,interface{}) {
+//	url := api.getBasicUrl() + DATA_URL_PREFIX + "/task/addTask"
+//	client := NewClient()
+//	respBody, err := client.DoPostRequest(url, CONTENT_TYPE_JSON, paramBody, nil, nil)
+//	if err != nil {
+//		return false,nil
+//	}
+//	var res Result
+//	if err = json.Unmarshal(respBody, &res); err != nil {
+//		logPrint(err)
+//		return false,nil
+//	}
+//	return res.Success,res.Data
+//}
+//
+//func (api TaskApi) Delete(taskId string) (bool,interface{}){
+//	url := api.getBasicUrl() + DATA_URL_PREFIX + "/task/delete"
+//	client := NewClient()
+//	paramQuery :=make(map[string]string,0)
+//	paramQuery["taskId"] = taskId
+//	respBody, err := client.DoGetRequest(url, paramQuery, nil)
+//	if err != nil {
+//		return false,nil
+//	}
+//	var res Result
+//	if err = json.Unmarshal(respBody, &res); err != nil {
+//		return false,nil
+//	}
+//	return res.Success,res.Data
+//}
+//
+//func (api TaskApi) AddTaskSdk(paramBody map[string]interface{}) (bool,interface{}) {
+//	url := api.getBasicUrl() + DATA_URL_PREFIX + "/task/addTaskSdk"
+//	client := NewClient()
+//	respBody, err := client.DoPostRequest(url,CONTENT_TYPE_JSON, paramBody, nil,nil)
+//	if err != nil {
+//		return false,nil
+//	}
+//	var res Result
+//	if err = json.Unmarshal(respBody, &res); err != nil {
+//		return false,nil
+//	}
+//	return res.Success,res.Data
+//}
+//
+//func (api TaskApi) UpdateTaskName(taskId string, taskName string) bool {
+//	url := api.getBasicUrl() + DATA_URL_PREFIX + "/task/updateTaskName"
+//	client := NewClient()
+//	paramBody := make(map[string]interface{},0)
+//	paramBody["taskId"] = taskId
+//	paramBody["taskName"] = taskName
+//	respBody, err := client.DoPostRequest(url, CONTENT_TYPE_FORM, paramBody, nil, nil)
+//	if err != nil {
+//		return false
+//	}
+//	var res Result
+//	if err = json.Unmarshal(respBody, &res); err != nil {
+//		return false
+//	}
+//	return res.Success
+//}
+//
+//func (api TaskApi) UpdateTaskStatus(paramBody map[string]interface{}) (bool,interface{}) {
+//	url := api.getBasicUrl() + DATA_URL_PREFIX + "/task/updateTaskStatus"
+//	client := NewClient()
+//	respBody, err := client.DoPostRequest(url, CONTENT_TYPE_JSON, paramBody, nil, nil)
+//	if err != nil {
+//		return false,nil
+//	}
+//	var res Result
+//	if err = json.Unmarshal(respBody, &res); err != nil {
+//		return false,nil
+//	}
+//	return res.Success,res.Data
+//}
+//
+//func (api TaskApi) DeleteTaskSdk(taskId string,sdkId string) (bool,interface{}) {
+//	url := api.getBasicUrl() + DATA_URL_PREFIX + "/task/delTaskSdk"
+//	client := NewClient()
+//	paramQuery :=make(map[string]string,0)
+//	paramQuery["taskId"] = taskId
+//	paramQuery["sdkId"] = sdkId
+//	respBody, err := client.DoGetRequest(url, paramQuery, nil)
+//	if err != nil {
+//		return false,nil
+//	}
+//	var res Result
+//	if err = json.Unmarshal(respBody, &res); err != nil {
+//		return false,nil
+//	}
+//	return res.Success,res.Data
+//}
+//
+//func (api TaskApi) StatisticTaskCamera() (bool,interface{}) {
+//	url := api.getBasicUrl() + DATA_URL_PREFIX + "/task/statisticTaskCamera"
+//	client := NewClient()
+//	respBody, err := client.DoGetRequest(url, nil, nil)
+//	if err != nil {
+//		return false,nil
+//	}
+//	var res Result
+//	if err = json.Unmarshal(respBody, &res); err != nil {
+//		return false,nil
+//	}
+//	return res.Success,res.Data
+//}
\ No newline at end of file
diff --git a/taskSdkRuleApi.go b/taskSdkRuleApi.go
index dd95155..a61d491 100644
--- a/taskSdkRuleApi.go
+++ b/taskSdkRuleApi.go
@@ -1,103 +1,103 @@
 package dbapi
-
-import (
-	"basic.com/pubsub/protomsg.git"
-	"encoding/json"
-	"strconv"
-)
-
-type TaskSdkRuleApi struct {
-	Ip string
-	Port int
-}
-
-func (api TaskSdkRuleApi) getBasicUrl() string {
-	if api.Ip == "" {
-		return BASIC_URL
-	}
-	if api.Ip == "" {
-		api.Ip = DEFAULT_IP
-	}
-	if api.Port == 0 {
-		api.Port = DEFAULT_PORT
-	}
-	return "http://"+api.Ip+":"+strconv.Itoa(api.Port)
-}
-
-func (api TaskSdkRuleApi) FindAllTaskSdkRules() (b bool,rules []protomsg.TaskSdkRule){
-	url := api.getBasicUrl() + DATA_URL_PREFIX + "/task/findAllTaskSdkRules"
-	client := NewClient()
-	body, err := client.DoGetRequest(url, nil, nil)
-	if err != nil {
-		return false,nil
-	}
-
-	var res Result
-	if err = json.Unmarshal(body, &res); err != nil {
-		logPrint(err)
-		return false,nil
-	}
-	bytes, _ := json.Marshal(res.Data)
-	err = json.Unmarshal(bytes, &rules)
-	if err !=nil{
-		return false,nil
-	}
-	return res.Success,rules
-}
-
-func (api TaskSdkRuleApi) GetRulesByTaskSdk(taskId string,sdkId string) (bool,interface{}){
-	url := api.getBasicUrl() + DATA_URL_PREFIX + "/task/getRulesByTaskSdk"
-	client := NewClient()
-	paramQ := make(map[string]string,0)
-	paramQ["taskId"] = taskId
-	paramQ["sdkId"] = sdkId
-	body, err := client.DoGetRequest(url, paramQ, nil)
-	if err != nil {
-		return false,err
-	}
-
-	var res Result
-	if err = json.Unmarshal(body, &res); err != nil {
-		logPrint(err)
-		return false,err
-	}
-	return res.Success,res.Data
-}
-
-func (api TaskSdkRuleApi) DeleteTaskSdkRule(taskId string,sdkId string) bool{
-	url := api.getBasicUrl() + DATA_URL_PREFIX + "/task/deleteTaskSdkRule"
-	client := NewClient()
-	paramBody := map[string]interface{}{
-		"taskId": taskId,
-		"sdkId": sdkId,
-	}
-	body,err := client.DoPostRequest(url,CONTENT_TYPE_FORM, paramBody,nil,nil)
-	if err != nil {
-		return false
-	}
-
-	var res Result
-	if err = json.Unmarshal(body, &res); err != nil {
-		logPrint(err)
-		return false
-	}
-
-	return res.Success
-}
-
-func (api TaskSdkRuleApi) SaveTaskSdkRule(paramBody map[string]interface{}) (bool,interface{}) {
-	url := api.getBasicUrl() + DATA_URL_PREFIX + "/task/saveTaskSdkRule"
-	client := NewClient()
-	body,err := client.DoPostRequest(url,CONTENT_TYPE_JSON, paramBody,nil,nil)
-	if err != nil {
-		return false,nil
-	}
-
-	var res Result
-	if err = json.Unmarshal(body, &res); err != nil {
-		logPrint(err)
-		return false,nil
-	}
-
-	return res.Success,res.Data
-}
\ No newline at end of file
+//
+//import (
+//	"basic.com/pubsub/protomsg.git"
+//	"encoding/json"
+//	"strconv"
+//)
+//
+//type TaskSdkRuleApi struct {
+//	Ip string
+//	Port int
+//}
+//
+//func (api TaskSdkRuleApi) getBasicUrl() string {
+//	if api.Ip == "" {
+//		return BASIC_URL
+//	}
+//	if api.Ip == "" {
+//		api.Ip = DEFAULT_IP
+//	}
+//	if api.Port == 0 {
+//		api.Port = DEFAULT_PORT
+//	}
+//	return "http://"+api.Ip+":"+strconv.Itoa(api.Port)
+//}
+//
+//func (api TaskSdkRuleApi) FindAllTaskSdkRules() (b bool,rules []protomsg.TaskSdkRule){
+//	url := api.getBasicUrl() + DATA_URL_PREFIX + "/task/findAllTaskSdkRules"
+//	client := NewClient()
+//	body, err := client.DoGetRequest(url, nil, nil)
+//	if err != nil {
+//		return false,nil
+//	}
+//
+//	var res Result
+//	if err = json.Unmarshal(body, &res); err != nil {
+//		logPrint(err)
+//		return false,nil
+//	}
+//	bytes, _ := json.Marshal(res.Data)
+//	err = json.Unmarshal(bytes, &rules)
+//	if err !=nil{
+//		return false,nil
+//	}
+//	return res.Success,rules
+//}
+//
+//func (api TaskSdkRuleApi) GetRulesByTaskSdk(taskId string,sdkId string) (bool,interface{}){
+//	url := api.getBasicUrl() + DATA_URL_PREFIX + "/task/getRulesByTaskSdk"
+//	client := NewClient()
+//	paramQ := make(map[string]string,0)
+//	paramQ["taskId"] = taskId
+//	paramQ["sdkId"] = sdkId
+//	body, err := client.DoGetRequest(url, paramQ, nil)
+//	if err != nil {
+//		return false,err
+//	}
+//
+//	var res Result
+//	if err = json.Unmarshal(body, &res); err != nil {
+//		logPrint(err)
+//		return false,err
+//	}
+//	return res.Success,res.Data
+//}
+//
+//func (api TaskSdkRuleApi) DeleteTaskSdkRule(taskId string,sdkId string) bool{
+//	url := api.getBasicUrl() + DATA_URL_PREFIX + "/task/deleteTaskSdkRule"
+//	client := NewClient()
+//	paramBody := map[string]interface{}{
+//		"taskId": taskId,
+//		"sdkId": sdkId,
+//	}
+//	body,err := client.DoPostRequest(url,CONTENT_TYPE_FORM, paramBody,nil,nil)
+//	if err != nil {
+//		return false
+//	}
+//
+//	var res Result
+//	if err = json.Unmarshal(body, &res); err != nil {
+//		logPrint(err)
+//		return false
+//	}
+//
+//	return res.Success
+//}
+//
+//func (api TaskSdkRuleApi) SaveTaskSdkRule(paramBody map[string]interface{}) (bool,interface{}) {
+//	url := api.getBasicUrl() + DATA_URL_PREFIX + "/task/saveTaskSdkRule"
+//	client := NewClient()
+//	body,err := client.DoPostRequest(url,CONTENT_TYPE_JSON, paramBody,nil,nil)
+//	if err != nil {
+//		return false,nil
+//	}
+//
+//	var res Result
+//	if err = json.Unmarshal(body, &res); err != nil {
+//		logPrint(err)
+//		return false,nil
+//	}
+//
+//	return res.Success,res.Data
+//}
\ No newline at end of file

--
Gitblit v1.8.0