niujiuru 1 ヶ月 前
親
コミット
30ade60bd4
3 ファイル変更、12 行追加、12 行削除
  1. 2 0
      mqtt_reporter/config.go
  2. 1 8
      mqtt_reporter/photo.go
  3. 9 4
      mqtt_reporter/reporter.go

+ 2 - 0
mqtt_reporter/config.go

@@ -24,6 +24,7 @@ type MQTTServer struct {
 	Protocol      string `json:"protocol"`
 	DataBackfill  bool   `json:"dataBackfill"`
 	BrokerAddress string `json:"brokerAddress"`
+	Qos           byte   `json:"qos"`
 	Username      string `json:"username"`
 	Password      string `json:"password"`
 	Topics        Topics `json:"topics"`
@@ -64,6 +65,7 @@ const defaultConfig = `{
       "brokerAddress": "tcp://8.136.98.49:61883",
       "username": "user",
       "password": "f335bf402c655ee5fd2b5300905124e",
+			"qos": 1,
       "topics": {
         "pub": "/yfkj/cbd/pub/${id}/",
         "sub": "/yfkj/cbd/sub/${id}/",

+ 1 - 8
mqtt_reporter/photo.go

@@ -31,18 +31,13 @@ func (r *MQTTReporter) StartImagWorker() {
 	}()
 }
 
-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")))
+	imgFile := filepath.Join(baseapp.IMG_DIR, fmt.Sprintf("%s-%s.jpg", r.deviceID, start.Format("20060102-150405")))
 	_, err := local_rpc.TakePhoto(r.ctx, imgFile)
 	if err != nil {
 		baseapp.Logger.Errorf("[%s] 拍照失败: %v!!", MODULE_NAME, err)
@@ -51,8 +46,6 @@ func (r *MQTTReporter) takePhotoAndUploadToServers() bool {
 	elapsed := time.Since(start).Milliseconds()
 	baseapp.Logger.Infof("[%s] 拍照完成, 输出到本地文件: %q, 用时: %d毫秒", MODULE_NAME, imgFile, elapsed)
 
-	saveLastPhotoDate()
-
 	r.uploadPhotoToServers(imgFile)
 
 	return true

+ 9 - 4
mqtt_reporter/reporter.go

@@ -12,8 +12,8 @@ import (
 )
 
 const (
-	MODULE_NAME = "Reporter"
-	DefaultQoS  = 1
+	MODULE_NAME      = "Reporter"
+	DefaultQoS  byte = 1
 )
 
 var Reporter *MQTTReporter
@@ -106,6 +106,11 @@ func (r *MQTTReporter) initYFKJClient(server MQTTServer, devID string) error {
 		return fmt.Errorf("服务器名称重复")
 	}
 
+	qos := DefaultQoS
+	if server.Qos == MqttQos0 || server.Qos == MqttQos1 || server.Qos != MqttQos2 {
+		qos = server.Qos
+	}
+
 	config := ClientConfig{
 		Broker:       server.BrokerAddress,
 		BrokerName:   server.Name,
@@ -114,7 +119,7 @@ func (r *MQTTReporter) initYFKJClient(server MQTTServer, devID string) error {
 		Password:     server.Password,
 		WillTopic:    server.Topics.Offline,
 		WillPayload:  fmt.Sprintf(`{"cmd":"offline","ext":{"imei":"%s"}}`, devID),
-		WillQos:      DefaultQoS,
+		WillQos:      qos,
 		WillRetained: false,
 	}
 
@@ -130,7 +135,7 @@ func (r *MQTTReporter) initYFKJClient(server MQTTServer, devID string) error {
 	}
 
 	subTopic := server.Topics.Sub
-	err = client.Subscribe(subTopic, DefaultQoS, yfkj_handleMessage)
+	err = client.Subscribe(subTopic, qos, yfkj_handleMessage)
 	if err != nil {
 		client.Close()
 		return fmt.Errorf("主题%s订阅失败: %w", subTopic, err)