Browse Source

定时保存到文件

xu 1 week ago
parent
commit
c8e4039c87
4 changed files with 35 additions and 32 deletions
  1. 5 4
      initialize/myData.go
  2. 1 1
      logs/app.log
  3. 2 0
      service/device.go
  4. 27 27
      static/data.json

+ 5 - 4
initialize/myData.go

@@ -88,19 +88,20 @@ func StartInductanceTCP() {
 }
 
 func (o *ModbusHandler) ReadAndHandle(conn net.Conn, remoteAddr string) {
+	defer conn.Close()
 	for {
 		buffer := make([]byte, 1024)
 		n, err := conn.Read(buffer)
 		if err != nil && err != io.EOF {
 			if isConnReset(err) {
-				logger.Get().Error("连接被远程主机强制关闭")
+				logger.Get().Errorf("连接被远程主机强制关闭conn: %s", conn.RemoteAddr().String())
 			} else if os.IsTimeout(err) {
-				logger.Get().Error("读取操作超时")
+				logger.Get().Errorf("读取操作超时conn: %s", conn.RemoteAddr().String())
 			} else {
 				// 处理其他类型的错误
-				logger.Get().Errorf("读取错误: %s\n", err)
+				logger.Get().Errorf("读取错误: %s\n conn: %s", err, conn.RemoteAddr().String())
 			}
-			defer conn.Close()
+
 			model.ConnectionMap1.Delete(conn.RemoteAddr().String())
 			return
 		}

+ 1 - 1
logs/app.log

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

+ 2 - 0
service/device.go

@@ -32,6 +32,7 @@ func DeviceSave(device dao.Device) error {
 	if err != nil {
 		return err
 	}
+	go utils.SaveData("./static/data.json", regions)
 	return nil
 }
 
@@ -49,6 +50,7 @@ func DevicesSave(devices []dao.Device) error {
 	if err != nil {
 		return err
 	}
+	go utils.SaveData("./static/data.json", regions)
 	// Remove the redundant return err statement.
 	return nil // Return nil to indicate success
 }

+ 27 - 27
static/data.json

@@ -14,15 +14,15 @@
         "state": 1,
         "isSun": true,
         "loopNumber": 8,
-        "onlineTime": "2025-03-23T14:29:00.011787+08:00",
+        "onlineTime": "2025-03-24T10:21:00.0128474+08:00",
         "deviceLoops": [
           {
             "id": 1,
             "deviceId": "JM36xWRZq6PiwmKV",
             "name": "回路12",
-            "state": 0,
-            "timeCondition1OnTime": "16:00",
-            "timeCondition1OffTime": "08:10",
+            "state": 1,
+            "timeCondition1OnTime": "09:50",
+            "timeCondition1OffTime": "17:30",
             "timeCondition2OnTime": "关闭",
             "timeCondition2OffTime": "关闭"
           },
@@ -30,9 +30,9 @@
             "id": 2,
             "deviceId": "JM36xWRZq6PiwmKV",
             "name": "回路2",
-            "state": 0,
-            "timeCondition1OnTime": "16:00",
-            "timeCondition1OffTime": "08:10",
+            "state": 1,
+            "timeCondition1OnTime": "09:50",
+            "timeCondition1OffTime": "17:30",
             "timeCondition2OnTime": "关闭",
             "timeCondition2OffTime": "关闭"
           },
@@ -40,9 +40,9 @@
             "id": 3,
             "deviceId": "JM36xWRZq6PiwmKV",
             "name": "回路3",
-            "state": 0,
-            "timeCondition1OnTime": "16:00",
-            "timeCondition1OffTime": "08:10",
+            "state": 1,
+            "timeCondition1OnTime": "09:50",
+            "timeCondition1OffTime": "17:30",
             "timeCondition2OnTime": "关闭",
             "timeCondition2OffTime": "关闭"
           },
@@ -50,9 +50,9 @@
             "id": 4,
             "deviceId": "JM36xWRZq6PiwmKV",
             "name": "回路4",
-            "state": 0,
-            "timeCondition1OnTime": "16:00",
-            "timeCondition1OffTime": "08:10",
+            "state": 1,
+            "timeCondition1OnTime": "09:50",
+            "timeCondition1OffTime": "17:30",
             "timeCondition2OnTime": "关闭",
             "timeCondition2OffTime": "关闭"
           },
@@ -60,9 +60,9 @@
             "id": 5,
             "deviceId": "JM36xWRZq6PiwmKV",
             "name": "回路5",
-            "state": 0,
-            "timeCondition1OnTime": "16:00",
-            "timeCondition1OffTime": "08:10",
+            "state": 1,
+            "timeCondition1OnTime": "00:50",
+            "timeCondition1OffTime": "01:20",
             "timeCondition2OnTime": "关闭",
             "timeCondition2OffTime": "关闭"
           },
@@ -70,9 +70,9 @@
             "id": 6,
             "deviceId": "JM36xWRZq6PiwmKV",
             "name": "回路6",
-            "state": 0,
-            "timeCondition1OnTime": "16:00",
-            "timeCondition1OffTime": "08:10",
+            "state": 1,
+            "timeCondition1OnTime": "09:50",
+            "timeCondition1OffTime": "17:30",
             "timeCondition2OnTime": "关闭",
             "timeCondition2OffTime": "关闭"
           },
@@ -80,9 +80,9 @@
             "id": 7,
             "deviceId": "JM36xWRZq6PiwmKV",
             "name": "回路7",
-            "state": 0,
-            "timeCondition1OnTime": "16:00",
-            "timeCondition1OffTime": "08:10",
+            "state": 1,
+            "timeCondition1OnTime": "09:50",
+            "timeCondition1OffTime": "17:30",
             "timeCondition2OnTime": "关闭",
             "timeCondition2OffTime": "关闭"
           },
@@ -90,9 +90,9 @@
             "id": 8,
             "deviceId": "JM36xWRZq6PiwmKV",
             "name": "回路8",
-            "state": 0,
-            "timeCondition1OnTime": "16:00",
-            "timeCondition1OffTime": "08:10",
+            "state": 1,
+            "timeCondition1OnTime": "09:50",
+            "timeCondition1OffTime": "17:30",
             "timeCondition2OnTime": "关闭",
             "timeCondition2OffTime": "关闭"
           }
@@ -114,7 +114,7 @@
         "state": 1,
         "isSun": false,
         "loopNumber": 4,
-        "onlineTime": "2025-03-23T14:29:01.0073454+08:00",
+        "onlineTime": "2025-03-24T10:21:01.0057839+08:00",
         "deviceLoops": [
           {
             "id": 1,
@@ -285,6 +285,6 @@
         }
       }
     ],
-    "version": 9377
+    "version": 12886
   }
 ]