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 ++++++++-------
1 files changed, 8 insertions(+), 7 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,
--
Gitblit v1.8.0