From 0171974ae2486424e8fb838913818d821744d454 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期三, 20 十一月 2019 18:03:58 +0800
Subject: [PATCH] fix
---
controllers/fileController.go | 15 ++++++++-------
go.sum | 8 ++++----
go.mod | 4 ++--
3 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/controllers/fileController.go b/controllers/fileController.go
index e31f95c..e53e842 100644
--- a/controllers/fileController.go
+++ b/controllers/fileController.go
@@ -190,8 +190,7 @@
PicDate string `json:"picDate"`
Content string `json:"content"`
IsAlarm bool `json:"isAlarm"`
- PicMaxUrl string `json:"picMaxUrl"`
- PicSmUrl []string `json:"picSmUrl"`
+ PicMaxUrl []string `json:"picMaxUrl"`
TargetInfo []TargetInfo `json:"targetInfo"`
TaskId string `json:"taskId"`
TaskName string `json:"taskName"`
@@ -215,15 +214,16 @@
}
type DbPersonVo struct {
+ TableId string `json:"tableId"`
+ TableName string `json:"tableName"`
BwType string `json:"bwType"`
CompareScore float64 `json:"compareScore"`
- MonitorLevel string `json:"monitorLevel"`
TargetId string `json:"targetId"`
TargetName string `json:"targetName"`
TargetPicUrl string `json:"targetPicUrl"`
+ MonitorLevel string `json:"monitorLevel"`
Labels string `json:"labels"`
- TableId string `json:"tableId"`
- TableName string `json:"tableName"`
+ Content string `json:"content"`
Enable int32 `json:"enable"`
}
@@ -282,8 +282,9 @@
MonitorLevel: p.MonitorLevel,
TargetName: p.PersonName,
TargetPicUrl: p.PersonPicUrl,
- Labels: p.Sex+" / "+p.IdCard+" / "+p.IdCard,
+ Labels: p.PhoneNum+"/"+p.Sex+"/"+p.IdCard,
TableId: p.TableId,
+ Content: p.Reserved,
Enable: p.Enable,
}
dbTableInfos, _ := dtApi.DbtablesById([]string{ p.TableId })
@@ -312,7 +313,7 @@
bi = append(bi, DbPersonVo{
TargetId: p.TargetId,
CompareScore: util.ParseScore64(p.CompareScore),
- MonitorLevel: parseMonitorLevel(p.MonitorLevel),
+ MonitorLevel: p.MonitorLevel,
TargetName: p.TargetName,
TargetPicUrl: p.TargetPicUrl,
Labels: p.Labels,
diff --git a/go.mod b/go.mod
index 0ec518d..35cd556 100644
--- a/go.mod
+++ b/go.mod
@@ -7,8 +7,8 @@
basic.com/fileServer/WeedFSClient.git v0.0.0-20190919054037-0182b6c3f5cb // indirect
basic.com/gb28181api.git v0.0.0-20191028082253-472438a8407b // indirect
basic.com/pubsub/cache.git v0.0.0-20190718093725-6a413e1d7d48 // indirect
- basic.com/pubsub/esutil.git v0.0.0-20191119123930-df4e05af6aee // indirect
- basic.com/pubsub/protomsg.git v0.0.0-20191120085128-f0a55188a489 // indirect
+ basic.com/pubsub/esutil.git v0.0.0-20191120100308-f439e0d7b223 // indirect
+ basic.com/pubsub/protomsg.git v0.0.0-20191120095202-204647709a0a // indirect
basic.com/valib/capture.git v0.0.0-20190924061718-7e98d8c98b3c // indirect
basic.com/valib/deliver.git v0.0.0-20190531095353-25d8c3b20051
basic.com/valib/goffmpeg.git v0.0.0-20191024085028-080acae08ec8 // indirect
diff --git a/go.sum b/go.sum
index 31e306e..aa3909d 100644
--- a/go.sum
+++ b/go.sum
@@ -6,10 +6,10 @@
basic.com/gb28181api.git v0.0.0-20191028082253-472438a8407b/go.mod h1:iKnzuRRqUEgt17894pX3oYcOG2fLYFVcXiZbPoMK7+4=
basic.com/pubsub/cache.git v0.0.0-20190718093725-6a413e1d7d48 h1:BBA30Rgljn6MRieC4gUncETJDyna3ObyubTo9HEQ2M0=
basic.com/pubsub/cache.git v0.0.0-20190718093725-6a413e1d7d48/go.mod h1:gHLJZz2ee1cGL0X0ae69fs56bAxkDgEQwDhhXZJNUcY=
-basic.com/pubsub/esutil.git v0.0.0-20191119123930-df4e05af6aee h1:QJQ2Hvu310iz39WZEkFiJ1SUg8XXZZ2b4goncos++0s=
-basic.com/pubsub/esutil.git v0.0.0-20191119123930-df4e05af6aee/go.mod h1:yIvppFPFGC61DOdm71ujnsxZBMFUu2yKjr5O43bMWCw=
-basic.com/pubsub/protomsg.git v0.0.0-20191120085128-f0a55188a489 h1:dv7cAPunUZ2yn8GG/hu+31kzq1BtDJ60PyfyNtz+Rtc=
-basic.com/pubsub/protomsg.git v0.0.0-20191120085128-f0a55188a489/go.mod h1:un5NV5VWQoblVLZfx1Rt5vyLgwR0jI92d3VJhfrJhWU=
+basic.com/pubsub/esutil.git v0.0.0-20191120100308-f439e0d7b223 h1:byt5XlReiVaVICVpw/bwh/w7VISajaV13UVuIsga2yw=
+basic.com/pubsub/esutil.git v0.0.0-20191120100308-f439e0d7b223/go.mod h1:yIvppFPFGC61DOdm71ujnsxZBMFUu2yKjr5O43bMWCw=
+basic.com/pubsub/protomsg.git v0.0.0-20191120095202-204647709a0a h1:FL7Xt9v6zuu6gRKBxY8j0yWftKX+npe9sYS1LqLj03U=
+basic.com/pubsub/protomsg.git v0.0.0-20191120095202-204647709a0a/go.mod h1:un5NV5VWQoblVLZfx1Rt5vyLgwR0jI92d3VJhfrJhWU=
basic.com/valib/capture.git v0.0.0-20190924061718-7e98d8c98b3c h1:aNujtcGxq0cNLSK08cCamAiUYiQ2/ZsUMNXbX2w8Clc=
basic.com/valib/capture.git v0.0.0-20190924061718-7e98d8c98b3c/go.mod h1:y+h7VUnoSQ3jOtf2K3twXNA8fYDfyUsifSswcyKLgNw=
basic.com/valib/deliver.git v0.0.0-20190531095353-25d8c3b20051/go.mod h1:bkYiTUGzckyNOjAgn9rB/DOjFzwoSHJlruuWQ6hu6IY=
--
Gitblit v1.8.0