From 5d17d528ded3c828f7f79ae57ec72429de6dd1c9 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期三, 13 十一月 2019 16:56:37 +0800
Subject: [PATCH] 去掉link
---
.out.swp | 0
insertdata/insertDataToEs.go | 95 ++++++++++++------
out | 196 +++++++++++++++++++++++++++++++++++++++
3 files changed, 260 insertions(+), 31 deletions(-)
diff --git a/.out.swp b/.out.swp
new file mode 100644
index 0000000..dac2568
--- /dev/null
+++ b/.out.swp
Binary files differ
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 676f049..127929d 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -70,7 +70,42 @@
BaseInfo []*structure.BaseInfo `json:"baseInfo"`
TargetInfo []Target `json:"targetInfo"`
LinkTag string `json:"linkTag"`
- LinkTagInfo []*PerVideoPicture `json:"linkTagInfo"`
+ LinkTagInfo []*LinkInfo `json:"linkTagInfo"`
+}
+
+type LinkInfo struct {
+ Id string `json:"id"`
+ CameraId string `json:"cameraId"`
+ CameraAddr string `json:"cameraAddr"`
+ CameraName string `json:"cameraName"`
+ PicDate string `json:"picDate"`
+ PicMaxUrl string `json:"picMaxUrl"`
+ TaskId string `json:"taskId"`
+ TaskName string `json:"taskName"`
+ SdkName string `json:"sdkName"`
+ Content string `json:"content"`
+ AlarmRules []AlarmRule `json:"alarmRules"`
+ LikeDate string `json:"likeDate"`
+ Sex string `json:"sex"`
+ Age int32 `json:"age"`
+ AgeDescription string `json:"ageDescription"`
+ Race string `json:"race"`
+ SmileLevel int32 `json:"smileLevel"`
+ BeautyLevel int32 `json:"beautyLevel"`
+ FaceFeature string `json:"faceFeature"`
+ PicSmUrl []string `json:"picSmUrl"`
+ VideoUrl string `json:"videoUrl"`
+ AnalyServerId string `json:"analyServerId"`
+ AnalyServerName string `json:"analyServerName"`
+ AnalyServerIp string `json:"analyServerIp"`
+ ClusterId string `json:"clusterId"`
+ DetectScore float64 `json:"detectScore"`
+ IsAlarm int `json:"isAlarm"`
+ IsAckAlarm int `json:"isAckAlarm"`
+ IsCollect int `json:"isCollect"`
+ IsDelete int `json:"isDelete"`
+ BaseInfo []*structure.BaseInfo `json:"baseInfo"`
+ TargetInfo []Target `json:"targetInfo"`
}
type Target struct {
@@ -91,29 +126,29 @@
// yolo琛屼负鐨勬暟鎹粨鏋�
type Personaction struct {
- Id string `json:"id"`
- CameraId string `json:"cameraId"`
- CameraName string `json:"cameraName"`
- CameraAddr string `json:"cameraAddr"`
- TaskId string `json:"taskId"`
- TaskName string `json:"taskName"`
- SdkName string `json:"sdkName"`
- Content string `json:"content"`
- AlarmRules []AlarmRule `json:"alarmRules"`
- AnalyServerId string `json:"analyServerId"`
- AnalyServerName string `json:"analyServerName"`
- AnalyServerIp string `json:"analyServerIp"`
- ClusterId string `json:"clusterId"`
- PicSmUrl []string `json:"picSmUrl"`
- PicDate string `json:"picDate"`
- VideoUrl string `json:"videoUrl"`
- IsAlarm int `json:"isAlarm"`
- IsAckAlarm int `json:"isAckAlarm"`
- IsCollect int `json:"isCollect"`
- IsDelete int `json:"isDelete"`
- TargetInfo []Target `json:"targetInfo"`
- LinkTag string `json:"linkTag"`
- LinkTagInfo []*PerVideoPicture `json:"linkTagInfo"`
+ Id string `json:"id"`
+ CameraId string `json:"cameraId"`
+ CameraName string `json:"cameraName"`
+ CameraAddr string `json:"cameraAddr"`
+ TaskId string `json:"taskId"`
+ TaskName string `json:"taskName"`
+ SdkName string `json:"sdkName"`
+ Content string `json:"content"`
+ AlarmRules []AlarmRule `json:"alarmRules"`
+ AnalyServerId string `json:"analyServerId"`
+ AnalyServerName string `json:"analyServerName"`
+ AnalyServerIp string `json:"analyServerIp"`
+ ClusterId string `json:"clusterId"`
+ PicSmUrl []string `json:"picSmUrl"`
+ PicDate string `json:"picDate"`
+ VideoUrl string `json:"videoUrl"`
+ IsAlarm int `json:"isAlarm"`
+ IsAckAlarm int `json:"isAckAlarm"`
+ IsCollect int `json:"isCollect"`
+ IsDelete int `json:"isDelete"`
+ TargetInfo []Target `json:"targetInfo"`
+ LinkTag string `json:"linkTag"`
+ LinkTagInfo []*LinkInfo `json:"linkTagInfo"`
}
type AlarmRule struct {
@@ -237,7 +272,7 @@
face.Liker,
targetInfos,
"",
- []*PerVideoPicture{},
+ []*LinkInfo{},
}
requstbody, err := json.Marshal(pervideo)
@@ -376,7 +411,7 @@
}
}
- linkTagInfos := []*PerVideoPicture{}
+ linkTagInfos := []*LinkInfo{}
for _, yoloResult := range msg.RuleResult["yolo"].([]structure.Result) {
if (yoloResult.Others.TimeLabel == "01" || yoloResult.Others.TimeLabel == "10") && yoloResult.Others.LinkCache != nil && len(yoloResult.Others.LinkCache) > 1 {
for _, msg2 := range yoloResult.Others.LinkCache {
@@ -442,7 +477,7 @@
linkTagInfos,
}
requstbody, err := json.Marshal(peraction)
-
+ logger.Info("涓婁紶鍙傛暟json",requstbody)
if err != nil {
logger.Info("json parse error ", err)
return
@@ -547,7 +582,7 @@
return race
}
-func msg2PersonVideo(msg structure.ResultMsg) *PerVideoPicture {
+func msg2PersonVideo(msg structure.ResultMsg) *LinkInfo {
if msg.RuleResult["yolo"] != nil && len(msg.RuleResult["yolo"].([]structure.Result)) > 0 {
// 鍏堝垽鏂竴涓嬫暟鎹甫鐨勮鍒欐爣绛炬槸鍚︽湁鍙互鎻掑叆鐨�
flag := false
@@ -645,7 +680,7 @@
if resp["fileUrl"] != nil {
url = append(url, resp["fileUrl"].(string))
//esDataId := uuid.NewV4().String()
- pervideo := &PerVideoPicture{
+ pervideo := &LinkInfo{
msg.Push.PushId + "-" + uuid.NewV4().String(),
msg.Cid,
msg.Push.Cam.Addr,
@@ -678,8 +713,6 @@
0,
nil,
targetInfos,
- "",
- []*PerVideoPicture{},
}
return pervideo
} else {
diff --git a/out b/out
new file mode 100644
index 0000000..5fd58f2
--- /dev/null
+++ b/out
@@ -0,0 +1,196 @@
+efb0ddd HEAD@{0}: checkout: moving from changeEs to module
+fcbbfa6 HEAD@{1}: commit: linkTagInfo鐨勬敼鍔�
+e376703 HEAD@{2}: checkout: moving from module to changeEs
+efb0ddd HEAD@{3}: checkout: moving from changeEs to module
+e376703 HEAD@{4}: commit: 鎺ㄩ�乮d
+7e71b19 HEAD@{5}: commit: 鍧愭爣鏀逛负xy
+a76d32f HEAD@{6}: checkout: moving from module to changeEs
+efb0ddd HEAD@{7}: checkout: moving from changeEs to module
+a76d32f HEAD@{8}: checkout: moving from module to changeEs
+efb0ddd HEAD@{9}: checkout: moving from changeEs to module
+a76d32f HEAD@{10}: commit: ---
+466947c HEAD@{11}: commit: targetLocation
+77e4132 HEAD@{12}: commit: target
+cf33418 HEAD@{13}: commit: 鍒犻櫎islink
+10503dd HEAD@{14}: commit: 鍒犻櫎islink
+0b54349 HEAD@{15}: commit: 娣诲姞cameraName
+96085c7 HEAD@{16}: commit: 鐗瑰緛鍊肩疆绌�
+3b4dcff HEAD@{17}: commit: 鏀筫s鑱斿姩鎻掑叆
+efb0ddd HEAD@{18}: checkout: moving from module to changeEs
+efb0ddd HEAD@{19}: reset: moving to efb0ddd9490567bb7f26fc34261ba4ca7961b073
+33804d4 HEAD@{20}: commit: --鏆傚瓨
+7cb7884 HEAD@{21}: checkout: moving from master to module
+7d57c67 HEAD@{22}: checkout: moving from module to master
+7cb7884 HEAD@{23}: commit: 淇濆瓨涓�涓嬩釜浣撻潤姝㈢畻娉�
+573a1e0 HEAD@{24}: checkout: moving from master to module
+7d57c67 HEAD@{25}: checkout: moving from module to master
+573a1e0 HEAD@{26}: commit: 鎶婁竴閮ㄥ垎鍒ゆ柇鏀捐繘涓棿浠�
+efb0ddd HEAD@{27}: commit: 鎵撴垚so鐨勬枃浠跺繀椤绘槸main package
+dda8d9b HEAD@{28}: commit: fix鍚屼竴涓枃浠剁敓鎴愮殑so鏂囦欢涓嶈兘琚姞杞�
+bca5cdb HEAD@{29}: commit: ---
+fd059b6 HEAD@{30}: commit: ---
+e7d3f49 HEAD@{31}: commit: ---
+468bdd4 HEAD@{32}: checkout: moving from master to module
+7d57c67 HEAD@{33}: checkout: moving from module to master
+468bdd4 HEAD@{34}: checkout: moving from master to module
+7d57c67 HEAD@{35}: checkout: moving from module to master
+468bdd4 HEAD@{36}: pull origin module: Fast-forward
+9929197 HEAD@{37}: pull origin module: Fast-forward
+232cb3f HEAD@{38}: commit: ---
+dc97565 HEAD@{39}: commit: ---
+a079474 HEAD@{40}: commit: fix bug
+63dd77c HEAD@{41}: commit: 鍒犳帀22涓奷own涓嶄笅鏉ョ殑http绗笁鏂瑰寘
+b9631b6 HEAD@{42}: checkout: moving from master to module
+7d57c67 HEAD@{43}: commit: ---
+2e33ad7 HEAD@{44}: commit: ---
+52713b8 HEAD@{45}: commit: ---
+2b25766 HEAD@{46}: checkout: moving from module to master
+b9631b6 HEAD@{47}: commit: ---
+6e8ebf7 HEAD@{48}: commit (merge): merge master
+5ae97ee HEAD@{49}: commit (merge): merge module
+153d80d HEAD@{50}: checkout: moving from master to module
+2b25766 HEAD@{51}: commit: ---
+09a9fed HEAD@{52}: commit: 鍗曞崗绋�
+0e441dc HEAD@{53}: commit (merge): merge V1.0
+59dcc2b HEAD@{54}: merge v1.0: Fast-forward
+2ef24b7 HEAD@{55}: checkout: moving from v1.0 to master
+59dcc2b HEAD@{56}: commit: 鎸佺画鏃堕棿绗竴寮犵敾妗嗗畬鎴�
+bf0c61d HEAD@{57}: commit: ---
+d7c6faf HEAD@{58}: commit: ---
+76430be HEAD@{59}: commit: 缁欐寔缁椂闂寸涓�寮犳斁鍚庨棬锛岀粰浜嬩欢鎺ㄩ�佸姞杩囨护
+04318a8 HEAD@{60}: commit: ---
+faec9e9 HEAD@{61}: commit: ---
+23c837b HEAD@{62}: commit: git add .
+0bd35e1 HEAD@{63}: commit: 瀹氭椂鍣ㄥ皬鏀逛互鍙婃寔缁椂闂寸涓�寮犵敾妗�
+f758282 HEAD@{64}: commit: -
+5cb53f7 HEAD@{65}: commit: 鎺ㄩ�佽棰戝湴鍧�鏂版柟妗堬紙涓嶆帹閫侊級
+04ef7bb HEAD@{66}: commit: fix鏃犲叧鐩爣bug
+2c3aa09 HEAD@{67}: commit: 缁樺浘姣斾緥float int闂
+9eda6d5 HEAD@{68}: commit: ---
+2cbca7d HEAD@{69}: commit: 鍏抽棴澶歡o绋嬬湅鎶ヨ鐩爣闂
+a45e6bb HEAD@{70}: commit: 鏀惧紑浜嬩欢鎺ㄩ��
+993dc81 HEAD@{71}: commit: ---
+e2c0c83 HEAD@{72}: commit: 瀛榚s鏃跺瓨鍏ヨ棰戣矾寰�
+e85732b HEAD@{73}: commit: serverid鍜宻erver銆�
+103d44a HEAD@{74}: commit: 鍘绘帀go绋嬬湅cpu鍗犵敤
+614eb42 HEAD@{75}: commit: msg.Push鍒濆鍖�
+395893f HEAD@{76}: commit: ---
+600c898 HEAD@{77}: commit: ---
+d697681 HEAD@{78}: commit: ---
+665ee61 HEAD@{79}: commit: ---
+82b7184 HEAD@{80}: commit: ---
+def3181 HEAD@{81}: commit: ---
+d89b820 HEAD@{82}: commit: fix
+fd210f1 HEAD@{83}: commit: 琛ュ叏鎺ㄩ�佷俊鎭苟缁欏紶钂欏彂閫佸甫鏈夎棰戝湴鍧�鐨勪俊鍙�
+5a6639b HEAD@{84}: commit: 鍏抽棴鎺ㄩ�佺湅cpu鍗犵敤
+f661701 HEAD@{85}: commit: send鏁版嵁鐢ㄥ崗绋�
+516d949 HEAD@{86}: commit: send鏁版嵁鐢ㄥ崗绋�
+d9a447c HEAD@{87}: commit: 瀛樺叆es鍏堢敾灏忓浘锛屽啀鐢诲ぇ鍥�
+7460be0 HEAD@{88}: commit: ---
+e64bf1b HEAD@{89}: commit: ---
+78af430 HEAD@{90}: commit: ---
+a16a99b HEAD@{91}: commit: ---
+d540469 HEAD@{92}: commit: ---
+86813e4 HEAD@{93}: commit: ---
+da61291 HEAD@{94}: commit: ---
+77f8a55 HEAD@{95}: commit: ---
+dc4e05c HEAD@{96}: commit: 娴嬩簨浠舵帹閫佹墍鐢ㄦ椂闂�
+11082e2 HEAD@{97}: commit: 娴嬩簨浠舵帹閫佹墍鐢ㄤ簨浠�
+d0c5a63 HEAD@{98}: commit: 澶歡o绋嬩笉鎺ㄩ��
+039dc1f HEAD@{99}: commit: 鏁翠綋璧峰崗绋�
+7590528 HEAD@{100}: commit: 浜嬩欢鎺ㄩ�佸苟涓嶅彟璧峰崗绋�
+b8614ca HEAD@{101}: commit: 瑙ｅ喅浜嬩欢鎺ㄩ�佸唴瀛橀棶棰�
+6b12681 HEAD@{102}: commit: ---
+57d0e42 HEAD@{103}: commit: ---
+ffeb770 HEAD@{104}: commit: ---
+e3a4b2b HEAD@{105}: commit: ---
+42f1b1d HEAD@{106}: commit: ---
+c16cab7 HEAD@{107}: commit: ---
+e12ce16 HEAD@{108}: commit: ---
+bc12afe HEAD@{109}: commit: ---
+e43bff8 HEAD@{110}: commit: ---
+db16d63 HEAD@{111}: commit: ---
+e41df22 HEAD@{112}: commit: ---
+663f867 HEAD@{113}: commit: ---
+25e009c HEAD@{114}: commit: ---
+0d4a601 HEAD@{115}: commit: ---
+1382175 HEAD@{116}: commit: 浜嬩欢鎺ㄩ�佸姞go
+74f6cb6 HEAD@{117}: commit: ---
+619fed9 HEAD@{118}: commit: ---
+f11969d HEAD@{119}: commit: 鐢ㄧ粨鏋勪綋鏍囪chan
+e698260 HEAD@{120}: commit: 鎹竴涓猚han
+de5c02a HEAD@{121}: commit: ---
+0b252e8 HEAD@{122}: commit: ---
+5ee5cec HEAD@{123}: commit: ---
+b4add78 HEAD@{124}: commit: ---
+590ee0a HEAD@{125}: commit: 浜嬩欢鎺ㄩ�佷笉鐢ㄥ崗绋�
+7ada253 HEAD@{126}: commit: ---
+c115b3c HEAD@{127}: commit: ---
+a9c4717 HEAD@{128}: commit: ---
+5411f87 HEAD@{129}: commit: ---
+1453a12 HEAD@{130}: commit: ---
+04fd16b HEAD@{131}: commit: ---
+d6242c4 HEAD@{132}: commit: 璁剧疆鎺ㄩ�佺紦瀛�
+2171427 HEAD@{133}: commit: 浜轰綋杩借釜鐩稿悓鐨勬妸yolo鏍囩涔熷垹鎺�
+355284a HEAD@{134}: commit: 鎶婁汉浣撹拷韪粠es鏈�鍓嶆敼涓烘斁鍦ㄨ鍒欐渶鍚�
+4262cb8 HEAD@{135}: commit: 浜嬩欢鎺ㄩ�佸姞浜轰綋杩借釜
+6d77f4a HEAD@{136}: commit: 鍙捣114涓�涓猤rountine璇曡瘯
+a47f658 HEAD@{137}: commit: 鏀筩han瀹归噺
+b795858 HEAD@{138}: commit: 鎶婂叧闂璼ocket鏀惧湪澶栭潰
+d85a66b HEAD@{139}: commit: ---
+f98c1de HEAD@{140}: commit: 鎷间笂tcp锛屾剼锠㈢殑閿欒
+4e697bb HEAD@{141}: commit: 涓�涓猻ocket鎷ㄤ竴涓彿
+5394127 HEAD@{142}: commit: 涓�涓猻ocket鎷ㄤ竴涓彿
+a908d82 HEAD@{143}: commit: ---
+5b78a6d HEAD@{144}: commit: ---
+88e40c9 HEAD@{145}: commit: 淇浜嬩欢鎺ㄩ��
+f29ed4a HEAD@{146}: commit: 淇浜嬩欢鎺ㄩ��
+33a8935 HEAD@{147}: commit: 鍙栨秷鎺ㄩ�侊紝鐪嬬湅鍗犲唴瀛樺彂鐢熷湪浣曞
+6ae526a HEAD@{148}: commit: 鍏充簨浠舵帹閫佺湅鐪嬪唴瀛樺崰鐢�
+e3c3368 HEAD@{149}: commit: 淇敼涓�涓嬫帹閫佹垚鍔熸潯浠�
+f3aaa46 HEAD@{150}: commit: 淇敼涓�涓嬫帹閫佹垚鍔熸潯浠�
+a2f3b20 HEAD@{151}: commit: 寮�鍚簨浠舵帹閫�
+c79d961 HEAD@{152}: commit: 缁樺浘姣斾緥浣跨敤float64鑰屼笉鏄痠nt32
+5312ebf HEAD@{153}: commit: 鐢╟ontain鏂规硶閫氳繃鍒ゆ柇骞朵慨姝ｇ粯鍥炬瘮渚�
+b3ef9bc HEAD@{154}: commit: ---
+74597a0 HEAD@{155}: commit: ---
+58a1be1 HEAD@{156}: commit: ---
+90757df HEAD@{157}: commit: ---
+f8d0f89 HEAD@{158}: commit: ---
+bf455c0 HEAD@{159}: commit: ---
+b767829 HEAD@{160}: commit: fix鐢诲尯鍩焍ug
+867be31 HEAD@{161}: commit: 鍏抽棴浜嬩欢鎺ㄩ�佸拰鏇存柊渚濊禆
+a905891 HEAD@{162}: commit: 鍘绘帀鎺ㄩ�佷腑鐨勫け璐ュ嵆閫�鍑�
+79c8a58 HEAD@{163}: commit: 缁欎簨浠舵帹閫佽缃搷搴旇秴鏃�
+3e569f7 HEAD@{164}: commit: ---
+13fa092 HEAD@{165}: commit: 鎶妋angos鍖呯殑瀹归噺浠�5鍏嗘墿澶т负30鍏�
+98a3e64 HEAD@{166}: commit: 鏃堕棿鑼冨洿鐨剅eturn鏀逛负continue
+f36485a HEAD@{167}: commit: 浜嬩欢鎺ㄩ�佹ā鍧楀効鍔犲紓甯稿鐞�
+5c5433c HEAD@{168}: commit: 鍦板潃鍓嶆嫾涓�涓猼cp
+92addfb HEAD@{169}: commit: 鎺ㄩ�佸湴鍧�鏀逛负娲荤殑
+8287d15 HEAD@{170}: commit: 鎵撳紑浜嬩欢鎺ㄩ��
+2ef24b7 HEAD@{171}: checkout: moving from master to v1.0
+2ef24b7 HEAD@{172}: reset: moving to 2ef24b7363fb0b79236de9ac2fea43d9edb6a312
+6e707d6 HEAD@{173}: commit: 鍑忓皯鏃ュ織閲忓鍔犳斁寮�鏍囩杩囨护鍣�
+c165dbb HEAD@{174}: commit: 鍑忓皯鏃ュ織閲忓鍔犳斁寮�鏍囩杩囨护鍣�
+a63f2fb HEAD@{175}: commit: 鍒囧洖鍗曞崗绋嬫祴璇曟棩蹇�
+9fc8aaf HEAD@{176}: commit: 鏀归�犳棩蹇楃殑杈撳嚭鏂瑰紡
+0307004 HEAD@{177}: commit: fix涓嶇敾鍖哄煙鐨刡ug
+f2035d0 HEAD@{178}: commit: 鍔犱竴琛岀┖鏍兼祴璇昰oland ctrl+k
+cf6237c HEAD@{179}: commit: 瀵逛汉鑴歌拷韪姞閿�
+ece6aac HEAD@{180}: commit: 鍚姩澶氫釜groutine澶勭悊绋嬪簭
+2ef24b7 HEAD@{181}: commit: ---
+0fce9e0 HEAD@{182}: commit: ---
+a6fa76d HEAD@{183}: commit: 瑁呴厤yolo鐨刬d
+688d42b HEAD@{184}: commit: ---
+821c4ff HEAD@{185}: commit: ---
+df85614 HEAD@{186}: commit: ---
+b9aa64b HEAD@{187}: commit: 浜轰綋娣诲姞鐩爣淇℃伅瀛楁
+f33d5c9 HEAD@{188}: commit: ---
+f490b28 HEAD@{189}: commit: 浜鸿劯鍔犵洰鏍囦俊鎭�
+ed6ad87 HEAD@{190}: commit: sdkNames閫楀彿鏀规垚绌烘牸
+756e00d HEAD@{191}: commit: 鎶婄粨鏋勪綋鎻愬嚭鏉ュ崟鐙ā鍧楀効
+65deac4 HEAD@{192}: commit: 鎶婄粨鏋勪綋鎻愬嚭鏉ュ崟鐙ā鍧楀効
+453c4ec HEAD@{193}: commit: 鎶婄粨鏋勪綋鎻愬嚭鏉ュ崟鐙ā鍧楀効
+49eaf6f HEAD@{194}: commit: 鎶婄粨鏋勪綋鎻愬嚭鏉ュ崟鐙ā鍧楀効
+f08948b HEAD@{195}: clone: from https://panlei@192.168.1.14/r/ruleprocess.git
--
Gitblit v1.8.0