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

新增reporter上报模块, 使得编译能够通过

niujiuru 10 месяцев назад
Родитель
Сommit
b94587c593
9 измененных файлов с 184 добавлено и 0 удалено
  1. 3 0
      go.mod
  2. 6 0
      go.sum
  3. 5 0
      main.go
  4. 39 0
      reporter/common.go
  5. 1 0
      reporter/envdata.go
  6. 1 0
      reporter/protocol.go
  7. 72 0
      reporter/reporter.go
  8. 56 0
      reporter/servers_cfg.go
  9. 1 0
      reporter/takephoto.go

+ 3 - 0
go.mod

@@ -5,6 +5,7 @@ go 1.24.2
 replace hnyfkj.com.cn/rtu/linux => ../rtu_linux_modules
 
 require (
+	github.com/eclipse/paho.mqtt.golang v1.5.1
 	gopkg.in/ini.v1 v1.67.0
 	hnyfkj.com.cn/rtu/linux v0.0.0-00010101000000-000000000000
 )
@@ -12,10 +13,12 @@ require (
 require (
 	github.com/alexflint/go-filemutex v1.3.0 // indirect
 	github.com/beevik/ntp v1.5.0 // indirect
+	github.com/gorilla/websocket v1.5.3 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/vishvananda/netlink v1.3.1 // indirect
 	github.com/vishvananda/netns v0.0.5 // indirect
 	golang.org/x/net v0.44.0 // indirect
+	golang.org/x/sync v0.17.0 // indirect
 	golang.org/x/sys v0.36.0 // indirect
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
 )

+ 6 - 0
go.sum

@@ -5,6 +5,10 @@ github.com/beevik/ntp v1.5.0/go.mod h1:mJEhBrwT76w9D+IfOEGvuzyuudiW9E52U2BaTrMOY
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/eclipse/paho.mqtt.golang v1.5.1 h1:/VSOv3oDLlpqR2Epjn1Q7b2bSTplJIeV2ISgCl2W7nE=
+github.com/eclipse/paho.mqtt.golang v1.5.1/go.mod h1:1/yJCneuyOoCOzKSsOTUc0AJfpsItBGWvYpBLimhArU=
+github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
+github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
@@ -20,6 +24,8 @@ github.com/vishvananda/netns v0.0.5 h1:DfiHV+j8bA32MFM7bfEunvT8IAqQ/NzSJHtcmW5zd
 github.com/vishvananda/netns v0.0.5/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZlaprSwhNNJM=
 golang.org/x/net v0.44.0 h1:evd8IRDyfNBMBTTY5XRF1vaZlD+EmWx6x8PkhR04H/I=
 golang.org/x/net v0.44.0/go.mod h1:ECOoLqd5U3Lhyeyo/QDCEVQ4sNgYsqvCZ722XogGieY=
+golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug=
+golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

+ 5 - 0
main.go

@@ -10,6 +10,7 @@ import (
 	camera1 "hnyfkj.com.cn/rtu/linux/mvs_u_takephoto" // 海康U口相机
 	netmgrd "hnyfkj.com.cn/rtu/linux/netmgrd"
 	mcu "hnyfkj.com.cn/rtu/sy_1a/mcu_ctrl_board"
+	"hnyfkj.com.cn/rtu/sy_1a/reporter"
 )
 
 const (
@@ -121,6 +122,9 @@ func main() {
 	}
 
 	// 06, 后台服务器业务交互
+	if !reporter.ModuleInit() {
+		goto end_p
+	}
 
 	// 07, 阻塞等待退出信号量
 	select {
@@ -130,6 +134,7 @@ func main() {
 
 	// 08, 退出程序并释放资源
 end_p:
+	reporter.ModuleExit()
 	mcu.ModuleExit()
 	netmgrd.ModemExit()
 	gps.ModuleExit()

+ 39 - 0
reporter/common.go

@@ -0,0 +1,39 @@
+package reporter
+
+import (
+	"crypto/md5"
+	"encoding/hex"
+	"io"
+	"os"
+)
+
+// 判断字符串是否为十进制数字
+func IsDecimal(s string) bool {
+	for _, ch := range s {
+		if ch < '0' || ch > '9' {
+			return false
+		}
+	}
+	return s != "" // 不允许空字符串
+}
+
+// 计算文件MD5, 失败返回错误
+func FileMD5(path string) (string, error) {
+	f, err := os.Open(path)
+	if err != nil {
+		return "", err
+	}
+	defer f.Close()
+
+	h := md5.New()
+	if _, err := io.Copy(h, f); err != nil {
+		return "", err
+	}
+	return hex.EncodeToString(h.Sum(nil)), nil
+}
+
+// 判断指定路径的文件是否存在
+func FileExists(name string) bool {
+	_, err := os.Stat(name)
+	return !os.IsNotExist(err)
+}

+ 1 - 0
reporter/envdata.go

@@ -0,0 +1 @@
+package reporter

+ 1 - 0
reporter/protocol.go

@@ -0,0 +1 @@
+package reporter

+ 72 - 0
reporter/reporter.go

@@ -0,0 +1,72 @@
+package reporter
+
+import "C"
+
+import (
+	"context"
+	"sync/atomic"
+	"time"
+
+	mqtt "github.com/eclipse/paho.mqtt.golang"
+	"hnyfkj.com.cn/rtu/linux/baseapp"
+	"hnyfkj.com.cn/rtu/linux/utils/singletask"
+)
+
+const MODULE_NAME = "Reporter"
+
+var (
+	Reporter *MQTTReporter
+)
+
+const (
+	MqttQos1     byte = 1               //// 消息至少送达一次
+	FastInterval      = 1 * time.Second //// 快速检测时间间隔
+	SlowInterval      = 5 * time.Second //// 慢速检测时间间隔
+)
+
+type MQTTReporter struct {
+	client mqtt.Client
+
+	ctx    context.Context
+	cancel context.CancelFunc
+
+	isLogin    atomic.Bool // 标记是否已成功登录MQTT后端服务器
+	dui        string      // 登录成功后服务端返回的设备唯一ID
+	inheritDUI string      // 继承的历史ID, 可选可为空(换板时)
+
+	// 主动上报的后台任务, 登录成功时用于照片补录和上报通知类消息
+	reuploadHistTask *singletask.OnceTask // 补录数据, 单实例
+	reportMcuCfgTask *singletask.OnceTask // 上报配置, 单实例
+	reportRtuPosTask *singletask.OnceTask // 上报位置, 单实例
+
+	// 注册本地的远程方法, 登录成功后用于让服务端能够主动下发指令
+	registerRpcMeths *singletask.OnceTask // 注册方法, 单实例
+}
+
+func ModuleInit() bool {
+	err := loadCfgServers()
+	if err != nil {
+		baseapp.Logger.Errorf("[%s] 加载服务器配置项失败: %v!!", MODULE_NAME, err)
+		return false
+	}
+
+	return true
+}
+
+func ModuleExit() {
+	if Reporter != nil {
+		Reporter.cancel()
+	}
+}
+
+func (r *MQTTReporter) IsLogin() bool {
+	return r.isLogin.Load()
+}
+
+//export RTU_IsLoginMqServer
+func RTU_IsLoginMqServer() C.int {
+	if Reporter != nil && Reporter.IsLogin() {
+		return 1
+	}
+	return 0
+}

+ 56 - 0
reporter/servers_cfg.go

@@ -0,0 +1,56 @@
+package reporter
+
+import (
+	"fmt"
+	"path/filepath"
+
+	"gopkg.in/ini.v1"
+	"hnyfkj.com.cn/rtu/linux/baseapp"
+)
+
+type MQTTBroker struct {
+	Address  string `ini:"BrokerAddress"` // 地址端口
+	Username string `ini:"Username"`      // 用户名称
+	Password string `ini:"Password"`      // 接入密码
+}
+
+type Img2FtpSvr struct {
+	Address  string `ini:"ServerAddress"` // 地址端口
+	Username string `ini:"Username"`      // 用户名称
+	Password string `ini:"Password"`      // 接入密码
+}
+
+type Config struct {
+	MQTTSrv MQTTBroker `ini:"MQTTSrv"`
+	Img2Ftp Img2FtpSvr `ini:"Img2Ftp"`
+}
+
+var (
+	CfgServers = &Config{}
+)
+
+func loadCfgServers() error {
+	cfgFile := filepath.Join(baseapp.CFG_DIR, "config.ini")
+	cfgIni, err := ini.Load(cfgFile)
+	if err != nil {
+		return err
+	}
+
+	if cfgIni.HasSection("MQTTSrv") {
+		if err := cfgIni.Section("MQTTSrv").MapTo(&CfgServers.MQTTSrv); err != nil {
+			return err
+		}
+	} else {
+		return fmt.Errorf("配置文件\"%s\"缺少\"[MQTTSrv]\"节", cfgFile)
+	}
+
+	if cfgIni.HasSection("Img2Ftp") {
+		if err := cfgIni.Section("Img2Ftp").MapTo(&CfgServers.Img2Ftp); err != nil {
+			return err
+		}
+	} else {
+		return fmt.Errorf("配置文件\"%s\"缺少\"[Img2Ftp]\"节", cfgFile)
+	}
+
+	return nil
+}

+ 1 - 0
reporter/takephoto.go

@@ -0,0 +1 @@
+package reporter