From 9303b69ea569bcb5e581147543a3fd58e90d0d25 Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期四, 20 八月 2020 20:05:23 +0800
Subject: [PATCH] add get buckets contrl
---
controllers/dbtableperson.go | 78 +++++++++++++++++++++++++++++---------
1 files changed, 59 insertions(+), 19 deletions(-)
diff --git a/controllers/dbtableperson.go b/controllers/dbtableperson.go
index dbc6149..c0ed8ac 100644
--- a/controllers/dbtableperson.go
+++ b/controllers/dbtableperson.go
@@ -14,7 +14,6 @@
"webserver/service"
"github.com/gin-gonic/gin"
- "github.com/satori/go.uuid"
"webserver/extend/code"
"webserver/extend/config"
"webserver/extend/util"
@@ -48,26 +47,58 @@
paramBody := util.Struct2Map(dbperson)
b, data := pApi.AddDbPerson(paramBody)
if b {
- util.ResponseFormat(c, code.Success, data)
+ util.ResponseFormat(c, code.AddSuccess, data)
} else {
- util.ResponseFormat(c, code.ServiceInsideError, "")
+ util.ResponseFormat(c, code.ComError, "")
+ }
+}
+
+
+type MultiCarNo struct {
+ TableId string `json:"tableId" binding:"required"`
+ CarNos []string `json:"carNos" binding:"required"`
+}
+
+// @Security ApiKeyAuth
+// @Summary 鎵归噺娣诲姞搴曞簱杞﹁締
+// @Description 鎵归噺娣诲姞搴曞簱杞﹁締
+// @Accept json
+// @Produce json
+// @Tags dbperson 搴曞簱浜哄憳
+// @Param reqBody body controllers.MultiCarNo true "鎵归噺杞︾墝鍙�"
+// @Success 200 {string} json "{"code":200, msg:"", success:true}"
+// @Failure 500 {string} json "{"code":500, msg:"", success:false}"
+// @Router /data/api-v/dbperson/multiUploadCarNo [post]
+func (dbc DbPersonController) MultiUploadCarNo(c *gin.Context) {
+ var reqBody MultiCarNo
+ err := c.BindJSON(&reqBody)
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "")
+ return
+ }
+ logger.Debug("multiUploadCarNo reqBody:", reqBody)
+ var pApi dbapi.DbPersonApi
+ paramBody := util.Struct2Map(reqBody)
+ if pApi.MultiUploadCarNo(paramBody) {
+ util.ResponseFormat(c,code.UploadSuccess,"涓婁紶鎴愬姛")
+ } else {
+ util.ResponseFormat(c,code.ComError,"")
}
}
func addDbPerson(dbperson *models.Dbtablepersons) (result map[string]interface{}) {
- personId := uuid.NewV4().String()
- dbperson.Id = personId
dbperson.PriInsert()
var pApi dbapi.DbPersonApi
paramBody := util.Struct2Map(dbperson)
- b, _ := pApi.AddDbPerson(paramBody)
+ b, d := pApi.AddDbPerson(paramBody)
result = map[string]interface{}{}
if b {
result["code"] = 200
+ personMap := util.Struct2Map(d)
data := make(map[string]interface{})
- data["uuid"] = personId
+ data["uuid"] = personMap["id"]
result["data"] = data
result["success"] = true
result["msg"] = "娣诲姞鎴愬姛"
@@ -102,9 +133,9 @@
paramBody := util.Struct2Map(dbperson)
b, data := pApi.UpdateDbPerson(paramBody)
if b {
- util.ResponseFormat(c, code.Success, data)
+ util.ResponseFormat(c, code.UpdateSuccess, data)
} else {
- util.ResponseFormat(c, code.ServiceInsideError, "")
+ util.ResponseFormat(c, code.UpdateFail, "")
}
}
@@ -295,10 +326,10 @@
logger.Debug("localConfig is wrong!!!")
return
}
- var weedfsUri = "http://"+localConf.WebPicIp+":"+strconv.Itoa(int(localConf.WebPicPort))+"/submit"
+ var weedfsUri = "http://"+localConf.WebPicIp+":"+strconv.Itoa(int(localConf.WebPicPort))+"/submit?collection=persistent"
//鏍规嵁浜鸿劯鍧愭爣鎵ｅ嚭浜鸿劯灏忓浘
t1 := time.Now()
- cutFaceImgData := util.SubImg(*pI, int(rcFace.Left), int(rcFace.Top), int(rcFace.Right), int(rcFace.Bottom))
+ cutFaceImgData,_ := util.SubCutImg(pI, rcFace, 20)
logger.Debug("SubImg鐢ㄦ椂锛�", time.Since(t1))
t1 = time.Now()
weedFilePath, e := WeedFSClient.UploadFile(weedfsUri, filename, cutFaceImgData)
@@ -485,15 +516,24 @@
feature = fea
}
if personPicUrl != "" && feature != "" {
- var dbpApi dbapi.DbPersonApi
- b,d := dbpApi.JoinDbTable(reqBody.TableIds, feature, personPicUrl)
- if b {
- util.ResponseFormat(c,code.Success,d)
- return
- } else {
- util.ResponseFormat(c,code.ComError,"鍔犲叆澶辫触")
- return
+ //灏嗚繖寮犳姄鎷嶇殑鐓х墖涓嬭浇涓嬫潵涓婁紶鍒癱ollection=persistent鐨勯泦鍚堜腑锛岄槻姝㈣娓呯悊鎺�
+ picB, e3 := util.DownLoad("http://" + personPicUrl)
+ if e3 == nil {
+ var weedfsUri = "http://"+localConf.WebPicIp+":"+strconv.Itoa(int(localConf.WebPicPort))+"/submit?collection=persistent"
+ newPersonPicUrl, e4 := WeedFSClient.UploadFile(weedfsUri, "capturePerson", picB)
+ if e4 == nil {
+ var dbpApi dbapi.DbPersonApi
+ b,d := dbpApi.JoinDbTable(reqBody.TableIds, feature, newPersonPicUrl)
+ if b {
+ util.ResponseFormat(c,code.Success,d)
+ return
+ } else {
+ util.ResponseFormat(c,code.ComError,"鍔犲叆澶辫触")
+ return
+ }
+ }
}
+
}
}
util.ResponseFormat(c,code.ComError,"鍔犲叆澶辫触")
--
Gitblit v1.8.0