修改上报

log/info.20250409.log

@@ -0,0 +1,5 @@
+{"level":"info","msg":"MClient.OnConnectHandler:MQTT连接成功","time":"2025-04-09 08:54:22.267"}
+{"level":"info","msg":"MClient.OnConnectHandler:MQTT连接成功","time":"2025-04-09 08:56:54.082"}
+{"level":"info","msg":"MClient.OnConnectHandler:MQTT连接成功","time":"2025-04-09 09:36:46.801"}
+{"level":"info","msg":"MClient.OnConnectHandler:MQTT连接成功","time":"2025-04-09 09:37:21.054"}
+{"level":"info","msg":"MClient.OnConnectHandler:MQTT连接成功","time":"2025-04-09 09:37:54.990"}

service/devmgr.go

@@ -122,18 +122,17 @@ func SetLampBright(radarId []int8, brightness int) {
 					logger.Logger.Errorf("单灯：%v操作失败，错误：%v", newDev.Sn, err)
 					return
 				}
-
-				//上报单灯亮度 根据路数
-				topic := MqttService.GetTopic(TopicLampBrightNess)
-				state := LampBrightNess{Way: id, BrightNess: brightness}
-				jsonData, _ := json.Marshal(state)
-				err = MqttService.Publish(topic, jsonData)
-				if err != nil {
-					logger.Logger.Errorf("MQTT Publish err = %s", err.Error())
-				}
 			}()
 			time.Sleep(time.Millisecond * 150)
 		}
+		//上报单灯亮度 根据路数
+		topic := MqttService.GetTopic(TopicLampBrightNess)
+		state := LampBrightNess{Way: id, BrightNess: brightness}
+		jsonData, _ := json.Marshal(state)
+		err := MqttService.Publish(topic, jsonData)
+		if err != nil {
+			logger.Logger.Errorf("MQTT Publish err = %s", err.Error())
+		}
 	}
 	wg.Wait()
 }

service/serialmgr.go

@@ -4,7 +4,6 @@ import (
 	"encoding/hex"
 	"encoding/json"
 	"errors"
-	"fmt"
 	"github.com/tarm/serial"
 	"log"
 	"smart_tunnel_edge/util/config"
@@ -42,7 +41,7 @@ func GetSerialPort(serialID int8) (*serial.Port, error) {
 }
 
 func OpenSerialPort(portMap map[int8]*config.SerialPort) error {
-	fmt.Println("打开串口...")
+	//fmt.Println("打开串口...")
 	var lastError error
 	// 遍历串口配置
 	for _, port := range portMap {
@@ -74,7 +73,7 @@ func OpenSerialPort(portMap map[int8]*config.SerialPort) error {
 }
 
 func listenPort(portCode int8, port *serial.Port) {
-	fmt.Println("监听串口...")
+	//fmt.Println("监听串口...")
 	buf := make([]byte, 512)
 	for {
 		// 读取数据

timer/task.go

@@ -25,40 +25,5 @@ func TimeTasks() {
 			}
 		}
 	})
-
-	//_ = c.AddFunc("0/5 * * * * ?", func() {
-	//上报回路状态
-	//topic := service.MqttService.GetTopic(service.TopicLampBrightNess)
-	//state := service.LampBrightNess{Sn: "yyy", BrightNess: 60}
-	//jsonData, _ := json.Marshal(state)
-	//err := service.MqttService.Publish(topic, jsonData)
-	//if err != nil {
-	//	logger.Logger.Errorf("MQTT Publish err = %s", err.Error())
-	//}
-
-	//for _, dev := range config.DevConfig.EnvDevs {
-	//	if dev.Name == "电感" {
-	//		port, _ := service.GetSerialPort(dev.SerialId)
-	//		decodeString, _ := hex.DecodeString("0303000000284436")
-	//		port.Write(decodeString)
-	//		xxx := "010350004c004c004b00ea00ea00ea06f206e606d3000014ab000000"
-	//		shiDu, _ := strconv.ParseInt(xxx[42:50], 16, 0)
-	//
-	//		data := service.InductanceData{Sn: "99999", TotalPower: shiDu}
-	//		jsonData, _ := json.Marshal(data)
-	//		topic := service.MqttService.GetTopic(service.TopicGatherDataDG)
-	//		err := service.MqttService.Publish(topic, jsonData)
-	//		if err != nil {
-	//			logger.Logger.Errorf("MQTT Publish err = %s", err.Error())
-	//			continue
-	//		}
-	//
-	//		fmt.Println("+++++++", shiDu)
-	//	}
-	//}
-	//dataPack := envSensor.DataPack{Address: "01", Start: []byte{0x00, 0x00}, DataLen: []byte{0x00, 0x28}}
-	//command := dataPack.GetEnvGatherCommand()
-	//fmt.Println("命令：", hex.EncodeToString(command.Bytes()))
-	//})
 	c.Start()
 }

util/config/config.go

@@ -111,7 +111,7 @@ type SerialPort struct {
 }
 
 func LoadDevConfig() error {
-	fmt.Println("加载配置...")
+	//fmt.Println("加载配置...")
 	// 读取配置文件
 	data, err := ioutil.ReadFile("./dev/devs.json")
 	if err != nil {