From 5133036e9f297019771d4aeac7f961cbb57406ec Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期三, 22 五月 2019 13:11:37 +0800
Subject: [PATCH] add api
---
protomsg | 2
sdkApi.go | 13 +-
cameraApi.go | 24 +++++
client.go | 2
entites.go | 113 ----------------------------
taskApi.go | 10 +-
api_test.go | 17 +++
areaApi.go | 5
8 files changed, 54 insertions(+), 132 deletions(-)
diff --git a/api_test.go b/api_test.go
index 639a7e3..1158431 100644
--- a/api_test.go
+++ b/api_test.go
@@ -1,6 +1,7 @@
package dbapi
import (
+ "dbapi/protomsg"
"fmt"
"testing"
)
@@ -13,7 +14,7 @@
func TestAreaAdd(t *testing.T) {
var api AreaApi
- var area = Area{
+ var area = protomsg.Area{
Parentid: 0,
Name: "鍝堝搱鍝�",
}
@@ -24,7 +25,7 @@
func TestAreaUpdate(t *testing.T) {
var api AreaApi
- var area = Area{
+ var area = protomsg.Area{
Id: 1,
Name: "鍖哄煙鏇存柊娴嬭瘯",
Parentid: 0,
@@ -54,6 +55,12 @@
func TestSdkApi_GetById(t *testing.T) {
var api SdkApi
model := api.GetById("812b674b-2375-4589-919a-5c1c3278a97e")
+ fmt.Printf("sdkArgs:%s \n",model.Args)
+
+ //if err := json.Unmarshal([]byte(model.Args), &sdkArgs);err !=nil {
+ // fmt.Println(err)
+ //}
+
fmt.Println(model)
}
@@ -67,4 +74,10 @@
var api TaskApi
taskInfos := api.FindAll()
fmt.Println(taskInfos)
+}
+
+func TestCameraApi_FindAll(t *testing.T) {
+ var api CameraApi
+ cameras := api.FindAll()
+ fmt.Println(cameras)
}
\ No newline at end of file
diff --git a/areaApi.go b/areaApi.go
index a81c466..7cf647c 100644
--- a/areaApi.go
+++ b/areaApi.go
@@ -3,6 +3,7 @@
import (
"encoding/json"
"fmt"
+ "dbapi/protomsg"
)
type AreaApi struct {
@@ -41,7 +42,7 @@
}
//娣诲姞鐩綍鑺傜偣
-func (api AreaApi) AreaAdd(area Area) bool {
+func (api AreaApi) AreaAdd(area protomsg.Area) bool {
flag := false
url := BASIC_URL + DATA_URL_PREFIX + "/area/add"
client := NewClient()
@@ -60,7 +61,7 @@
}
//鐩綍鏇存柊
-func (api AreaApi) AreaUpdate(area Area) bool {
+func (api AreaApi) AreaUpdate(area protomsg.Area) bool {
flag := false
url := BASIC_URL + DATA_URL_PREFIX + "/area/update/" + string(area.Id)
client := NewClient()
diff --git a/cameraApi.go b/cameraApi.go
index 03b85c6..202bcf7 100644
--- a/cameraApi.go
+++ b/cameraApi.go
@@ -1,6 +1,7 @@
package dbapi
import (
+ "dbapi/protomsg"
"encoding/json"
"fmt"
)
@@ -8,7 +9,7 @@
type CameraApi struct{}
//閫氳繃cameraId鑾峰彇鎽勫儚鏈轰俊鎭�
-func (api CameraApi) GetCameraById(cameraId string) (result Camera, err error) {
+func (api CameraApi) GetCameraById(cameraId string) (result protomsg.Camera, err error) {
url := BASIC_URL + DATA_URL_PREFIX + "/camera/show/" + cameraId
client := NewClient()
@@ -28,3 +29,24 @@
return result, err
}
+
+func (api CameraApi) FindAll() (cameras []protomsg.Camera) {
+ url := BASIC_URL + DATA_URL_PREFIX + "/camera/showAll"
+ 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 {
+ fmt.Println(err)
+ return nil
+ }
+
+ bytes, _ := json.Marshal(res.Data)
+ err = json.Unmarshal(bytes, &cameras)
+
+ return cameras
+}
diff --git a/client.go b/client.go
index 20bb145..64fc005 100644
--- a/client.go
+++ b/client.go
@@ -11,7 +11,7 @@
DoDeleteRequest(url string, contentType string, body map[string]interface{}, headers map[string]string) ([]byte, error)
}
-var BASIC_URL = "http://127.0.0.1:8001"
+var BASIC_URL = "http://192.168.1.11:8001"
const (
DATA_URL_PREFIX = "/data/api-v"
diff --git a/entites.go b/entites.go
index c6b599d..37f165a 100644
--- a/entites.go
+++ b/entites.go
@@ -1,35 +1,10 @@
package dbapi
-import (
- "time"
-)
-
type Result struct {
Code int `json:"code"`
Data interface{} `json:"data"`
Msg string `json:"msg"`
Success bool `json:"success"`
-}
-
-//鍏叡瀛楁
-type BaseEntity struct {
- Uuid string `json:"uuid"`
- Create_time string `json:"create_time"`
- Update_time string `json:"update_time"`
- Create_by string `json:"create_by"`
- Del_flag string `json:"del_flag"`
- Enabled string `json:"enabled"`
-}
-
-//鐩綍鍖哄煙缁撴瀯
-type Area struct {
- Id uint
- Parentid int
- Parentids string
- Name string
- Createby int
- Createtime time.Time
- Reserved string
}
type TreeMenu struct {
@@ -43,92 +18,4 @@
Id int
Name string
Parentid int
-}
-
-//鎽勫儚鏈虹粨鏋�
-type Camera struct {
- Id string
- Name string `json:"name"`
- Type int `json:"type" `
- Areaid uint `json:"areaid"`
- Addr string `json:"addr"`
- Longitude float64 `json:"longitude"`
- Latitude float64 `json:"latitude"`
- Rtsp string `json:"rtsp"`
- Ip string `json:"ip"`
- Port int `json:"port"`
- Username string `json:"username"`
- Password string `json:"password"`
- Brand string `json:"brand"`
- Reserved string `json:"reserved"`
- CamTask []CameraTask
-}
-
-//浠诲姟缁撴瀯
-type Task struct {
- Taskid string `json:"taskid"`
- Taskname string `json:"taskname"`
- CreateAt time.Time
- Createby string
- UpdateAt time.Time
- Enable bool
- IsAlarm bool
- DelFlag bool
-}
-
-//鎽勫儚鏈轰换鍔�
-type CameraTask struct {
- Cameraid string `json:"cameraid"` //鎽勫儚鏈篿d 鏉ヨ嚜浜庢憚鍍忔満琛�
- Taskid string `json:"taskid"` //浠诲姟id 鏉ヨ嚜浜庝换鍔¤〃
-
- DelFlag bool
- UpdateFlag bool // 绠楁硶鍚嶇О
- SdkArgs string `json:"sdkArgs"` // 绠楁硶鍙傛暟
- Enable int //榛樿鍚敤
-}
-
-type TasksRes struct {
- Task Task `json:"task"` //浠诲姟缁撴瀯浣�
- Sdks []Sdk `json:"sdks"` //浠诲姟瀵瑰簲鐨勭畻娉曚俊鎭拰鍙傛暟
- LinkType string `json:"linkType"`
-
-}
-
-//浠诲姟鍜岀畻娉曞叧鑱�
-type TaskSdk struct {
- Id string
- Taskid string
- Sdkid string //鏉ヨ嚜浜庣畻娉曡〃
- Sort int `json:"sort"` //鎺掑簭
-}
-
-//绠楁硶缁撴瀯浣�
-type Sdk struct {
- BaseEntity
- SdkName string `json:"sdk_name"` //绠楁硶鍚嶇О
- Args string `json:"args"` //绠楁硶鍙傛暟
- Icon string `json:"icon"` //绠楁硶鍥炬爣
- Url string `json:"url"` //绠楁硶涓嬭浇鍦板潃
-}
-
-//绠楁硶鍙傛暟瀹氫箟
-type SdkArg struct {
- Alias string `json:"alias"` //鍙傛暟鐨勫埆鍚�
- Name string `json:"name"` //鍙傛暟鍚嶇О
- Type string `json:"type"` //鍙傛暟绫诲瀷(鏁存暟锛屽瓧绗︿覆鎴栨暟缁�)
- Must bool `json:"must"` //鏄惁蹇呭～
- Range string `json:"range"` //鍊肩殑鑼冨洿锛宔g锛�0,100琛ㄧず浠�0鍒�100
- Sort int `json:"sort"` //鍙傛暟椤哄簭
-}
-
-//鏃堕棿鍙傛暟,浠庡懆涓�鍒板懆鏃ユ煇澶╃殑寮�濮嬫椂闂村拰缁撴潫鏃堕棿,controller鐢�
-type TimeRange struct {
- Start string
- End string
-}
-
-//澶氳竟褰㈢粨鏋勪綋
-type Point struct {
- X int32 `json:"x"`
- Y int32 `json:"y"`
}
diff --git a/protomsg b/protomsg
index fc2d2bc..11a6ba2 160000
--- a/protomsg
+++ b/protomsg
@@ -1 +1 @@
-Subproject commit fc2d2bcbdea4e392cfb0a81d8b1365854faaed60
+Subproject commit 11a6ba2d99914f4b8a5ddf07870a661f15571c3f
diff --git a/sdkApi.go b/sdkApi.go
index fe9aa77..46dfe80 100644
--- a/sdkApi.go
+++ b/sdkApi.go
@@ -1,6 +1,7 @@
package dbapi
import (
+ "dbapi/protomsg"
"encoding/json"
"fmt"
)
@@ -9,7 +10,7 @@
}
//淇濆瓨绠楁硶锛屾柊澧�(绠楁硶id涓虹┖)锛屾洿鏂帮紙绠楁硶id涓嶄负绌猴級
-func (api SdkApi)Save(sdk Sdk)bool {
+func (api SdkApi)Save(sdk protomsg.Sdk)bool {
flag := false
url := BASIC_URL + DATA_URL_PREFIX + "/sdk/save"
client := NewClient()
@@ -28,8 +29,8 @@
}
//鏌ユ壘鎵�鏈夌畻娉�
-func (api SdkApi) FindAll(sdkName string)[]Sdk{
- var sdkArr []Sdk
+func (api SdkApi) FindAll(sdkName string)[]protomsg.Sdk{
+ var sdkArr []protomsg.Sdk
url := BASIC_URL + DATA_URL_PREFIX + "/sdk/findAllSdk"
client := NewClient()
paramMap := make(map[string]string, 0)
@@ -55,14 +56,14 @@
return nil
}
for _,sdk := range sdkArr{
- sdkIds = append(sdkIds, sdk.Uuid)
+ sdkIds = append(sdkIds, sdk.Id)
}
return sdkIds
}
//閫氳繃id鑾峰彇绠楁硶淇℃伅
-func (api SdkApi) GetById(id string) Sdk{
- var sdk Sdk
+func (api SdkApi) GetById(id string) protomsg.Sdk{
+ var sdk protomsg.Sdk
url := BASIC_URL + DATA_URL_PREFIX + "/sdk/getById"
client := NewClient()
paramMap := make(map[string]string)
diff --git a/taskApi.go b/taskApi.go
index 41de9a1..6615c52 100644
--- a/taskApi.go
+++ b/taskApi.go
@@ -1,14 +1,15 @@
package dbapi
import (
+ "dbapi/protomsg"
"encoding/json"
"fmt"
)
type TaskApi struct {}
-//鑾峰彇鎵�鏈変换鍔′俊鎭�
-func (api TaskApi) FindAll() (taskInfos []TasksRes) {
+//鑾峰彇鎵�鏈変换鍔′俊鎭�(鍖呭惈绠楁硶瀹氫箟)
+func (api TaskApi) FindAll() (taskInfos []protomsg.TaskSdkInfo) {
url := BASIC_URL + DATA_URL_PREFIX + "/task/findAll"
client := NewClient()
@@ -22,10 +23,7 @@
return taskInfos
}
bytes, _ := json.Marshal(res.Data)
+ fmt.Printf("TaskApi.FindAll:%s\n",string(bytes))
err = json.Unmarshal(bytes, &taskInfos)
return taskInfos
-}
-
-func (api TaskApi) FindAllTaskAndSdkInfo(){
-
}
\ No newline at end of file
--
Gitblit v1.8.0