作者 yangfu

Merge remote-tracking branch 'origin/test'

... ... @@ -161,7 +161,7 @@ func (ptr *PGWorkshopDataConsumeService) newDeviceRunningData(record *domain.Dev
}
data.Temp1 = utils.Truncate(deviceYouZhaJi.FrontTemp, 1)
data.Temp2 = utils.Truncate(deviceYouZhaJi.BackTemp, 1)
data.Alarm = deviceYouZhaJi.Alarm
//data.Alarm = deviceYouZhaJi.Alarm
} else {
deviceYouZhaJi := &domain.DeviceYouZhaJi2{}
err = json.Unmarshal(mBytes, deviceYouZhaJi)
... ... @@ -170,7 +170,7 @@ func (ptr *PGWorkshopDataConsumeService) newDeviceRunningData(record *domain.Dev
}
data.Temp1 = utils.Truncate(deviceYouZhaJi.Temp1, 1)
data.Temp2 = utils.Truncate(deviceYouZhaJi.Temp2, 1)
data.Alarm = deviceYouZhaJi.Alarm
//data.Alarm = deviceYouZhaJi.Alarm
}
break
//串串机
... ...