Просмотр исходного кода

Fix 修复日总电能数据每天凌晨不清零的问题

YueYunyun 2 лет назад
Родитель
Сommit
12ce3a9e88

+ 1 - 2
SERVER/IotAdmin/iot/protocol/report/el-hj212.go

@@ -30,8 +30,7 @@ func (*elHj212) Adapter(data *iotStruct.CollectData) {
 	elMeter := mData.(electric.MeterElectric)
 	// 计算电表数据
 	data.Logger.Debugf("[%d]计算前: [%v]", today, calc)
-	elMeter.Time = today
-	elMeter.CalcMeterData(data)
+	elMeter.CalcMeterData(data, today)
 	data.Logger.Debugf("[%d]计算后: [%v]", today, calc)
 
 	// 更新电表计算参数

+ 5 - 1
SERVER/IotAdmin/iot/struct/electric/meter.go

@@ -113,7 +113,11 @@ func (m *MeterElectricBase) CalcDiff(data *iotStruct.CollectData) {
 }
 
 // CalcMeterData 计算电表部分数据
-func (m *MeterElectricBase) CalcMeterData(data *iotStruct.CollectData) {
+func (m *MeterElectricBase) CalcMeterData(data *iotStruct.CollectData, today int) {
+	if m.Time != today {
+		m.Time = today
+		m.ClearDayEnergy()
+	}
 	m.CalcDiff(data)
 	m.CalcAndSetPowerRate(data)
 	m.CalcAndSetDayEnergy(data)