|
|
@@ -1,6 +1,7 @@
|
|
|
package reporter
|
|
|
|
|
|
import (
|
|
|
+ "context"
|
|
|
"encoding/json"
|
|
|
"errors"
|
|
|
"fmt"
|
|
|
@@ -42,7 +43,7 @@ func (r *MQTTReporter) loopRecvOneEnvData() { // 单条环境数据接收上报
|
|
|
baseapp.Logger.Infof("[%s] 收到一条环境数据: %s", MODULE_NAME, envData.LogString())
|
|
|
}()
|
|
|
|
|
|
- err := r.reportSensorData(strEnvOne)
|
|
|
+ _, err := r.reportSensorData(strEnvOne)
|
|
|
if err != nil {
|
|
|
if true {
|
|
|
baseapp.Logger.Errorf("[%s] 环境数据上传失败: %v!!", MODULE_NAME, err)
|
|
|
@@ -82,7 +83,7 @@ func (r *MQTTReporter) loopRecvGrpEnvData() { // 批量环境数据接收上报
|
|
|
}
|
|
|
}()
|
|
|
|
|
|
- err := r.reportSensorData(strEnvGrp)
|
|
|
+ _, err := r.reportSensorData(strEnvGrp)
|
|
|
if err != nil {
|
|
|
if true {
|
|
|
baseapp.Logger.Errorf("[%s] 环境数据上传失败: %v!!", MODULE_NAME, err)
|
|
|
@@ -105,12 +106,12 @@ func (r *MQTTReporter) loopRecvGrpEnvData() { // 批量环境数据接收上报
|
|
|
} // end for
|
|
|
}
|
|
|
|
|
|
-func (r *MQTTReporter) reportSensorData(data any) error {
|
|
|
+func (r *MQTTReporter) reportSensorData(data any) (int, error) {
|
|
|
mcu.MCBSetEnvStateBit(mcu.EnvDataUploading)
|
|
|
defer mcu.MCBSetEnvStateBit(mcu.Idle)
|
|
|
|
|
|
if !Reporter.IsLogin() {
|
|
|
- return errors.New("未登录后台服务器")
|
|
|
+ return 0, errors.New("未登录")
|
|
|
}
|
|
|
|
|
|
var msg []byte
|
|
|
@@ -119,6 +120,7 @@ func (r *MQTTReporter) reportSensorData(data any) error {
|
|
|
var token mqtt.Token
|
|
|
|
|
|
now := time.Now()
|
|
|
+ cnt := 0
|
|
|
|
|
|
switch data := data.(type) {
|
|
|
case StrEnv: //// 单条数据
|
|
|
@@ -132,8 +134,8 @@ func (r *MQTTReporter) reportSensorData(data any) error {
|
|
|
EnvData: data,
|
|
|
}
|
|
|
|
|
|
+ cnt = 1
|
|
|
msg, err = json.Marshal(notify)
|
|
|
-
|
|
|
topic = fmt.Sprintf("/yfkj/bxs-sy/notify/%s/envDataNow", Reporter.dui)
|
|
|
case []StrEnv: // 批量数据
|
|
|
type Notify struct {
|
|
|
@@ -146,56 +148,57 @@ func (r *MQTTReporter) reportSensorData(data any) error {
|
|
|
EnvDataGrp: data,
|
|
|
}
|
|
|
|
|
|
+ cnt = len(data)
|
|
|
msg, err = json.Marshal(notify)
|
|
|
-
|
|
|
topic = fmt.Sprintf("/yfkj/bxs-sy/notify/%s/envData24h", Reporter.dui)
|
|
|
default:
|
|
|
- return errors.New("无效环境数据类型, not StrEnv or []StrEnv")
|
|
|
+ return 0, errors.New("无效的数据类型, not StrEnv or []StrEnv")
|
|
|
}
|
|
|
|
|
|
- if err != nil {
|
|
|
- return errors.New("编码环境数据失败")
|
|
|
+ if cnt == 0 { // 没有历史环境数据
|
|
|
+ return 0, nil
|
|
|
+ } else if err != nil { // 有错误
|
|
|
+ return 0, err
|
|
|
}
|
|
|
|
|
|
- token = Reporter.client.Publish(topic, MqttQos1, false, msg)
|
|
|
+ text := string(msg)
|
|
|
+ token = Reporter.client.Publish(topic, MqttQos1, false, text)
|
|
|
select {
|
|
|
case <-r.ctx.Done():
|
|
|
- return errors.New("上报器已停止运行")
|
|
|
+ return 0, context.Canceled
|
|
|
case <-token.Done():
|
|
|
}
|
|
|
|
|
|
if token.Error() != nil {
|
|
|
- return token.Error()
|
|
|
+ return 0, token.Error()
|
|
|
}
|
|
|
|
|
|
elapsed := time.Since(now).Milliseconds()
|
|
|
baseapp.Logger.Infof("[%s] 环境数据上传成功, 用时: %d毫秒", MODULE_NAME, elapsed)
|
|
|
- return nil
|
|
|
+ return cnt, nil
|
|
|
}
|
|
|
|
|
|
func (r *MQTTReporter) reportSensorHist(filePath string) (int, error) {
|
|
|
uploadingData, err := r.loadSensorData(filePath)
|
|
|
if err != nil {
|
|
|
- return -1, err
|
|
|
- }
|
|
|
-
|
|
|
- nums := len(uploadingData)
|
|
|
- if nums == 0 { // 没有历史环境数据
|
|
|
- return 0, nil
|
|
|
+ return 0, err
|
|
|
}
|
|
|
|
|
|
- return nums, r.reportSensorData(uploadingData)
|
|
|
+ return r.reportSensorData(uploadingData)
|
|
|
}
|
|
|
|
|
|
func (r *MQTTReporter) loadSensorData(filePath string) ([]StrEnv, error) {
|
|
|
- var existingData []StrEnv
|
|
|
-
|
|
|
- f, err := os.OpenFile(filePath, os.O_RDWR|os.O_CREATE, 0644)
|
|
|
+ f, err := os.Open(filePath)
|
|
|
if err != nil {
|
|
|
+ if os.IsNotExist(err) { // 文件不存在, 返回空切片
|
|
|
+ return []StrEnv{}, nil
|
|
|
+ }
|
|
|
return nil, err
|
|
|
}
|
|
|
defer f.Close()
|
|
|
|
|
|
+ var existingData []StrEnv
|
|
|
+
|
|
|
decoder := json.NewDecoder(f)
|
|
|
if err := decoder.Decode(&existingData); err != nil && err != io.EOF {
|
|
|
return nil, err
|
|
|
@@ -220,7 +223,7 @@ func (r *MQTTReporter) saveSensorData(data any, filePath string) error {
|
|
|
case []StrEnv:
|
|
|
existingData = append(existingData, data...)
|
|
|
default:
|
|
|
- return errors.New("无效环境数据类型, not StrEnv or []StrEnv")
|
|
|
+ return errors.New("无效的数据类型, not StrEnv or []StrEnv")
|
|
|
}
|
|
|
|
|
|
f, err := os.OpenFile(filePath, os.O_RDWR|os.O_CREATE, 0644)
|