|
|
@@ -1,6 +1,7 @@
|
|
|
package reporter
|
|
|
|
|
|
import (
|
|
|
+ "hnyfkj.com.cn/rtu/linux/baseapp"
|
|
|
mcu "hnyfkj.com.cn/rtu/sy_1a/mcu_ctrl_board"
|
|
|
)
|
|
|
|
|
|
@@ -16,7 +17,14 @@ func (r *MQTTReporter) loopRecvOneEnvData() {
|
|
|
for {
|
|
|
select {
|
|
|
case envData := <-mcu.Board.EnvDataOneCh:
|
|
|
- r.reportSensorData(envData)
|
|
|
+ mcu.MCBSetEnvStateBit(mcu.ParsingEnvData)
|
|
|
+ var strEnv StrEnv
|
|
|
+ strEnv.Timestamp, strEnv.Temperature, strEnv.Humidity,
|
|
|
+ strEnv.Illuminance, strEnv.Voltage = envData.StringWithoutUnit()
|
|
|
+ baseapp.Logger.Infof("[%s] 收到一条环境数据: %s", MODULE_NAME, envData.LogString())
|
|
|
+ mcu.MCBSetEnvStateBit(mcu.Idle)
|
|
|
+
|
|
|
+ r.reportSensorData(strEnv) // 开始执行上报
|
|
|
case <-r.ctx.Done():
|
|
|
return
|
|
|
} // end select
|
|
|
@@ -26,18 +34,31 @@ func (r *MQTTReporter) loopRecvOneEnvData() {
|
|
|
func (r *MQTTReporter) loopRecvGrpEnvData() {
|
|
|
for {
|
|
|
select {
|
|
|
- case envData := <-mcu.Board.EnvDataGrpCh:
|
|
|
- r.reportSensorData(envData)
|
|
|
+ case grpData := <-mcu.Board.EnvDataGrpCh:
|
|
|
+ mcu.MCBSetEnvStateBit(mcu.ParsingEnvData)
|
|
|
+ strEnvGrp := make([]StrEnv, len(grpData))
|
|
|
+ for idx, envData := range grpData {
|
|
|
+ strEnvGrp[idx].Timestamp, strEnvGrp[idx].Temperature, strEnvGrp[idx].Humidity,
|
|
|
+ strEnvGrp[idx].Illuminance, strEnvGrp[idx].Voltage = envData.StringWithoutUnit()
|
|
|
+ baseapp.Logger.Infof("[%s] 收到一组环境数据: [%02d]: %s", MODULE_NAME, idx+1, envData.LogString())
|
|
|
+ }
|
|
|
+ mcu.MCBSetEnvStateBit(mcu.Idle)
|
|
|
+
|
|
|
+ r.reportSensorData(strEnvGrp) // 开始执行上报
|
|
|
case <-r.ctx.Done():
|
|
|
return
|
|
|
} // end select
|
|
|
} // end for
|
|
|
}
|
|
|
|
|
|
-func (r *MQTTReporter) reportSensorData(envData any) {
|
|
|
- switch envData := envData.(type) {
|
|
|
- case mcu.EnvData: //// 单条数据
|
|
|
- case []mcu.EnvData: // 批量数据
|
|
|
+func (r *MQTTReporter) reportSensorData(data any) {
|
|
|
+ mcu.MCBSetEnvStateBit(mcu.EnvDataUploading)
|
|
|
+ defer mcu.MCBSetEnvStateBit(mcu.Idle)
|
|
|
+
|
|
|
+ switch data := data.(type) {
|
|
|
+ case StrEnv: //// 单条数据
|
|
|
+ case []StrEnv: // 批量数据
|
|
|
default:
|
|
|
+ return
|
|
|
}
|
|
|
}
|