暂时还原设备信息查询以前逻辑

service/log/log_statistics.go

@@ -1652,37 +1652,25 @@ func (s *ServiceStatisticsLog) GetDeviceIdErr(ctx context.Context, api log.Scrip
 	return
 }
 
-func (s *ServiceStatisticsLog) GetDeviceContrastInfo(ctx context.Context, api log.DeviceLog) (deviceLogs []log.DeviceErr, err error) {
+func (s *ServiceStatisticsLog) GetDeviceContrastInfo(ctx context.Context, api log.DeviceLog) (deviceLogs []log.DeviceLog, err error) {
 	db := global.GVA_DB.Model(&log.DeviceLog{})
 	var device log.DeviceLog
 	err = db.Where("id = ?", api.Id).First(&device).Error
 	if err != nil {
 		return nil, err
 	}
-	if device.ErrStatus == 3 || device.ErrStatus == 2 {
-		err = global.GVA_DB.Where("device_log_id = ?", device.Id).Find(&deviceLogs).Error
+	if device.ErrStatus == 3 {
+		err = global.GVA_DB.Where("game_id = ?", device.GameId).Where("account = ?", device.Account).Where("id < ?", device.Id).Order("id desc").First(&deviceLogs).Error
 		if err != nil {
 			return nil, err
 		}
 	} else {
-		var deviceErr = log.DeviceErr{}
-		deviceErr.GameId = device.GameId
-		deviceErr.ScriptDeviceId = device.ScriptDeviceId
-		deviceErr.Account = device.Account
-		deviceErr.DeviceId = device.DeviceId
-		deviceErr.DeviceImei = device.DeviceImei
-		deviceErr.DeviceMac = device.DeviceMac
-		deviceErr.DeviceManufacturer = device.DeviceManufacturer
-		deviceErr.DeviceModel = device.DeviceModel
-		deviceErr.DeviceSdk = device.DeviceSdk
-		deviceErr.DeviceNumber = device.DeviceNumber
-		deviceErr.AccountHex = device.AccountHex
-		deviceErr.DeviceHex = device.DeviceHex
-		deviceErr.DeviceLogId = device.Id
-		deviceErr.CreateTime = device.CreateTime
-		deviceLogs = append(deviceLogs, deviceErr)
+		err = global.GVA_DB.Where("create_date = ?", device.CreateDate).Where("game_id = ?", device.GameId).Where("device_hex = ?", device.DeviceHex).Where("id < ?", device.Id).Order("id desc").Limit(10).Find(&deviceLogs).Error
+	}
+	deviceLogs = append(deviceLogs, device)
+	for _, statistic := range deviceLogs {
+		statistic.CreateDate = api.CreateDate
 	}
-
 	return
 }