新 存储按ip

initialize/myData.go

@@ -102,7 +102,7 @@ func (o *ModbusHandler) ReadAndHandle(conn net.Conn, remoteAddr string) {
 				logger.Get().Errorf("读取错误: %s\n conn: %s", err, conn.RemoteAddr().String())
 			}
 
-			model.ConnectionMap1.Delete(conn.RemoteAddr().String())
+			model.ConnectionMap1.Delete(remoteAddr)
 			return
 		}
 		queueData := model.QueueData{

logs/app.log

@@ -1 +1 @@
-app.log.20250324.log
+app.log.20250401.log

service/cron.go

@@ -1,7 +1,6 @@
 package service
 
 import (
-	"fmt"
 	"net"
 	"server/logger"
 	"server/modbus"
@@ -308,12 +307,7 @@ func ss(on1, off1, on2, off2 string) (int, error) {
 		timeControls = append(timeControls, TimeControl{start: times[i].value, end: times[i+1].value, state: stateTransition(times[i].key)})
 	}
 
-	for _, control := range timeControls {
-		fmt.Printf("%s : %s : %d\n", control.start, control.end, control.state)
-	}
-
 	// 在恢复时检查状态
 	state := getDeviceState(timeControls, deviceRecoveryTime)
-	fmt.Printf("%s  %d\n", timeControls, state)
 	return state, nil
 }

static/data.json

@@ -1,7 +1,7 @@
 [
   {
     "id": 1,
-    "name": "生活区",
+    "name": "污水厂",
     "subRegion": null,
     "devices": [
       {
@@ -11,16 +11,16 @@
         "regionId": 1,
         "name": "维修车间",
         "genre": "八回路控制",
-        "state": 1,
+        "state": 0,
         "isSun": true,
         "loopNumber": 8,
-        "onlineTime": "2025-03-24T10:21:00.0128474+08:00",
+        "onlineTime": "2025-03-25T08:44:01.0059016+08:00",
         "deviceLoops": [
           {
             "id": 1,
             "deviceId": "JM36xWRZq6PiwmKV",
             "name": "回路12",
-            "state": 1,
+            "state": 0,
             "timeCondition1OnTime": "09:50",
             "timeCondition1OffTime": "17:30",
             "timeCondition2OnTime": "关闭",
@@ -30,7 +30,7 @@
             "id": 2,
             "deviceId": "JM36xWRZq6PiwmKV",
             "name": "回路2",
-            "state": 1,
+            "state": 0,
             "timeCondition1OnTime": "09:50",
             "timeCondition1OffTime": "17:30",
             "timeCondition2OnTime": "关闭",
@@ -40,7 +40,7 @@
             "id": 3,
             "deviceId": "JM36xWRZq6PiwmKV",
             "name": "回路3",
-            "state": 1,
+            "state": 0,
             "timeCondition1OnTime": "09:50",
             "timeCondition1OffTime": "17:30",
             "timeCondition2OnTime": "关闭",
@@ -50,7 +50,7 @@
             "id": 4,
             "deviceId": "JM36xWRZq6PiwmKV",
             "name": "回路4",
-            "state": 1,
+            "state": 0,
             "timeCondition1OnTime": "09:50",
             "timeCondition1OffTime": "17:30",
             "timeCondition2OnTime": "关闭",
@@ -60,7 +60,7 @@
             "id": 5,
             "deviceId": "JM36xWRZq6PiwmKV",
             "name": "回路5",
-            "state": 1,
+            "state": 0,
             "timeCondition1OnTime": "00:50",
             "timeCondition1OffTime": "01:20",
             "timeCondition2OnTime": "关闭",
@@ -70,7 +70,7 @@
             "id": 6,
             "deviceId": "JM36xWRZq6PiwmKV",
             "name": "回路6",
-            "state": 1,
+            "state": 0,
             "timeCondition1OnTime": "09:50",
             "timeCondition1OffTime": "17:30",
             "timeCondition2OnTime": "关闭",
@@ -80,7 +80,7 @@
             "id": 7,
             "deviceId": "JM36xWRZq6PiwmKV",
             "name": "回路7",
-            "state": 1,
+            "state": 0,
             "timeCondition1OnTime": "09:50",
             "timeCondition1OffTime": "17:30",
             "timeCondition2OnTime": "关闭",
@@ -90,7 +90,7 @@
             "id": 8,
             "deviceId": "JM36xWRZq6PiwmKV",
             "name": "回路8",
-            "state": 1,
+            "state": 0,
             "timeCondition1OnTime": "09:50",
             "timeCondition1OffTime": "17:30",
             "timeCondition2OnTime": "关闭",
@@ -111,10 +111,10 @@
         "regionId": 1,
         "name": "洗车房",
         "genre": "四回路控制",
-        "state": 1,
+        "state": 0,
         "isSun": false,
         "loopNumber": 4,
-        "onlineTime": "2025-03-24T10:21:01.0057839+08:00",
+        "onlineTime": "2025-03-25T08:44:00.005672+08:00",
         "deviceLoops": [
           {
             "id": 1,
@@ -285,6 +285,6 @@
         }
       }
     ],
-    "version": 12886
+    "version": 18329
   }
 ]

utils/myTool.go

@@ -463,7 +463,13 @@ func WriteDevice(frame []byte, conn net.Conn) error {
 	_, err := conn.Write(frame)
 	if err != nil {
 		defer conn.Close()
-		model.ConnectionMap1.Delete(conn.RemoteAddr().String())
+		// 解析远程地址
+		addr, err := net.ResolveTCPAddr("tcp", conn.RemoteAddr().String())
+		if err != nil {
+			// 处理错误...
+			logger.Get().Errorf("解析错误 conn = %s\n", addr.IP.String())
+		}
+		model.ConnectionMap1.Delete(addr.IP.String())
 		return err
 	}
 	return nil