allied-creation / allied-creation-manufacture · 提交

转到一个项目

作者 yangfu
提交 4ce00bc81972da06d8fe5d959fd15824a9013f2a 2 个父辈 9dfe2bc3 162484a1

Merge remote-tracking branch 'origin/test'

内嵌 并排对比
正在显示 1 个修改的文件 包含 2 行增加 和 2 行删除
@@ -161,7 +161,7 @@ func (ptr *PGWorkshopDataConsumeService) newDeviceRunningData(record *domain.Dev @@ -161,7 +161,7 @@ func (ptr *PGWorkshopDataConsumeService) newDeviceRunningData(record *domain.Dev
161 } 161 }
162 data.Temp1 = utils.Truncate(deviceYouZhaJi.FrontTemp, 1) 162 data.Temp1 = utils.Truncate(deviceYouZhaJi.FrontTemp, 1)
163 data.Temp2 = utils.Truncate(deviceYouZhaJi.BackTemp, 1) 163 data.Temp2 = utils.Truncate(deviceYouZhaJi.BackTemp, 1)
164 - data.Alarm = deviceYouZhaJi.Alarm 164 + //data.Alarm = deviceYouZhaJi.Alarm
165 } else { 165 } else {
166 deviceYouZhaJi := &domain.DeviceYouZhaJi2{} 166 deviceYouZhaJi := &domain.DeviceYouZhaJi2{}
167 err = json.Unmarshal(mBytes, deviceYouZhaJi) 167 err = json.Unmarshal(mBytes, deviceYouZhaJi)
@@ -170,7 +170,7 @@ func (ptr *PGWorkshopDataConsumeService) newDeviceRunningData(record *domain.Dev @@ -170,7 +170,7 @@ func (ptr *PGWorkshopDataConsumeService) newDeviceRunningData(record *domain.Dev
170 } 170 }
171 data.Temp1 = utils.Truncate(deviceYouZhaJi.Temp1, 1) 171 data.Temp1 = utils.Truncate(deviceYouZhaJi.Temp1, 1)
172 data.Temp2 = utils.Truncate(deviceYouZhaJi.Temp2, 1) 172 data.Temp2 = utils.Truncate(deviceYouZhaJi.Temp2, 1)
173 - data.Alarm = deviceYouZhaJi.Alarm 173 + //data.Alarm = deviceYouZhaJi.Alarm
174 } 174 }
175 break 175 break
176 //串串机 176 //串串机