Kaynağa Gözat

初步完成photo.go的编码

niujiuru 1 ay önce
ebeveyn
işleme
134763f567
6 değiştirilmiş dosya ile 212 ekleme ve 4 silme
  1. 3 0
      go.mod
  2. 6 0
      go.sum
  3. 20 2
      mqtt_reporter/config.go
  4. 137 0
      mqtt_reporter/photo.go
  5. 6 2
      mqtt_reporter/reporter.go
  6. 40 0
      utils/utils.go

+ 3 - 0
go.mod

@@ -19,6 +19,9 @@ require (
 
 
 require (
 require (
 	github.com/gorilla/websocket v1.5.3 // indirect
 	github.com/gorilla/websocket v1.5.3 // indirect
+	github.com/hashicorp/errwrap v1.0.0 // indirect
+	github.com/hashicorp/go-multierror v1.1.1 // indirect
+	github.com/jlaffaye/ftp v0.2.0 // indirect
 	golang.org/x/net v0.44.0 // indirect
 	golang.org/x/net v0.44.0 // indirect
 	golang.org/x/sync v0.17.0 // indirect
 	golang.org/x/sync v0.17.0 // indirect
 )
 )

+ 6 - 0
go.sum

@@ -7,6 +7,12 @@ github.com/eclipse/paho.mqtt.golang v1.5.1 h1:/VSOv3oDLlpqR2Epjn1Q7b2bSTplJIeV2I
 github.com/eclipse/paho.mqtt.golang v1.5.1/go.mod h1:1/yJCneuyOoCOzKSsOTUc0AJfpsItBGWvYpBLimhArU=
 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 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
 github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA=
+github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
+github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
+github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
+github.com/jlaffaye/ftp v0.2.0 h1:lXNvW7cBu7R/68bknOX3MrRIIqZ61zELs1P2RAiA3lg=
+github.com/jlaffaye/ftp v0.2.0/go.mod h1:is2Ds5qkhceAPy2xD6RLI6hmp/qysSoymZ+Z2uTnspI=
 github.com/kardianos/service v1.2.4 h1:XNlGtZOYNx2u91urOdg/Kfmc+gfmuIo1Dd3rEi2OgBk=
 github.com/kardianos/service v1.2.4 h1:XNlGtZOYNx2u91urOdg/Kfmc+gfmuIo1Dd3rEi2OgBk=
 github.com/kardianos/service v1.2.4/go.mod h1:E4V9ufUuY82F7Ztlu1eN9VXWIQxg8NoLQlmFe0MtrXc=
 github.com/kardianos/service v1.2.4/go.mod h1:E4V9ufUuY82F7Ztlu1eN9VXWIQxg8NoLQlmFe0MtrXc=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=

+ 20 - 2
mqtt_reporter/config.go

@@ -37,6 +37,7 @@ type Topics struct {
 
 
 type ImagServer struct {
 type ImagServer struct {
 	Enable bool   `json:"enable"`
 	Enable bool   `json:"enable"`
+	Name   string `json:"name"`
 	PutURL string `json:"putUrl"`
 	PutURL string `json:"putUrl"`
 }
 }
 
 
@@ -59,7 +60,7 @@ const defaultConfig = `{
       "enable": true,
       "enable": true,
       "name": "YFKJ-MQTT-SERVER",
       "name": "YFKJ-MQTT-SERVER",
       "protocol": "yfkj-private",
       "protocol": "yfkj-private",
-			"dataBackfill": "true",
+			"dataBackfill": true,
       "brokerAddress": "tcp://8.136.98.49:61883",
       "brokerAddress": "tcp://8.136.98.49:61883",
       "username": "user",
       "username": "user",
       "password": "f335bf402c655ee5fd2b5300905124e",
       "password": "f335bf402c655ee5fd2b5300905124e",
@@ -73,6 +74,7 @@ const defaultConfig = `{
   "imagServers": [
   "imagServers": [
     {
     {
       "enable": true,
       "enable": true,
+			"name": "YFKJ-CBD-IMG-FTP-SERVER",
       "putUrl": "ftp://cbd_user:YFkj%406O2O@8.136.98.49:21/${id}/"
       "putUrl": "ftp://cbd_user:YFkj%406O2O@8.136.98.49:21/${id}/"
     }
     }
   ],
   ],
@@ -167,7 +169,7 @@ func (c *ServerConfig) Save(filePath string) error {
 	return utils.WriteFileAtomic(filePath, append(data, '\n'))
 	return utils.WriteFileAtomic(filePath, append(data, '\n'))
 }
 }
 
 
-func (c *ServerConfig) GetMQTSServers() []MQTTServer {
+func (c *ServerConfig) GetMQTTServers() []MQTTServer {
 	c.mu.RLock()
 	c.mu.RLock()
 	defer c.mu.RUnlock()
 	defer c.mu.RUnlock()
 	return append([]MQTTServer(nil), c.mqttServers...)
 	return append([]MQTTServer(nil), c.mqttServers...)
@@ -188,6 +190,14 @@ func (c *ServerConfig) GetUpgrServers() []UpgrServer {
 func (c *ServerConfig) AddMQTTServer(server MQTTServer) {
 func (c *ServerConfig) AddMQTTServer(server MQTTServer) {
 	c.mu.Lock()
 	c.mu.Lock()
 	defer c.mu.Unlock()
 	defer c.mu.Unlock()
+
+	for i, s := range c.mqttServers {
+		if s.Name == server.Name {
+			c.mqttServers[i] = server
+			return
+		}
+	}
+
 	c.mqttServers = append(c.mqttServers, server)
 	c.mqttServers = append(c.mqttServers, server)
 }
 }
 
 
@@ -206,6 +216,14 @@ func (c *ServerConfig) DelMQTTServer(index int) bool {
 func (c *ServerConfig) AddImagServer(server ImagServer) {
 func (c *ServerConfig) AddImagServer(server ImagServer) {
 	c.mu.Lock()
 	c.mu.Lock()
 	defer c.mu.Unlock()
 	defer c.mu.Unlock()
+
+	for i, s := range c.imagServers {
+		if s.Name == server.Name {
+			c.imagServers[i] = server
+			return
+		}
+	}
+
 	c.imagServers = append(c.imagServers, server)
 	c.imagServers = append(c.imagServers, server)
 }
 }
 
 

+ 137 - 0
mqtt_reporter/photo.go

@@ -1 +1,138 @@
 package mqttreporter
 package mqttreporter
+
+import (
+	"fmt"
+	"os"
+	"path/filepath"
+	"sort"
+	"time"
+
+	"hnyfkj.com.cn/rtu/linux/baseapp"
+	"hnyfkj.com.cn/rtu/linux/rtu/cbd/local_rpc"
+	mcu "hnyfkj.com.cn/rtu/linux/rtu/cbd/mcu_ctrl_board"
+	"hnyfkj.com.cn/rtu/linux/rtu/cbd/utils"
+	"hnyfkj.com.cn/rtu/linux/utils/ftpclient"
+)
+
+const (
+	photoMaxNums = 1000 //// 最大保存的照片数量, 超过后删除最早的一张
+)
+
+func (r *MQTTReporter) StartPhotoWorker() {
+	go func() {
+		for { //////////////// 循环的处理控制板发来的相机拍照请求 ////
+			select {
+			case <-mcu.Board.RequestPhotoCh:
+				r.takePhotoAndUploadToServers()
+			case <-r.ctx.Done():
+				return
+			} // end select
+		} // end for
+	}()
+}
+
+func saveLastPhotoDate() error {
+	file := filepath.Join(baseapp.IMG_DIR, "last_photo_date.txt")
+	return os.WriteFile(file, []byte(time.Now().Format("2006-01-02")+"\n"), 0644)
+}
+
+func (r *MQTTReporter) takePhotoAndUploadToServers() bool {
+	r.pruneOldPhotos(baseapp.IMG_DIR, photoMaxNums) // 先清理旧照片, 避免磁盘空间不足
+
+	baseapp.Logger.Infof("[%s] 拍照中, 请稍后...", MODULE_NAME)
+
+	start := time.Now()
+	imgFile := filepath.Join(baseapp.IMG_DIR, fmt.Sprintf("%s.jpg", start.Format("2006-01-02_15-04-05.000")))
+	_, err := local_rpc.TakePhoto(r.ctx, imgFile)
+	if err != nil {
+		baseapp.Logger.Errorf("[%s] 拍照失败: %v!!", MODULE_NAME, err)
+		return false
+	}
+	elapsed := time.Since(start).Milliseconds()
+	baseapp.Logger.Infof("[%s] 拍照完成, 输出到本地文件: %q, 用时: %d毫秒", MODULE_NAME, imgFile, elapsed)
+
+	saveLastPhotoDate()
+
+	r.uploadPhotoToServers(imgFile)
+
+	return true
+}
+
+func (r *MQTTReporter) uploadPhotoToServers(imgFile string) {
+	ftpclient.FileUploader.Lock()
+	defer ftpclient.FileUploader.Unlock()
+
+	ftpclient.FileUpFolder = r.deviceID
+
+	uploaded := false
+	for _, server := range r.config.GetImagServers() {
+		if !server.Enable {
+			continue
+		}
+
+		baseapp.Logger.Infof("[%s] 开始上传照片文件: %q -> %s", MODULE_NAME, imgFile, server.Name)
+
+		serverInfo, err := utils.ParseURL(server.PutURL)
+		if err != nil {
+			baseapp.Logger.Errorf("[%s] 照片文件上传失败: %q -> %s, 原因: %v!!", MODULE_NAME, imgFile, server.Name, err)
+			continue
+		}
+
+		start := time.Now()
+		if _, err := ftpclient.UploadFileToFtp(r.ctx, imgFile,
+			serverInfo.Host, serverInfo.User, serverInfo.Pass, ftpclient.DefaultUploadTimeout); err != nil {
+			baseapp.Logger.Errorf("[%s] 照片文件上传失败: %q -> %s, 原因: %v!!", MODULE_NAME, imgFile, server.Name, err)
+			continue
+		}
+
+		uploaded = true
+		elapsed := time.Since(start).Milliseconds()
+		baseapp.Logger.Infof("[%s] 照片文件上传成功: %q -> %s, 耗时 %dms", MODULE_NAME, imgFile, server.Name, elapsed)
+	}
+
+	if uploaded { // 只要有一个服务器上传成功,则删除本地
+		os.Remove(imgFile)
+	}
+}
+
+func (r *MQTTReporter) pruneOldPhotos(dir string, maxCount int) error {
+	files, err := os.ReadDir(dir)
+	if err != nil {
+		return err
+	}
+
+	type fileInfo struct {
+		name    string
+		path    string
+		modTime time.Time
+	}
+	var jpgFiles []fileInfo
+
+	for _, f := range files { // 遍历目录, 找出所有jpg文件
+		if !f.IsDir() && filepath.Ext(f.Name()) != ".jpg" {
+			continue
+		}
+		info, err := f.Info()
+		if err != nil {
+			continue
+		}
+		jpgFiles = append(jpgFiles, fileInfo{name: f.Name(), path: filepath.Join(dir, f.Name()), modTime: info.ModTime()})
+	}
+
+	if len(jpgFiles) <= maxCount {
+		return nil
+	}
+
+	sort.Slice(jpgFiles, func(i, j int) bool {
+		if jpgFiles[i].modTime.Equal(jpgFiles[j].modTime) {
+			return jpgFiles[i].name < jpgFiles[j].name // 如果时间相同, 则按文件名排序
+		}
+		return jpgFiles[i].modTime.Before(jpgFiles[j].modTime) // 默认按照文件的修改时间排序
+	})
+
+	for i := 0; i < len(jpgFiles)-maxCount; i++ {
+		os.Remove(jpgFiles[i].path)
+	}
+
+	return nil
+}

+ 6 - 2
mqtt_reporter/reporter.go

@@ -23,6 +23,8 @@ type MQTTReporter struct {
 	clients map[string]*Client
 	clients map[string]*Client
 	ctx     context.Context
 	ctx     context.Context
 	cancel  context.CancelFunc
 	cancel  context.CancelFunc
+
+	deviceID string // 设备的ID
 	// 补录上传历史遗存数据的任务
 	// 补录上传历史遗存数据的任务
 	dataBackfillTasks map[string]*singletask.OnceTask
 	dataBackfillTasks map[string]*singletask.OnceTask
 }
 }
@@ -53,11 +55,13 @@ func ModuleInit() bool {
 		clients: make(map[string]*Client),
 		clients: make(map[string]*Client),
 		ctx:     ctx,
 		ctx:     ctx,
 		cancel:  cancel,
 		cancel:  cancel,
-
+		//////////////////////////
+		deviceID: devID, //设备的ID
+		// 补录上传历史遗存数据的任务
 		dataBackfillTasks: make(map[string]*singletask.OnceTask),
 		dataBackfillTasks: make(map[string]*singletask.OnceTask),
 	}
 	}
 
 
-	for _, server := range config.GetMQTSServers() {
+	for _, server := range config.GetMQTTServers() {
 		switch server.Protocol {
 		switch server.Protocol {
 		case "yfkj-private":
 		case "yfkj-private":
 			if err := reporter.initYFKJClient(server, devID); err != nil {
 			if err := reporter.initYFKJClient(server, devID); err != nil {

+ 40 - 0
utils/utils.go

@@ -2,7 +2,9 @@ package utils
 
 
 import (
 import (
 	"encoding/json"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"fmt"
+	"net/url"
 	"os"
 	"os"
 	"os/exec"
 	"os/exec"
 	"path/filepath"
 	"path/filepath"
@@ -119,3 +121,41 @@ func DetectRPC2Role(jsonStr string) string {
 		return "unknown"
 		return "unknown"
 	}
 	}
 }
 }
+
+type URLInfo struct {
+	Scheme string
+	Host   string
+	User   string
+	Pass   string
+	Path   string
+}
+
+func ParseURL(rawURL string) (*URLInfo, error) {
+	u, err := url.Parse(rawURL)
+	if err != nil {
+		return nil, fmt.Errorf("invalid url: %w", err)
+	}
+
+	if u.Scheme == "" {
+		return nil, errors.New("scheme is required")
+	}
+
+	if u.Host == "" {
+		return nil, errors.New("host is required")
+	}
+
+	result := &URLInfo{
+		Scheme: strings.ToLower(u.Scheme),
+		Host:   u.Host,
+		Path:   u.Path,
+	}
+
+	if u.User != nil {
+		result.User = u.User.Username()
+		if pass, ok := u.User.Password(); ok {
+			result.Pass = pass
+		}
+	}
+
+	return result, nil
+}