From 033f6617f74471a8178c4375f2034504ba3de421 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期三, 03 七月 2019 14:37:11 +0800
Subject: [PATCH] 一些string变为int
---
insertdata/insertDataToEs.go | 40 ++++++++++++++++++++--------------------
ruleserver/ruleToformula.go | 10 +++++-----
2 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 15aa12f..d50c5c3 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -43,9 +43,9 @@
AnalyServerName string `json:"analyServerName"`
AnalyServerIp string `json:"analyServerIp"`
ClusterId string `json:"clusterId"`
- IsAlarm string `json:"isAlarm"`
- IsAckAlarm string `json:"isAckAlarm"`
- IsCollect string `json:"isCollect"`
+ IsAlarm int `json:"isAlarm"`
+ IsAckAlarm int `json:"isAckAlarm"`
+ IsCollect int `json:"isCollect"`
IsDelete int `json:"isDelete"`
BaseInfo []Base `json:"baseInfo"`
}
@@ -82,9 +82,9 @@
PicSmUrl []string `json:"picSmUrl"`
PicDate string `json:"picDate"`
VideoUrl string `json:"videoUrl"`
- IsAlarm string `json:"isAlarm"`
- IsAckAlarm string `json:"isAckAlarm"`
- IsCollect string `json:"isCollect"`
+ IsAlarm int `json:"isAlarm"`
+ IsAckAlarm int `json:"isAckAlarm"`
+ IsCollect int `json:"isCollect"`
IsDelete int `json:"isDelete"`
}
@@ -131,7 +131,7 @@
}
i := protomsg.Image{}
err = proto.Unmarshal(bdata, &i)
- log.Println("-------------------------------------------鐪嬩笅瀹藉拰楂�",i.Width,i.Height)
+ log.Println("-------------------------------------------鐪嬩笅瀹藉拰楂�", i.Width, i.Height)
bytes := util.SubImg(i, int(face.Location.X), int(face.Location.Y), int(face.Location.X+face.Location.Width), int(face.Location.Y+face.Location.Height))
resp, err := util.PostFormBufferData1(weedfsUrl, bytes, uuid.NewV4().String())
if err != nil {
@@ -170,9 +170,9 @@
localConfig.ServerName,
serverIp,
"",
- "",
- "",
- "",
+ 1,
+ 0,
+ 0,
0,
[]Base{},
}
@@ -199,10 +199,10 @@
alarm := ChangeToString(yoloResult.AlarmLevel)
alarmRules = append(alarmRules, AlarmRule{yoloResult.RuleGroupId, alarm, yoloResult.RuleText})
}
- isAlarm := ""
+ isAlarm := 0
resp := make(map[string]interface{})
if len(alarmRules) > 0 {
- isAlarm = "1"
+ isAlarm = 1
// 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
bdata, err := util.UnCompress(msg.Data)
if err != nil {
@@ -218,7 +218,7 @@
log.Println("宸叉姤璀﹀苟涓婁紶鏀瑰抚鍥剧墖鍒版湇鍔″櫒")
}
} else {
- isAlarm = "0"
+ isAlarm = 0
// 涓嶆槸鎶ヨ鏁版嵁涓嶅瓨
return
}
@@ -252,8 +252,8 @@
time.Now().Format("2006-01-02 15:04:05"),
"",
isAlarm,
- "",
- "",
+ 0,
+ 0,
0,
}
requstbody, err := json.Marshal(peraction)
@@ -267,7 +267,7 @@
if err != nil {
log.Println("寰�ES鎻掑叆鏁版嵁澶辫触", err)
} else {
- log.Println("__________________________________________寰�ES鎻掑叆鏁版嵁yolo鎴愬姛")
+ log.Println("__________________________________________寰�ES鎻掑叆yolo鏁版嵁鎴愬姛")
}
}
}
@@ -322,7 +322,7 @@
}
//鑾峰彇骞撮緞鎻忚堪
-func getDescription (age int32) string{
+func getDescription(age int32) string {
ageInfo := "闈掑勾"
if age > 0 && age < 7 {
ageInfo = "绔ュ勾"
@@ -338,14 +338,14 @@
return ageInfo
}
-func getRaceString (i int32) string{
+func getRaceString(i int32) string {
race := ""
if i == 1 {
race = "鐧戒汉"
- } else if i == 2{
+ } else if i == 2 {
race = "榛勪汉"
} else {
race = "榛戜汉"
}
return race
-}
\ No newline at end of file
+}
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index cb8295b..22c11a4 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -215,7 +215,7 @@
if len(temp) > 0 {
if ruleList[i].SetType == "linkTask" {
// groupId涓惈鏈塴ink鍒欎负鑱斿姩浠诲姟
- linkTask(args, ruleList[i], taskId)
+ LinkTask(args, ruleList[i], taskId)
} else {
// 鐙珛浠诲姟鐨勫鐞�
RunRule(args, ruleList[i], taskId)
@@ -233,7 +233,7 @@
}
}()
- log.Println("+++++++++++瑙勫垯寮�濮嬭繍琛�+++++++++++++++++褰撳墠瑙勫垯--锛�",*groupRule)
+ log.Println("+++++++++++瑙勫垯寮�濮嬭繍琛�+++++++++++++++++褰撳墠瑙勫垯--锛�",(*groupRule).GroupText)
resultSplice := []*LittleRuleResult{}
// 鍏堣繃瀹屾潯浠惰鍒�
for j := 0; j < len(groupRule.Rules); j++ {
@@ -333,7 +333,7 @@
}
}
if flag {
- fmt.Println("----------------------------缁堜簬璧板畬涓囬噷闀垮緛")
+ fmt.Println("___________________________________________________________________________缁堜簬璧板畬涓囬噷闀垮緛")
// 濡傛灉鎴愬姛浜嗘垜搴旇鎵惧埌瑙勫垯涓秹鍙婂埌鐨剆dk锛岃褰曚笅浠栦滑鐨剆dkname
sdkName := ""
for j := 0; j < len(groupRule.Rules); j++ {
@@ -445,7 +445,7 @@
}
// 鑱斿姩浠诲姟鐨勫鐞�
-func linkTask(args *SdkDatas, groupRule *protomsg.GroupRule, taskId string) {
+func LinkTask(args *SdkDatas, groupRule *protomsg.GroupRule, taskId string) {
// new涓�涓畾鏃跺櫒锛屽鏋滀互姝roupId涓烘爣蹇楃殑瀹氭椂鍣ㄤ笉瀛樺湪鐨勮瘽
var flag bool = true
var timeEle = TimeElement{N: 3, InitN: 3, GroupId: groupRule.GroupId}
@@ -459,7 +459,7 @@
timeEle := TimeElement{N: 3, InitN: 3, GroupId: groupRule.GroupId} // 鎵旇繘鍘讳竴涓畾鏃跺櫒鍏冪礌
//TimeEleList = make(map[string]timeElement)
TimeEleList[groupRule.GroupId] = &timeEle // 瀹氭椂鍣ㄥ厓绱犱互瑙勫垯缁刬d涓洪敭
- fmt.Println("鍒涘缓浜嗚鏁板櫒骞朵笖璁℃暟鍣ㄩ泦鍚堜负锛�", TimeEleList)
+ fmt.Println("---------------------------------------------鑱斿姩浠诲姟鍒涘缓浜嗚鏁板櫒骞朵笖璁℃暟鍣ㄩ泦鍚堜负锛�", TimeEleList)
// 寰楀嚭杩欑粍瀹屾暣瑙勫垯閲屾秹鍙婂埌鍑犱釜鎽勫儚鏈猴紝鍐冲畾鐫�鏁扮粍閲屾湁鍑犱釜缁撴瀯浣�,鍘婚噸娣诲姞鏂瑰紡
for j := 0; j < len(groupRule.Rules); j++ {
var flag1 bool = true
--
Gitblit v1.8.0