设备信息查询更新

model/log/device_log.go

@@ -3,28 +3,28 @@ package log
 import "time"
 
 type DeviceLog struct {
-	Id                 uint   `json:"id"`
-	SimulatorCode      string `json:"simulator_code"`
-	DeviceManufacturer string `json:"device_manufacturer"`
-	DeviceModel        string `json:"device_model"`
-	DeviceImei         string `json:"device_imei"`
-	DeviceSdk          string `json:"device_sdk"`
-	DeviceMac          string `json:"device_mac"`
-	DeviceNumber       string `json:"device_number"`
-	DeviceIp           string `json:"device_ip"`
-	DeviceId           string `json:"device_id"`
-	Account            string `json:"account"`
-	GameId             int    `json:"game_id"`
-	CreateDate         string `json:"create_date"`
-	CreateTime         string `json:"create_time"` // 创建时间
-	IsErr              int8   `json:"is_err"`
-	ErrStatus          uint8  `json:"err_status"`
-	DeviceHex          string `json:"device_hex"`
-	AccountHex         string `json:"account_hex"`
-	LogUuid            string `json:"log_uuid"` //日志UUID
-	ScriptDeviceId     string `json:"script_device_id"`
-	PcCode             string `json:"pc_code"`
-	SimulatorIpCity    string `json:"simulator_ip_city"`
+	Id                 uint      `json:"id"`
+	SimulatorCode      string    `json:"simulator_code"`
+	DeviceManufacturer string    `json:"device_manufacturer"`
+	DeviceModel        string    `json:"device_model"`
+	DeviceImei         string    `json:"device_imei"`
+	DeviceSdk          string    `json:"device_sdk"`
+	DeviceMac          string    `json:"device_mac"`
+	DeviceNumber       string    `json:"device_number"`
+	DeviceIp           string    `json:"device_ip"`
+	DeviceId           string    `json:"device_id"`
+	Account            string    `json:"account"`
+	GameId             int       `json:"game_id"`
+	CreateDate         string    `json:"create_date"`
+	CreateTime         time.Time `json:"create_time"` // 创建时间
+	IsErr              int8      `json:"is_err"`
+	ErrStatus          uint8     `json:"err_status"`
+	DeviceHex          string    `json:"device_hex"`
+	AccountHex         string    `json:"account_hex"`
+	LogUuid            string    `json:"log_uuid"` //日志UUID
+	ScriptDeviceId     string    `json:"script_device_id"`
+	PcCode             string    `json:"pc_code"`
+	SimulatorIpCity    string    `json:"simulator_ip_city"`
 }
 
 func (DeviceLog) TableName() string {

service/log/log_statistics.go

@@ -1652,25 +1652,37 @@ func (s *ServiceStatisticsLog) GetDeviceIdErr(ctx context.Context, api log.Scrip
 	return
 }
 
-func (s *ServiceStatisticsLog) GetDeviceContrastInfo(ctx context.Context, api log.DeviceLog) (deviceLogs []log.DeviceLog, err error) {
+func (s *ServiceStatisticsLog) GetDeviceContrastInfo(ctx context.Context, api log.DeviceLog) (deviceLogs []log.DeviceErr, 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 {
-		err = global.GVA_DB.Where("game_id = ?", device.GameId).Where("account = ?", device.Account).Where("id < ?", device.Id).Order("id desc").First(&deviceLogs).Error
+	if device.ErrStatus == 3 || device.ErrStatus == 2 {
+		err = global.GVA_DB.Where("device_log_id = ?", device.Id).Find(&deviceLogs).Error
 		if err != nil {
 			return nil, err
 		}
 	} else {
-		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
+		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)
 	}
+
 	return
 }