From f2d60f4a96b77cf3ae924f9d479bd40dd8fbd13c Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期五, 28 六月 2019 14:27:21 +0800
Subject: [PATCH] 修改结构体和相关成员
---
controllers/fileController.go | 21 +++++-----
models/dbtablepersons.go | 19 ++++-----
models/dbtables.go | 21 +++++-----
router/router.go | 44 +++++++++++-----------
4 files changed, 51 insertions(+), 54 deletions(-)
diff --git a/controllers/fileController.go b/controllers/fileController.go
index 1c1f606..33a2d81 100644
--- a/controllers/fileController.go
+++ b/controllers/fileController.go
@@ -5,16 +5,16 @@
"encoding/base64"
"fmt"
"github.com/gin-gonic/gin"
- "webserver/extend/code"
- "webserver/extend/esutil"
- "webserver/extend/util"
- "webserver/models"
"github.com/satori/go.uuid"
"image"
"image/jpeg"
"log"
"mime/multipart"
"net/http"
+ "webserver/extend/code"
+ "webserver/extend/esutil"
+ "webserver/extend/util"
+ "webserver/models"
)
type FileController struct {
@@ -116,15 +116,15 @@
feat := features[0]["feature"].([]byte) // linux
if len(feat) != 2560 { // linux
return field,nil,errors.New("NotFeatureFindError")
- } */ // linux
+ } */ // linux
feat := []byte("hello world") // windows 娴嬭瘯鏀惧紑
dbperson := new(models.Dbtablepersons)
- dbperson.FaceUrl = picIp+field // 鍥剧墖璺粡
- dbperson.TableId = tableId //
- dbperson.PersonName = filename // 鍥剧墖鍚�
+ dbperson.FaceFeature = picIp + field // 鍥剧墖璺粡
+ dbperson.TableId = tableId //
+ dbperson.PersonName = filename // 鍥剧墖鍚�
// 婕旂ずbase64缂栫爜
encodeString := base64.StdEncoding.EncodeToString(feat)
- dbperson.Feature = encodeString // 鐗瑰緛鍊糱ase64 鐮�
+ dbperson.FaceFeature = encodeString // 鐗瑰緛鍊糱ase64 鐮�
result := addDbPerson(dbperson)
return field, result, nil
} else {
@@ -133,7 +133,6 @@
}
/**涓婁紶鏂规硶**/
-
// @Summary 鎵归噺娣诲姞搴曞簱浜哄憳
// @Description 渚濇嵁鍥剧墖鎵归噺娣诲姞搴曞簱浜哄憳
@@ -240,7 +239,7 @@
//features := gorun.GetSimpleFaceDetect(picIp + "/" + field) // 鐗瑰緛鍊� 鍙湪linux 涓�
//feat := []byte("hello world") // windows 娴嬭瘯鏀惧紑
result := make(map[string]interface{}, 0)
- result["uploadImage"] = picIp+field
+ result["uploadImage"] = picIp + field
smUrl := make([]string, 0)
//for _, feature := range features { // linux
// 鑾峰彇鍥剧墖
diff --git a/models/dbtablepersons.go b/models/dbtablepersons.go
index dd43f4b..bee38f6 100644
--- a/models/dbtablepersons.go
+++ b/models/dbtablepersons.go
@@ -1,15 +1,14 @@
package models
-type Dbtablepersons struct {
+type Dbtablepersons struct {
BaseEntity
- TableId string `json:"tableId,omitempty" example:"搴撹〃id"`
- Feature string `json:"feature,omitempty" example:"浜鸿劯鐗瑰緛鍊�"`
- FaceUrl string `json:"faceUrl,omitempty" example:"鍥剧墖璺緞"`
- PersonName string `json:"personName,omitempty" example:"浜哄憳濮撳悕"`
- Age string `json:"age,omitempty" example:"骞撮緞"`
- Sex string `json:"sex,omitempty" example:"鎬у埆 鐢� 濂�"`
- Idcard string `json:"idcard,omitempty" example:"韬唤璇�"`
- PhoneNum string `json:"phoneNum,omitempty" example:"鎵嬫満鍙风爜"`
+ TableId string `json:"tableId,omitempty" example:"搴撹〃id"`
+ FaceFeature string `json:"faceFeature,omitempty" example:"浜鸿劯鐗瑰緛鍊�"`
+ PersonPicUrl string `json:"personPicUrl,omitempty" example:"鍥剧墖璺緞"`
+ PersonName string `json:"personName,omitempty" example:"浜哄憳濮撳悕"`
+ Age string `json:"age,omitempty" example:"骞撮緞"`
+ Sex string `json:"sex,omitempty" example:"鎬у埆 鐢� 濂�"`
+ IdCard string `json:"idCard,omitempty" example:"韬唤璇�"`
+ PhoneNum string `json:"phoneNum,omitempty" example:"鎵嬫満鍙风爜"`
MonitorLevel string `json:"monitorLevel,omitempty" example:"绛夌骇"`
}
-
diff --git a/models/dbtables.go b/models/dbtables.go
index 6f87f11..fc19c8a 100644
--- a/models/dbtables.go
+++ b/models/dbtables.go
@@ -2,15 +2,14 @@
type Dbtables struct {
BaseEntity
- TableName string `json:"tableName,omitempty" example:"搴曞簱123"`//琛ㄥ悕
- TableDesc string `json:"tableDesc,omitempty" example:"搴曞簱鎻忚堪"`//鎻忚堪
- TableType string `json:"tableType,omitempty" example:"person,car"`//浜哄憳琛�"person
- BwType string `json:"bwType,omitempty" example:"榛戝悕鍗�:1,鐧藉悕鍗�:0"` //榛戝悕鍗曪細1锛岀櫧鍚嶅崟锛�0
- StartTime string `json:"startTime,omitempty" example:"2019-01-12 12:14:56"` //鏈夋晥鏈熷紑濮嬫椂闂�
- EndTime string `json:"endTime,omitempty" example:"2019-10-12 12:14:56"` //鏈夋晥鏈熺粨鏉熸椂闂�
- UploadFlag string `json:"uploadFlag,omitempty" example:"涓婁紶鏍囧織"` //
- CmpThreshold string `json:"cmpThreshold,omitempty" example:"45"`// //浜鸿劯姣斿闃堝��
- SyncType string `json:"syncType,omitempty" example:"1:鍚屾搴擄紝2锛氭湰鍦板簱"` //鏄惁鏄悓姝ュ簱(1:鍚屾搴擄紝2锛氭湰鍦板簱)
- Indeviceid string `json:"indeviceid,omitempty" example:"鏈湴搴撴墍灞炵殑鍒嗘瀽璁惧id锛屽鏋滄槸鍚屾搴撳氨涓嶉渶瑕佽褰�"`// 鍒嗘瀽璁惧id(鏈湴搴撴墍灞炵殑鍒嗘瀽璁惧id锛屽鏋滄槸鍚屾搴撳氨涓嶉渶瑕佽褰�)
+ TableName string `json:"tableName,omitempty" example:"搴曞簱123"` //琛ㄥ悕
+ TableDesc string `json:"tableDesc,omitempty" example:"搴曞簱鎻忚堪"` //鎻忚堪
+ TableType string `json:"tableType,omitempty" example:"person,car"` //浜哄憳琛�"person
+ BwType string `json:"bwType,omitempty" example:"榛戝悕鍗�:1,鐧藉悕鍗�:0"` //榛戝悕鍗曪細1锛岀櫧鍚嶅崟锛�0
+ StartTime string `json:"startTime,omitempty" example:"2019-01-12 12:14:56"` //鏈夋晥鏈熷紑濮嬫椂闂�
+ EndTime string `json:"endTime,omitempty" example:"2019-10-12 12:14:56"` //鏈夋晥鏈熺粨鏉熸椂闂�
+ //UploadFlag string `json:"uploadFlag,omitempty" example:"涓婁紶鏍囧織"` //
+ //CmpThreshold string `json:"cmpThreshold,omitempty" example:"45"`// //浜鸿劯姣斿闃堝��
+ IsSync string `json:"isSync,omitempty" example:"1:鍚屾搴擄紝2锛氭湰鍦板簱"` //鏄惁鏄悓姝ュ簱(1:鍚屾搴擄紝2锛氭湰鍦板簱)
+ AnalyServerId string `json:"analyServerId,omitempty" example:"鏈湴搴撴墍灞炵殑鍒嗘瀽璁惧id锛屽鏋滄槸鍚屾搴撳氨涓嶉渶瑕佽褰�"` // 鍒嗘瀽璁惧id(鏈湴搴撴墍灞炵殑鍒嗘瀽璁惧id锛屽鏋滄槸鍚屾搴撳氨涓嶉渶瑕佽褰�)
}
-
diff --git a/router/router.go b/router/router.go
index cabb1e3..145b718 100644
--- a/router/router.go
+++ b/router/router.go
@@ -27,16 +27,16 @@
esSearchController := new(controllers.EsSearchController)
realTimeController := new(controllers.RealTimeController)
cameraTimeRuleController := new(controllers.CameraTimeruleController)
- polygonController :=new (controllers.CameraPolygonController)
- cameraTaskController :=new(controllers.CameraTaskController)
- cameraTaskArgsController :=new(controllers.CameraTaskArgsController)
- dicController :=new(controllers.DictionaryController)
- userController :=new(controllers.UserController)
+ polygonController := new(controllers.CameraPolygonController)
+ cameraTaskController := new(controllers.CameraTaskController)
+ cameraTaskArgsController := new(controllers.CameraTaskArgsController)
+ dicController := new(controllers.DictionaryController)
+ userController := new(controllers.UserController)
urlPrefix := "/data/api-v" // wp 娣诲姞 璺緞 鍓嶇紑
- userApi :=r.Group(urlPrefix+"/user")
+ userApi := r.Group(urlPrefix + "/user")
{
- userApi.POST("/login",userController.Login)
+ userApi.POST("/login", userController.Login)
}
//鍖哄煙绠＄悊
@@ -62,30 +62,30 @@
camera.GET("/delTask/:cameraId/:taskId", cameraController.CameraDelTask)
camera.POST("/saveTask", cameraController.CameraTaskSave)
- camera.GET("/getRulesByCameraAndTask",cameraTaskArgsController.FindByCameraAndTask)
+ camera.GET("/getRulesByCameraAndTask", cameraTaskArgsController.FindByCameraAndTask)
}
- cameraTaskArgsApi :=r.Group(urlPrefix + "/cameraTaskArgs")
+ cameraTaskArgsApi := r.Group(urlPrefix + "/cameraTaskArgs")
{
- cameraTaskArgsApi.GET("/deleteByGroup",cameraTaskArgsController.DeleteByGroup)
- cameraTaskArgsApi.POST("/getLinkRulesByCameraIds",cameraTaskArgsController.GetLinkRulesByCameraIds)
- cameraTaskArgsApi.POST("/saveLinkRulesByGroup",cameraTaskArgsController.SaveLinkRulesByGroup)
+ cameraTaskArgsApi.GET("/deleteByGroup", cameraTaskArgsController.DeleteByGroup)
+ cameraTaskArgsApi.POST("/getLinkRulesByCameraIds", cameraTaskArgsController.GetLinkRulesByCameraIds)
+ cameraTaskArgsApi.POST("/saveLinkRulesByGroup", cameraTaskArgsController.SaveLinkRulesByGroup)
}
cameraTaskApi := r.Group(urlPrefix + "/cameraTask")
{
- cameraTaskApi.POST("/saveIsDataTrans",cameraTaskController.SaveIsDataTrans)
- cameraTaskApi.POST("/saveAlarmLevelByGroup",cameraTaskController.SaveAlarmLevelByGroup)
- cameraTaskApi.POST("/updateCameraTaskStatus",cameraTaskController.UpdateCameraTaskStatus)
+ cameraTaskApi.POST("/saveIsDataTrans", cameraTaskController.SaveIsDataTrans)
+ cameraTaskApi.POST("/saveAlarmLevelByGroup", cameraTaskController.SaveAlarmLevelByGroup)
+ cameraTaskApi.POST("/updateCameraTaskStatus", cameraTaskController.UpdateCameraTaskStatus)
}
- polygon := r.Group(urlPrefix+"/polygon")
+ polygon := r.Group(urlPrefix + "/polygon")
{
polygon.POST("/save", polygonController.Save)
polygon.GET("/findByCameraId", polygonController.FindByCameraId)
//polygon.GET("/delete", polygonController.Delete)
- polygon.GET("/updateDefenceStateByPolygonId",polygonController.UpdateDefenceStateByPolygonId)
- polygon.GET("/updateDefenceStateByCameraId",polygonController.UpdateDefenceStateByCameraId)
+ polygon.GET("/updateDefenceStateByPolygonId", polygonController.UpdateDefenceStateByPolygonId)
+ polygon.GET("/updateDefenceStateByCameraId", polygonController.UpdateDefenceStateByCameraId)
}
// 浠诲姟绠＄悊
@@ -153,8 +153,8 @@
{
sdkApi.POST("/saveSdk", sdkController.Save)
sdkApi.GET("/findAllSdk", sdkController.FindAllSdk)
- sdkApi.GET("/findByTaskId",sdkController.FindByTaskId)
- sdkApi.GET("/getById",sdkController.GetById)
+ sdkApi.GET("/findByTaskId", sdkController.FindByTaskId)
+ sdkApi.GET("/getById", sdkController.GetById)
}
cameraTimeApi := r.Group(urlPrefix + "/cameraTimerule")
@@ -163,9 +163,9 @@
cameraTimeApi.GET("/delete", cameraTimeRuleController.Delete)
cameraTimeApi.GET("/findAll", cameraTimeRuleController.FindAll)
}
- dicApi :=r.Group(urlPrefix+"/dictionary")
+ dicApi := r.Group(urlPrefix + "/dictionary")
{
- dicApi.GET("/findByType",dicController.FindByType)
+ dicApi.GET("/findByType", dicController.FindByType)
}
// 鏂囦欢 涓婁紶
--
Gitblit v1.8.0