|
@@ -1,9 +1,13 @@
|
|
|
package reporter
|
|
package reporter
|
|
|
|
|
|
|
|
import (
|
|
import (
|
|
|
|
|
+ "encoding/json"
|
|
|
|
|
+ "fmt"
|
|
|
"time"
|
|
"time"
|
|
|
|
|
|
|
|
|
|
+ mqtt "github.com/eclipse/paho.mqtt.golang"
|
|
|
"hnyfkj.com.cn/rtu/linux/baseapp"
|
|
"hnyfkj.com.cn/rtu/linux/baseapp"
|
|
|
|
|
+ "hnyfkj.com.cn/rtu/linux/netmgrd"
|
|
|
mcu "hnyfkj.com.cn/rtu/sy_1a/mcu_ctrl_board"
|
|
mcu "hnyfkj.com.cn/rtu/sy_1a/mcu_ctrl_board"
|
|
|
)
|
|
)
|
|
|
|
|
|
|
@@ -57,15 +61,67 @@ func (r *MQTTReporter) reportSensorData(data any) {
|
|
|
mcu.MCBSetEnvStateBit(mcu.EnvDataUploading)
|
|
mcu.MCBSetEnvStateBit(mcu.EnvDataUploading)
|
|
|
defer mcu.MCBSetEnvStateBit(mcu.Idle)
|
|
defer mcu.MCBSetEnvStateBit(mcu.Idle)
|
|
|
|
|
|
|
|
|
|
+ if !Reporter.IsLogin() {
|
|
|
|
|
+ baseapp.Logger.Warnf("[%s] 未登录, 无法上报环境数据!", MODULE_NAME)
|
|
|
|
|
+ return
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ var msg []byte
|
|
|
|
|
+ var err error
|
|
|
|
|
+ var topic string
|
|
|
|
|
+ var token mqtt.Token
|
|
|
now := time.Now()
|
|
now := time.Now()
|
|
|
|
|
|
|
|
switch data := data.(type) {
|
|
switch data := data.(type) {
|
|
|
case StrEnv: //// 单条数据
|
|
case StrEnv: //// 单条数据
|
|
|
|
|
+ type Notify struct {
|
|
|
|
|
+ IMEI string `json:"imei"`
|
|
|
|
|
+ EnvData StrEnv `json:"envData"`
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ notify := Notify{
|
|
|
|
|
+ IMEI: netmgrd.GetIMEI(),
|
|
|
|
|
+ EnvData: data,
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ msg, err = json.Marshal(notify)
|
|
|
|
|
+
|
|
|
|
|
+ topic = fmt.Sprintf("/yfkj/bxs-sy/notify/%s/envDataNow", Reporter.dui)
|
|
|
case []StrEnv: // 批量数据
|
|
case []StrEnv: // 批量数据
|
|
|
|
|
+ type Notify struct {
|
|
|
|
|
+ IMEI string `json:"imei"`
|
|
|
|
|
+ EnvDataGrp []StrEnv `json:"envDataGroup"`
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ notify := Notify{
|
|
|
|
|
+ IMEI: netmgrd.GetIMEI(),
|
|
|
|
|
+ EnvDataGrp: data,
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ msg, err = json.Marshal(notify)
|
|
|
|
|
+
|
|
|
|
|
+ topic = fmt.Sprintf("/yfkj/bxs-sy/notify/%s/envData24h", Reporter.dui)
|
|
|
default:
|
|
default:
|
|
|
|
|
+ baseapp.Logger.Errorf("[%s] 未知数据类型: %T!!", MODULE_NAME, data)
|
|
|
|
|
+ return
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ if err != nil {
|
|
|
|
|
+ baseapp.Logger.Errorf("[%s] 编码通知失败: %v!!", MODULE_NAME, err)
|
|
|
return
|
|
return
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- elapsed := time.Since(now).Milliseconds()
|
|
|
|
|
- baseapp.Logger.Infof("[%s] 环境数据上传成功, 用时: %d毫秒", MODULE_NAME, elapsed)
|
|
|
|
|
|
|
+ token = Reporter.client.Publish(topic, MqttQos1, false, msg)
|
|
|
|
|
+ select {
|
|
|
|
|
+ case <-r.ctx.Done():
|
|
|
|
|
+ return
|
|
|
|
|
+ case <-token.Done():
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ if token.Error() != nil {
|
|
|
|
|
+ baseapp.Logger.Errorf("[%s] 环境数据上传失败: %v!!", MODULE_NAME, token.Error())
|
|
|
|
|
+ } else {
|
|
|
|
|
+ elapsed := time.Since(now).Milliseconds()
|
|
|
|
|
+ baseapp.Logger.Infof("[%s] 环境数据上传成功, 用时: %d毫秒", MODULE_NAME, elapsed)
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|