|
@@ -2,6 +2,8 @@ package mqtt_reporter
|
|
|
|
|
|
|
|
import (
|
|
import (
|
|
|
"encoding/json"
|
|
"encoding/json"
|
|
|
|
|
+ "errors"
|
|
|
|
|
+ "os"
|
|
|
"path/filepath"
|
|
"path/filepath"
|
|
|
|
|
|
|
|
"hnyfkj.com.cn/rtu/linux/baseapp"
|
|
"hnyfkj.com.cn/rtu/linux/baseapp"
|
|
@@ -10,8 +12,7 @@ import (
|
|
|
)
|
|
)
|
|
|
|
|
|
|
|
const (
|
|
const (
|
|
|
- dataSavFile = "backfill.json" // 上传失败时, 暂时保存到本地文件存储, 等待下次补录
|
|
|
|
|
- dataMaxNums = 1000 // 最大保存的历史环境数据条数, 超过后删除最早的一条
|
|
|
|
|
|
|
+ dataMaxNums = 1000 ///// MCU控制板 历史数据最大保存条数, 超出后采用 FIFO 覆盖策略
|
|
|
)
|
|
)
|
|
|
|
|
|
|
|
type MCUData struct {
|
|
type MCUData struct {
|
|
@@ -106,6 +107,9 @@ func (r *MQTTReporter) forwardDataToMqttServers(data []byte) {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
func (r *MQTTReporter) saveYFKJBackfillData(data []byte) error {
|
|
func (r *MQTTReporter) saveYFKJBackfillData(data []byte) error {
|
|
|
|
|
+ r.yfkjDataBackfillMu.Lock()
|
|
|
|
|
+ defer r.yfkjDataBackfillMu.Unlock()
|
|
|
|
|
+
|
|
|
var msg struct {
|
|
var msg struct {
|
|
|
Cmd string `json:"cmd"`
|
|
Cmd string `json:"cmd"`
|
|
|
Ext json.RawMessage `json:"ext"`
|
|
Ext json.RawMessage `json:"ext"`
|
|
@@ -126,5 +130,73 @@ func (r *MQTTReporter) saveYFKJBackfillData(data []byte) error {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
return utils.SaveJSONData(
|
|
return utils.SaveJSONData(
|
|
|
- filepath.Join(saveDir, dataSavFile), []MCUData{mcuData}, dataMaxNums)
|
|
|
|
|
|
|
+ filepath.Join(saveDir, "backfill.json"), []MCUData{mcuData}, dataMaxNums)
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
|
|
+func (r *MQTTReporter) reportYFKJBackfillData() (int, error) {
|
|
|
|
|
+ r.yfkjDataBackfillMu.Lock()
|
|
|
|
|
+ defer r.yfkjDataBackfillMu.Unlock()
|
|
|
|
|
+
|
|
|
|
|
+ filePath := filepath.Join(baseapp.EXEC_DIR, "yfkj_history", "data", "backfill.json")
|
|
|
|
|
+ data, err := utils.LoadJSONData[MCUData](filePath)
|
|
|
|
|
+ if err != nil {
|
|
|
|
|
+ if errors.Is(err, os.ErrNotExist) {
|
|
|
|
|
+ return 0, nil
|
|
|
|
|
+ }
|
|
|
|
|
+ return 0, err
|
|
|
|
|
+ }
|
|
|
|
|
+ if len(data) == 0 {
|
|
|
|
|
+ return 0, nil
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ var client *Client
|
|
|
|
|
+ var server MQTTServer
|
|
|
|
|
+ for _, s := range r.config.GetMQTTServers() {
|
|
|
|
|
+ if !s.Enable || s.Protocol != "yfkj-private" || !s.DataBackfill {
|
|
|
|
|
+ continue
|
|
|
|
|
+ }
|
|
|
|
|
+ client = r.clients[s.Name]
|
|
|
|
|
+ if client != nil {
|
|
|
|
|
+ server = s
|
|
|
|
|
+ break
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ if client == nil {
|
|
|
|
|
+ return 0, nil
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ nums := 0
|
|
|
|
|
+ for i, item := range data {
|
|
|
|
|
+ if r.ctx.Err() != nil {
|
|
|
|
|
+ break
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ payload, err := json.Marshal(struct {
|
|
|
|
|
+ Cmd string `json:"cmd"`
|
|
|
|
|
+ Ext MCUData `json:"ext"`
|
|
|
|
|
+ }{
|
|
|
|
|
+ Cmd: "data-history",
|
|
|
|
|
+ Ext: item,
|
|
|
|
|
+ })
|
|
|
|
|
+ if err != nil {
|
|
|
|
|
+ return nums, err
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ if err := client.Publish(server.Topics.Pub, server.Qos, false, payload); err != nil {
|
|
|
|
|
+ data = data[i:]
|
|
|
|
|
+ break
|
|
|
|
|
+ }
|
|
|
|
|
+ nums++
|
|
|
|
|
+ }
|
|
|
|
|
+ data = data[nums:]
|
|
|
|
|
+
|
|
|
|
|
+ content, err := json.Marshal(data)
|
|
|
|
|
+ if err != nil {
|
|
|
|
|
+ return nums, err
|
|
|
|
|
+ }
|
|
|
|
|
+ if err := utils.WriteFileAtomic(filePath, content); err != nil {
|
|
|
|
|
+ return nums, err
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ return nums, nil
|
|
|
}
|
|
}
|