bug修改

initialize/myData.go

@@ -67,6 +67,10 @@ func StartInductanceTCP() {
 			continue
 		}
 
+		if len(deviceId) != 16 {
+			continue
+		}
+
 		model.Mutex.Lock()
 		if existingConn, exists := model.ConnectionMap[deviceId]; exists {
 			logger.Get().Printf("Connection from %s already exists for deviceId %d, closing new connection\n", remoteAddr, deviceId)
@@ -74,6 +78,7 @@ func StartInductanceTCP() {
 			delete(model.ConnectionMap, deviceId) // 清理旧连接
 		}
 		model.ConnectionMap[deviceId] = conn
+		logger.Get().Printf("lis Accept conn = %s, 添加进入 %s \n", remoteAddr, deviceId)
 		model.Mutex.Unlock()
 
 		// 使用新的协程处理新的连接
@@ -180,17 +185,24 @@ func parseData(data *model.QueueData) {
 	case "fe":
 		switch toString[4:8] { // 开关灯
 		case "0000", "0001", "0002", "0003", "0004", "0005", "0006", "0007":
+			logger.Get().Println(dev.Sn + "-----" + toString)
+			zhi, _ := strconv.Atoi(toString[7:8])
 			if toString[8:12] == "0000" {
-				for i, loop := range dev.DeviceLoops {
-					loop.State = 0
-					dev.DeviceLoops[i] = loop
-				}
+				dev.DeviceLoops[zhi].State = 0
 			} else if toString[8:12] == "ff00" {
-				for i, loop := range dev.DeviceLoops {
-					loop.State = 1
-					dev.DeviceLoops[i] = loop
+				dev.DeviceLoops[zhi].State = 1
+			}
+			for i, device := range reg.Devices {
+				if device.Sn == data.Id {
+					reg.Devices[i] = dev
 				}
 			}
+			regions, err := utils.SaveRegionOnData(reg)
+			err = service.SaveData(regions)
+			if err != nil {
+				logger.Get().Errorln("设备回路状态" + err.Error())
+				return
+			}
 		}
 		switch toString[2:6] {
 		case "0101":
@@ -201,12 +213,15 @@ func parseData(data *model.QueueData) {
 						service.Cron{}.RelayOnOffTimeTaskSn(data.Id)
 					}
 					reg.Devices[i].OnlineTime = time.Now()
-					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
-						}
+					two, err := utils.SixteenTurnsTwo(toString[6:8])
+					if err != nil {
+						logger.Get().Errorln("16转2进制" + err.Error())
+						return
+					}
+					for i2, _ := range reg.Devices[i].DeviceLoops {
+						state := string(two[7-i2])
+						zhi, _ := strconv.Atoi(state)
+						reg.Devices[i].DeviceLoops[i2].State = zhi
 					}
 				}
 			}
@@ -220,7 +235,6 @@ func parseData(data *model.QueueData) {
 	case "01":
 		switch toString[2:6] {
 		case "0336":
-			logger.Get().Println(data.Id + "----" + toString)
 			batteryVoltage, _ := strconv.ParseInt(toString[6:10], 16, 64)
 			batteryCurrent, _ := strconv.ParseInt(toString[10:14], 16, 64)
 			batteryPlateVoltage, _ := strconv.ParseInt(toString[38:42], 16, 64)

service/cron.go

@@ -109,6 +109,7 @@ func (c Cron) RelayOnOffTimeTask() {
 			data := modbus.DeviceLoopSwitch(i, i2)
 			if model.ConnectionMap[key] == nil {
 				logger.Get().Errorf("设备连接丢失")
+				continue
 			}
 			err := utils.WriteDevice(dev.Sn, data, model.ConnectionMap[key])
 			time.Sleep(100 * time.Millisecond)
@@ -189,6 +190,7 @@ func (c Cron) RelayOnOffTimeTaskSn(sn string) {
 		data := modbus.DeviceLoopSwitch(loop1, state)
 		if model.ConnectionMap[sn] == nil {
 			logger.Get().Errorf("设备连接丢失")
+			continue
 		}
 		err = utils.WriteDevice(dev.Sn, data, model.ConnectionMap[sn])
 		time.Sleep(100 * time.Millisecond)

service/device.go

@@ -23,8 +23,6 @@ func SaveData(data []dao.Region) error {
 
 func DeviceLoopSwitch(deviceLoop dao.DeviceLoop) error {
 	data := modbus.DeviceLoopSwitch(deviceLoop.ID, deviceLoop.State)
-	logger.Get().Println(deviceLoop.DeviceId)
-	logger.Get().Println(model.ConnectionMap)
 	if model.ConnectionMap[deviceLoop.DeviceId] == nil {
 		return fmt.Errorf("设备连接丢失")
 	}

static/data.json

@@ -40,8 +40,8 @@
       "deviceId": "JM36xWRZq6PiwmKV",
       "name": "回路3",
       "state": 0,
-      "timeCondition1OnTime": "关闭",
-      "timeCondition1OffTime": "关闭",
+      "timeCondition1OnTime": "00:40",
+      "timeCondition1OffTime": "00:40",
       "timeCondition2OnTime": "关闭",
       "timeCondition2OffTime": "关闭"
      },
@@ -119,8 +119,8 @@
       "deviceId": "JM453Sa4a8pdYdgV",
       "name": "回路1",
       "state": 0,
-      "timeCondition1OnTime": "关闭",
-      "timeCondition1OffTime": "关闭",
+      "timeCondition1OnTime": "日出",
+      "timeCondition1OffTime": "日落",
       "timeCondition2OnTime": "关闭",
       "timeCondition2OffTime": "关闭"
      },
@@ -129,7 +129,7 @@
       "deviceId": "JM453Sa4a8pdYdgV",
       "name": "回路2",
       "state": 0,
-      "timeCondition1OnTime": "关闭",
+      "timeCondition1OnTime": "00:30",
       "timeCondition1OffTime": "关闭",
       "timeCondition2OnTime": "关闭",
       "timeCondition2OffTime": "关闭"
@@ -139,8 +139,8 @@
       "deviceId": "JM453Sa4a8pdYdgV",
       "name": "回路3",
       "state": 0,
-      "timeCondition1OnTime": "关闭",
-      "timeCondition1OffTime": "关闭",
+      "timeCondition1OnTime": "日落",
+      "timeCondition1OffTime": "日出",
       "timeCondition2OnTime": "关闭",
       "timeCondition2OffTime": "关闭"
      },
@@ -178,7 +178,7 @@
       "deviceId": "JM45U0zGDCMhgrxc",
       "name": "回路1",
       "state": 0,
-      "timeCondition1OnTime": "关闭",
+      "timeCondition1OnTime": "00:20",
       "timeCondition1OffTime": "关闭",
       "timeCondition2OnTime": "关闭",
       "timeCondition2OffTime": "关闭"
@@ -392,7 +392,7 @@
     "regionId": 1,
     "name": "维修车间",
     "genre": "八回路控制",
-    "state": 1,
+    "state": 0,
     "isSun": true,
     "loopNumber": 4,
     "onlineTime": "2025-02-12T16:44:19.9551468+08:00",
@@ -451,7 +451,7 @@
     "regionId": 1,
     "name": "维修车间",
     "genre": "八回路控制",
-    "state": 1,
+    "state": 0,
     "isSun": true,
     "loopNumber": 4,
     "onlineTime": "2025-02-12T16:44:20.0199864+08:00",

utils/myTool.go

@@ -2,6 +2,7 @@ package utils
 
 import (
 	"bytes"
+	"encoding/hex"
 	"encoding/json"
 	"fmt"
 	"io"
@@ -190,9 +191,14 @@ func WriteDevice(deviceId string, frame []byte, conn net.Conn) error {
 			if ne, ok := err.(*net.OpError); ok && strings.Contains(strings.ToLower(ne.Err.Error()), "use of closed network connection") {
 				logger.Get().Warnf("Connection is closed, retrying (%d/%d)", attempts+1, maxRetries)
 
+				if attempts == 3 {
+					delete(model.ConnectionMap, deviceId)
+				}
+
 				// 关闭旧连接（尽管这里认为连接已关闭）
 				if err := conn.Close(); err != nil {
 					logger.Get().Errorf("Failed to close connection: %v", err)
+					delete(model.ConnectionMap, deviceId)
 				}
 
 				// 尝试重新建立连接
@@ -210,9 +216,7 @@ func WriteDevice(deviceId string, frame []byte, conn net.Conn) error {
 				if err != nil {
 					logger.Get().Errorf("Reconnect failed: %v", err)
 					time.Sleep(reconnectWait) // 等待一段时间后重试
-					if attempts == 3 {
-						delete(model.ConnectionMap, deviceId)
-					}
+
 					continue // 继续下一次重试
 				}
 				conn = newConn
@@ -304,3 +308,20 @@ func WriteAndReadDevice(frame []byte, conn net.Conn, former, after int) (data []
 	// 返回子切片
 	return buffer[former : n-after], err
 }
+
+func SixteenTurnsTwo(val string) (string, error) {
+	// 将16进制字符串解码为字节切片
+	byte16, err := hex.DecodeString(val)
+	if err != nil {
+		fmt.Println("解码失败:", err)
+		return "", nil
+	}
+
+	// 转换为二进制字符串
+	binStr := ""
+	for _, b := range byte16 {
+		// 使用fmt.Sprintf将每个字节转换为8位的二进制字符串
+		binStr += fmt.Sprintf("%08b", b)
+	}
+	return binStr, err
+}