Merge remote-tracking branch 'origin/master'

model/levelMonitor/image_record.go

@@ -15,7 +15,23 @@ type ImageRecord struct {
 	CreateTime  typeManage.LocalTime `json:"create_time"`
 	UpdateTime  typeManage.LocalTime `json:"update_time"`
 	UseNum      int                  `json:"use_num"`  //账号登录成功次数
-	Identify    int                  `json:"identify"` //图片识别的内容
+	Identify    float64              `json:"identify"` //图片识别的内容
+}
+
+type ImageRecordResponse struct {
+	Id          int                  `json:"id"`
+	TaskId      int                  `json:"task_id"` //任务id
+	User        string               `json:"user"`
+	TaskName    string               `json:"task_name"`
+	Account     string               `json:"account"`      //账号
+	ImageBase64 string               `json:"image_base64"` //图片base64文本
+	Status      int                  `json:"status"`       //识别状态, 成功为1， 失败-1， 默认为2未识别
+	Result      string               `json:"result"`       //识别结果
+	CreateDate  string               `json:"create_date"`  //创建日期
+	CreateTime  typeManage.LocalTime `json:"create_time"`
+	UpdateTime  typeManage.LocalTime `json:"update_time"`
+	UseNum      int                  `json:"use_num"`  //账号登录成功次数
+	Identify    float64              `json:"identify"` //图片识别的内容
 }
 
 func (ImageRecord) TableName() string {
@@ -59,9 +75,9 @@ type ImageRecordStatistics struct {
 
 type ImageRecordStatisticsResponse struct {
 	Id          int     `json:"id"`
-	TaskId      int     `json:"task_id"` //任务id
-	User        string  `json:"user"`	//负责人
-	TaskName    string  `json:"task_name"`	//任务名称
+	TaskId      int     `json:"task_id"`     //任务id
+	User        string  `json:"user"`        //负责人
+	TaskName    string  `json:"task_name"`   //任务名称
 	CreateDate  string  `json:"create_date"` //创建日期
 	Two         float64 `json:"two"`
 	Three       float64 `json:"three"`

model/levelMonitor/request/search_image_record_params.go

@@ -19,10 +19,11 @@ type SearchImageRecordStatisticsParams struct {
 	Desc     bool   `json:"desc"`
 }
 
-//紧急任务请求
+//图片记录请求
 type ImageRecordRequest struct {
 	Id          int                  `json:"id"`
 	TaskId      int                  `json:"task_id"` //任务id
+	User        string               `json:"user"`
 	Account     string               `json:"account"` //账号
 	Date        []string             `json:"date"`
 	ImageBase64 string               `json:"image_base64"` //图片base64文本

service/levelMonitor/image_record.go

@@ -75,7 +75,7 @@ func (s *ImageRecordService) DeleteExpireImageRecord() {
 }
 
 //获取图片记录列表
-func (s *ImageRecordService) GetImageRecordList(record levelRequest.ImageRecordRequest, info request.PageInfo, order string, desc bool) (recordList []levelMonitor.ImageRecord, total int64, err error) {
+func (s *ImageRecordService) GetImageRecordList(record levelRequest.ImageRecordRequest, info request.PageInfo, order string, desc bool) (recordList []levelMonitor.ImageRecordResponse, total int64, err error) {
 	limit := info.PageSize
 	offset := info.PageSize * (info.Page - 1)
 	db := global.GVA_DB.Model(&levelMonitor.ImageRecord{})
@@ -85,10 +85,15 @@ func (s *ImageRecordService) GetImageRecordList(record levelRequest.ImageRecordR
 		startDate = record.Date[0]
 		endDate = record.Date[1]
 	}
+	db = db.Select("image_record.*, game_task.user, game_task.task_name")
+	db = db.Joins("left join game_task on image_record.task_id = game_task.task_id")
+	if record.User != "" {
+		db = db.Where("user", record.User)
+	}
 	//筛选日期
 	db = db.Where("create_date >= ? and create_date <= ?", startDate, endDate)
 	if record.TaskId != 0 {
-		db = db.Where("task_id = ?", record.TaskId)
+		db = db.Where("image_record.task_id = ?", record.TaskId)
 	}
 	err = db.Count(&total).Error
 	if err != nil {
@@ -99,13 +104,14 @@ func (s *ImageRecordService) GetImageRecordList(record levelRequest.ImageRecordR
 			var OrderStr string
 			// 设置有效排序key 防止sql注入
 			// 感谢 Tom4t0 提交漏洞信息
-			orderMap := make(map[string]bool, 6)
+			orderMap := make(map[string]bool, 7)
 			orderMap["task_id"] = true
 			orderMap["use_num"] = true
 			orderMap["identify"] = true
 			orderMap["create_date"] = true
 			orderMap["create_time"] = true
 			orderMap["update_time"] = true
+			orderMap["user"] = true
 			if orderMap[order] {
 				if desc {
 					OrderStr = order + " desc"