恢复在线监测重连1

api/device.go

@@ -122,3 +122,14 @@ func UpdateRegisterAddress(c *gin.Context) {
 	}
 	model.Ok(c)
 }
+
+func CommandPub(c *gin.Context) {
+	var req model.Command
+	err := c.ShouldBindJSON(&req)
+	if err != nil {
+		model.FailWithMessage(err.Error(), c)
+		return
+	}
+	service.CommandPub(req.Id, req.Value)
+	model.Ok(c)
+}

initialize/myData.go

@@ -199,17 +199,20 @@ func parseData(data *model.QueueData) {
 					reg.Devices[i].State = 1
 					reg.Devices[i].OnlineTime = time.Now()
 					service.Cron{}.RelayOnOffTimeTaskSn(device.Sn)
-				}
-				for i2, _ := range device.DeviceLoops {
-					if toString[6:8] == "ff" || toString[6:8] == "0f" {
-						device.DeviceLoops[i2].State = 1
-					} else if toString[6:8] == "00" {
-						device.DeviceLoops[i2].State = 0
+					for i2, _ := range device.DeviceLoops {
+						if toString[6:8] == "ff" || toString[6:8] == "0f" {
+							device.DeviceLoops[i2].State = 1
+						} else if toString[6:8] == "00" {
+							device.DeviceLoops[i2].State = 0
+						}
 					}
+					logger.Get().Println(reg.Devices[i])
 				}
 			}
 			regions, err := utils.SaveRegionOnData(reg)
+			model.Mutex.Lock()
 			err = service.SaveData(regions)
+			model.Mutex.Unlock()
 			if err != nil {
 				logger.Get().Errorln("设备回路状态" + err.Error())
 				return

modbus/operate.go

@@ -1,6 +1,7 @@
 package modbus
 
 import (
+	"encoding/hex"
 	"encoding/json"
 	"os"
 	"server/dao"
@@ -32,6 +33,19 @@ func GetDeviceInfo() {
 	}
 }
 
+// CommandPub 命令发布
+func CommandPub(id, hexStr string) {
+	bytes, err := hex.DecodeString(hexStr)
+	if err != nil {
+		logger.Get().Errorln("Error decoding hex string:", err)
+		return
+	}
+	err = utils.WriteDevice(bytes, model.ConnectionMap[id])
+	if err != nil {
+		return
+	}
+}
+
 // DealWithOffline 处理离线
 func DealWithOffline() {
 	regions, err := utils.LoadData()

model/common.go

@@ -26,3 +26,8 @@ type DevicesRequest struct {
 	Devices []dao.Device `json:"devices"`
 	State   int          `json:"state"`
 }
+
+type Command struct {
+	Id    string `json:"id"`
+	Value string `json:"value"`
+}

router/router.go

@@ -21,6 +21,7 @@ func InitRouter() *gin.Engine {
 		Group.GET("getOnlineDevice", api.GetOnlineDevice)
 		Group.GET("getSunDevices", api.GetSunDevices)
 		Group.PUT("updateRegisterAddress", api.UpdateRegisterAddress)
+		Group.POST("commandPub", api.CommandPub)
 	}
 	return router
 }

service/device.go

@@ -107,3 +107,7 @@ func UpdateRegisterAddress(deviceId string) error {
 	}
 	return nil
 }
+
+func CommandPub(id, hexStr string) {
+	modbus.CommandPub(id, hexStr)
+}

utils/myTool.go

@@ -150,7 +150,27 @@ func SaveData(path string, parameter interface{}) error {
 
 	// 使用原子操作替换原始文件
 	if err := os.Rename(tempFile.Name(), path); err != nil {
-		return fmt.Errorf("替换文件失败: %v", err)
+		// 将结构体转换为JSON字节切片
+		jsonBytes, err := json.Marshal(parameter)
+		if err != nil {
+			return fmt.Errorf("Error marshalling to JSON: %v\n", err)
+		}
+
+		// 将字节切片转换为字符串
+		jsonString := string(jsonBytes)
+		// 打开或创建文件，并设置标志以覆盖原有内容
+		file, err := os.OpenFile("output.txt", os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0644)
+		if err != nil {
+			fmt.Printf("无法打开或创建文件: %v\n", err)
+		}
+		defer file.Close() // 确保在main函数结束时关闭文件
+
+		// 写入数据到文件
+		_, err = file.WriteString(string(jsonString))
+		if err != nil {
+			fmt.Printf("写入文件失败: %v\n", err)
+		}
+		//return fmt.Errorf("替换文件失败,直接写入: %v", err)
 	}
 
 	return nil