Prechádzať zdrojové kódy

从老版代码中复制移植takephoto.go代码

niujiuru 10 mesiacov pred
rodič
commit
b295838298
4 zmenil súbory, kde vykonal 121 pridanie a 3 odobranie
  1. 3 3
      config.ini
  2. 3 0
      go.mod
  3. 6 0
      go.sum
  4. 109 0
      reporter/takephoto.go

+ 3 - 3
config.ini

@@ -1,12 +1,12 @@
 [Log]
 ; 日志级别: trace、debug、info、warn、error、fatal、panic
-Level = debug
+Level = info
 ; 输出目标: console(控制台)、file(文件)、all(控制台+文件)
 Target = file
 ; 每个日志文件的最大大下, 以"MB"为单位
-MaxFileSize = 30
+MaxFileSize = 5
 ; 保留的最大备份文件数量
-MaxBackupFileCnts = 5
+MaxBackupFileCnts = 2
 
 [MQTTSrv]
 ; 地址端口

+ 3 - 0
go.mod

@@ -12,6 +12,9 @@ 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/hashicorp/errwrap v1.0.0 // indirect
+	github.com/hashicorp/go-multierror v1.1.1 // indirect
+	github.com/jlaffaye/ftp v0.2.0 // 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

+ 6 - 0
go.sum

@@ -9,6 +9,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/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
 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/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=

+ 109 - 0
reporter/takephoto.go

@@ -1 +1,110 @@
 package reporter
+
+import (
+	"fmt"
+	"os"
+	"path/filepath"
+	"sort"
+	"time"
+
+	"hnyfkj.com.cn/rtu/linux/baseapp"
+	camera1 "hnyfkj.com.cn/rtu/linux/mvs_u_takephoto"
+	"hnyfkj.com.cn/rtu/linux/utils/ftpclient"
+	mcu "hnyfkj.com.cn/rtu/sy_1a/mcu_ctrl_board"
+)
+
+const (
+	PhotoTimeout = 5 * 60 // 拍照超时时间, 单位: 秒
+)
+
+func (r *MQTTReporter) loopTakePhoto() {
+	for {
+		select {
+		case <-mcu.Board.ReqTakePhoCh:
+			r.takePhotoAndUpToFtp()
+		case <-r.ctx.Done():
+			return
+		} // end select
+	} // end for
+}
+
+func (r *MQTTReporter) takePhotoAndUpToFtp() (string, error) {
+	// 1, 开始执行拍照任务
+	mcu.MCBSetCamStateBit(mcu.TakingPhoto)
+	defer mcu.MCBSetCamStateBit(mcu.Idle)
+
+	baseapp.Logger.Infof("[%s] 拍照中, 稍后...", MODULE_NAME)
+
+	r.pruneOldPhotos(baseapp.IMG_DIR, 10) // 清理旧照片(避免磁盘空间不足), 只保留最新的10张
+
+	now := time.Now()
+	imgFile := filepath.Join(baseapp.IMG_DIR, fmt.Sprintf("%s.jpg", now.Format("2006-01-02_15-04-05.000")))
+	_, err := camera1.TakePhoto(camera1.IMG_TYPE_JPG, imgFile, PhotoTimeout)
+	if err != nil {
+		baseapp.Logger.Errorf("[%s] 拍照失败: %v!!", MODULE_NAME, err)
+		return "", err
+	}
+	elapsed := time.Since(now).Milliseconds()
+	baseapp.Logger.Infof("[%s] 拍照完成, 输出到本地文件: %q, 用时: %d毫秒", MODULE_NAME, imgFile, elapsed)
+
+	// 2, 上传照片到服务器
+	ftpclient.FileUploader.Lock() // 上传锁定(多个上传任务并发时, 保证串行执行)
+	defer ftpclient.FileUploader.Unlock()
+
+	mcu.MCBSetCamStateBit(mcu.PhotoUploading)
+	now = time.Now()
+	baseapp.Logger.Infof("[%s] 正在上传照片文件%q到服务器...", MODULE_NAME, imgFile)
+
+	remoteFile, err := ftpclient.UploadFileToFtp(r.ctx, imgFile, CfgServers.Img2Ftp.Address, CfgServers.Img2Ftp.Username, CfgServers.Img2Ftp.Password, ftpclient.DefaultUploadTimeout)
+	if err != nil {
+		baseapp.Logger.Errorf("[%s] 照片文件%q上传失败: %v!!", MODULE_NAME, imgFile, err)
+	} else {
+		os.Remove(imgFile)
+		elapsed = time.Since(now).Milliseconds()
+		baseapp.Logger.Infof("[%s] 照片文件上传成功, 用时: %d毫秒, 本地文件: %q已删除", MODULE_NAME, elapsed, imgFile)
+	}
+
+	return remoteFile, err
+}
+
+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
+}