From 4dbe25d1cd7f25cc5562db2ca393437cae1a9a8a Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期五, 26 七月 2019 15:28:05 +0800
Subject: [PATCH] ---
---
controllers/fileController.go | 4 +++-
extend/code/code.go | 3 ++-
controllers/esSearch.go | 17 +++++++++--------
controllers/initForData.go | 5 +++--
4 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/controllers/esSearch.go b/controllers/esSearch.go
index de469c5..4e23425 100644
--- a/controllers/esSearch.go
+++ b/controllers/esSearch.go
@@ -5,6 +5,7 @@
"fmt"
"strconv"
"strings"
+ "webserver/extend/logger"
"github.com/gin-gonic/gin"
"webserver/extend/code"
@@ -37,19 +38,19 @@
d := dbapi.DicApi{}
res,data := d.FindByType("ALARMLEVEL")
if data == nil {
- fmt.Println("data is nil")
+ logger.Debug("data is nil")
}
- fmt.Println(res)
- // fmt.Println(data)
+ logger.Debug(res)
+ // logger.Debug(data)
alarmLevel := make(map[int]string)
tmp := data.(map[string]interface{})
for _,value := range tmp["ALARMLEVEL"].([]interface{}) {
- // fmt.Println(value.(map[string]interface{})["value"]," ",value.(map[string]interface{})["name"])
+ // logger.Debug(value.(map[string]interface{})["value"]," ",value.(map[string]interface{})["name"])
val := value.(map[string]interface{})["value"].(string)
name := value.(map[string]interface{})["name"].(string)
vl,err := strconv.Atoi(val)
if err != nil {
- fmt.Println(err)
+ logger.Debug(err)
}
alarmLevel[vl] = name
}
@@ -144,7 +145,7 @@
"\"sort\":[{\"_score\":{\"order\":\"desc\"}},{\"picDate\":{\"order\":\"desc\"}}]," +
"\"_source\":[\"baseInfo\",\"alarmRules\",\"sex\",\"analyServerName\",\"sdkName\",\"ageDescription\",\"content\",\"id\",\"cameraAddr\",\"picMaxUrl\",\"picDate\",\"race\",\"videoUrl\",\"picSmUrl\",\"taskName\",\"personIsHub\",\"isAlarm\",\"analyServerIp\",\"cameraId\"]" +
"}"
- fmt.Println(prama)
+ logger.Debug(prama)
//鏁版嵁瑙ｆ瀽
tokenRes := esutil.GetEsDataReq(url, prama, true)
return tokenRes
@@ -165,7 +166,7 @@
tokenRes := esutil.GetEsDataReq(url, prama, true)
personRes := make(map[string]string)
- //fmt.Println(tokenRes["datalist"].([]interface{}))
+ //logger.Debug(tokenRes["datalist"].([]interface{}))
result := tokenRes["datalist"].([]interface{})
for _, value := range result {
userMap := value.(map[string]interface{})
@@ -187,7 +188,7 @@
// personRes["phoneNum"] = value.(map[string]interface{})["phoneNum"].(string)
// personRes["sex"] = value.(map[string]interface{})["sex"].(string)
}
- //fmt.Println(personRes)
+ //logger.Debug(personRes)
if len(personRes) < 1 {
personRes["personName"] = ""
personRes["phoneNum"] = ""
diff --git a/controllers/fileController.go b/controllers/fileController.go
index dae760c..394aebf 100644
--- a/controllers/fileController.go
+++ b/controllers/fileController.go
@@ -314,6 +314,7 @@
resultList = append(resultList,cr)
}
}
+
logger.Debug("resultList:",resultList)
}
util.ResponseFormat(c,code.Success,resultList)
@@ -407,6 +408,7 @@
dbperson.PersonPicUrl = field // 鍥剧墖璺粡
dbperson.TableId = tableId //
dbperson.PersonName = fileNameOnly // 鍥剧墖鍚�
+ dbperson.Enable = 1 //榛樿鏈夋晥
// 婕旂ずbase64缂栫爜
dbperson.FaceFeature = faceBase64 // 鐗瑰緛鍊糱ase64 鐮�
@@ -487,7 +489,7 @@
//addResult["detail"] = details
//fields := fdfsclient.UploadFileByBuffer100(bytess, extNames) // fastdfs 涓婁紶
if len(successList)>0 {
- util.ResponseFormat(c, code.Success, addResult)
+ util.ResponseFormat(c, code.DbPersonUploadSuccess, addResult)
} else {
util.ResponseFormat(c, code.ServiceInsideError, err.Error())
}
diff --git a/controllers/initForData.go b/controllers/initForData.go
index 2dbeb26..10c06a7 100644
--- a/controllers/initForData.go
+++ b/controllers/initForData.go
@@ -8,6 +8,7 @@
"webserver/extend/code"
"webserver/extend/config"
"webserver/extend/esutil"
+ "webserver/extend/logger"
"webserver/extend/util"
)
@@ -38,7 +39,7 @@
"]}},\"size\":\"20\",\"sort\":[{\"picDate\":{\"order\":\"desc\"}}]," +
"\"_source\":[\"baseInfo\",\"alarmRules\",\"sex\",\"analyServerName\",\"sdkName\",\"ageDescription\",\"content\",\"id\",\"cameraAddr\",\"picMaxUrl\",\"picDate\",\"race\",\"videoUrl\",\"picSmUrl\",\"taskName\",\"isAlarm\",\"isAlarm\",\"analyServerIp\",\"cameraId\"]" +
"}"
- fmt.Println(prama)
+ logger.Debug("InitForCaptureData:", prama)
tokenRes := esutil.GetEsDataReq(url, prama, true)
util.ResponseFormat(c, code.Success, tokenRes)
}
@@ -86,7 +87,7 @@
"\"sort\":[{\"picDate\":{\"order\":\"desc\"}}]," +
"\"size\":\"20\"," +
"\"_source\":[\"baseInfo\",\"alarmRules\",\"sex\",\"analyServerName\",\"sdkName\",\"ageDescription\",\"content\",\"id\",\"cameraAddr\",\"picMaxUrl\",\"picDate\",\"race\",\"videoUrl\",\"picSmUrl\",\"taskName\",\"personIsHub\",\"isAlarm\",\"analyServerIp\",\"cameraId\"]}"
- fmt.Println(prama)
+ logger.Debug("InitForMonitoringData:", prama)
tokenRes := esutil.GetEsDataReq(url, prama, true)
util.ResponseFormat(c, code.Success, tokenRes)
}
\ No newline at end of file
diff --git a/extend/code/code.go b/extend/code/code.go
index 58628aa..943a100 100644
--- a/extend/code/code.go
+++ b/extend/code/code.go
@@ -48,6 +48,7 @@
HasChildNodeError = &Code{http.StatusInternalServerError, false, "鏁版嵁鑺傜偣瀛樺湪瀛愯妭鐐� 鏃犳硶鍒犻櫎"}
NotLogin = &Code{ http.StatusUnauthorized, false, "鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍"}
-
+ DbPersonUploadSuccess = &Code{ http.StatusOK, true, "浜哄憳涓婁紶鎴愬姛"}
+ DbPersonUpdateSuccess = &Code{ http.StatusOK, true, "浜哄憳鏇存柊鎴愬姛"}
ComError = &Code{http.StatusInternalServerError, false, ""}
)
--
Gitblit v1.8.0