Merge remote-tracking branch 'origin/master'

go.mod

@@ -1,6 +1,6 @@
 module server
 
-go 1.23.0
+go 1.21.4
 
 require (
 	github.com/gin-gonic/gin v1.10.0
@@ -27,7 +27,6 @@ require (
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/pelletier/go-toml/v2 v2.2.3 // indirect
-	github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/ugorji/go/codec v1.2.12 // indirect
 	golang.org/x/arch v0.11.0 // indirect

go.sum

@@ -64,8 +64,6 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07 h1:UyzmZLoiDWMRywV4DUYb9Fbt8uiOSooupjTq10vpvnU=
-github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA=
 github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
 github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
 github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE=

initialize/myData.go

@@ -67,6 +67,7 @@ func StartInductanceTCP() {
 			model.Mutex.Unlock()
 			continue
 		}
+		fmt.Println(conn)
 		deviceId, err := GetDeviceId(conn)
 		if err != nil {
 			log.Println("Error getting device ID:", err)
@@ -180,6 +181,7 @@ func parseData(data *model.QueueData) {
 		return
 	}
 	toString := hex.EncodeToString(data.Value)
+	fmt.Println(data.Id + "----" + toString)
 	switch toString[0:2] {
 	case "fe":
 		switch toString[4:8] { // 开关灯
@@ -196,6 +198,22 @@ func parseData(data *model.QueueData) {
 				}
 			}
 		}
+		switch toString[2:6] {
+		case "0101":
+			for i, device := range reg.Devices {
+				if device.Sn == data.Id {
+					reg.Devices[i].State = 1
+					reg.Devices[i].OnlineTime = time.Now()
+				}
+			}
+			regions, err := utils.SaveRegionOnData(reg)
+			fmt.Println(regions)
+			err = service.SaveData(regions)
+			if err != nil {
+				fmt.Println(err)
+				return
+			}
+		}
 	case "11":
 		switch toString[2:6] {
 		case "0336":
@@ -237,7 +255,6 @@ func parseData(data *model.QueueData) {
 			fmt.Println("Error decoding bytes:", err)
 			return
 		}
-		fmt.Println(string(bytes) + time.Now().String())
 		for i, device := range reg.Devices {
 			if device.Sn == string(bytes) {
 				reg.Devices[i].State = 1

modbus/instruction.go

@@ -73,3 +73,16 @@ func UpdateRegisterAddress() (data []byte) {
 	data = append(data, byte(crc16>>8))
 	return
 }
+
+func ReadDeviceInfo(number int) (data []byte) {
+	data = append(data, 0xFE)
+	data = append(data, 0x01)
+	data = append(data, 0x00)
+	data = append(data, 0x00)
+	data = append(data, 0x00)
+	data = append(data, byte(number))
+	crc16 := utils.CRC16(data)
+	data = append(data, byte(crc16&0xFF))
+	data = append(data, byte(crc16>>8))
+	return
+}

modbus/operate.go

@@ -7,17 +7,26 @@ import (
 )
 
 // GetSunPowerInfo 获取太阳能信息
-func GetSunPowerInfo() error {
+func GetSunPowerInfo() {
+	for _, conn := range model.ConnectionMap {
+		//_, dev, err := utils.GetDataByDeviceId(id)
+		utils.WriteDevice(SolarEnergyData(), conn)
+		//if dev.IsSun && dev.State == 1 { //打开  并且在线
+		//	err = utils.WriteDevice(SolarEnergyData(), conn)
+		//	if err != nil {
+		//		return err
+		//	}
+		//}
+	}
+	//return nil
+}
+
+// GetDeviceInfo 获取设备信息
+func GetDeviceInfo() {
 	for id, conn := range model.ConnectionMap {
-		_, dev, err := utils.GetDataByDeviceId(id)
-		if dev.IsSun && dev.State == 1 { //打开  并且在线
-			err = utils.WriteDevice(SolarEnergyData(), conn)
-			if err != nil {
-				return err
-			}
-		}
+		_, dev, _ := utils.GetDataByDeviceId(id)
+		utils.WriteDevice(ReadDeviceInfo(dev.LoopNumber), conn)
 	}
-	return nil
 }
 
 // DealWithOffline 处理离线

service/cron.go

@@ -22,9 +22,9 @@ func (c Cron) RelayOnOffTimeTask() {
 	}
 	relayMap := make(map[string]map[int]int)
 	for _, d := range devices {
-		if d.State == 0 {
-			continue
-		}
+		//if d.State == 0 {
+		//	continue
+		//}
 		tmp, isExist := relayMap[d.Sn]
 		if !isExist { // 回路id  回路状态
 			tmp = make(map[int]int)
@@ -102,7 +102,6 @@ func (c Cron) RelayOnOffTimeTask() {
 			}
 		}
 	}
-	fmt.Println(relayMap)
 	for key, value := range relayMap {
 
 		reg, dev, err := utils.GetDataByDeviceId(key)

service/device.go

@@ -12,7 +12,10 @@ func GetDeviceList() {
 	fmt.Println("Get device list.")
 }
 
-func SaveData(data interface{}) error {
+func SaveData(data []dao.Region) error {
+	if len(data) == 0 {
+		return fmt.Errorf("数据不能为空")
+	}
 	err := utils.SaveData("static/data.json", data)
 	if err != nil {
 		return err
@@ -22,6 +25,8 @@ func SaveData(data interface{}) error {
 
 func DeviceLoopSwitch(deviceLoop dao.DeviceLoop) error {
 	data := modbus.DeviceLoopSwitch(deviceLoop.ID, deviceLoop.State)
+	fmt.Println(deviceLoop.DeviceId)
+	fmt.Println(model.ConnectionMap)
 	if model.ConnectionMap[deviceLoop.DeviceId] == nil {
 		return fmt.Errorf("设备连接丢失")
 	}

static/data.json

@@ -6,18 +6,18 @@
     "devices": [
       {
         "id": 1,
-        "sn": "JM36g0RM0ivegAGK",
+        "sn": "JM36xWRZq6PiwmKV",
         "regionId": 1,
-        "name": "测试",
+        "name": "维修车间",
         "genre": "八回路控制",
-        "state": 0,
+        "state": 1,
         "isSun": true,
         "loopNumber": 8,
-        "onlineTime": "2024-12-02T15:15:59.2168898+08:00",
+        "onlineTime": "2025-01-19T09:43:59.91502361+08:00",
         "deviceLoops": [
           {
             "id": 1,
-            "deviceId": "JM36g0RM0ivegAGK",
+            "deviceId": "JM36xWRZq6PiwmKV",
             "name": "回路12",
             "state": 0,
             "timeCondition1OnTime": "关闭",
@@ -27,7 +27,7 @@
           },
           {
             "id": 2,
-            "deviceId": "JM36g0RM0ivegAGK",
+            "deviceId": "JM36xWRZq6PiwmKV",
             "name": "回路2",
             "state": 0,
             "timeCondition1OnTime": "关闭",
@@ -37,7 +37,7 @@
           },
           {
             "id": 3,
-            "deviceId": "JM36g0RM0ivegAGK",
+            "deviceId": "JM36xWRZq6PiwmKV",
             "name": "回路3",
             "state": 0,
             "timeCondition1OnTime": "关闭",
@@ -47,7 +47,7 @@
           },
           {
             "id": 4,
-            "deviceId": "JM36g0RM0ivegAGK",
+            "deviceId": "JM36xWRZq6PiwmKV",
             "name": "回路4",
             "state": 0,
             "timeCondition1OnTime": "关闭",
@@ -57,7 +57,7 @@
           },
           {
             "id": 5,
-            "deviceId": "JM36g0RM0ivegAGK",
+            "deviceId": "JM36xWRZq6PiwmKV",
             "name": "回路5",
             "state": 0,
             "timeCondition1OnTime": "关闭",
@@ -67,7 +67,7 @@
           },
           {
             "id": 6,
-            "deviceId": "JM36g0RM0ivegAGK",
+            "deviceId": "JM36xWRZq6PiwmKV",
             "name": "回路6",
             "state": 0,
             "timeCondition1OnTime": "关闭",
@@ -77,7 +77,7 @@
           },
           {
             "id": 7,
-            "deviceId": "JM36g0RM0ivegAGK",
+            "deviceId": "JM36xWRZq6PiwmKV",
             "name": "回路7",
             "state": 0,
             "timeCondition1OnTime": "关闭",
@@ -87,7 +87,7 @@
           },
           {
             "id": 8,
-            "deviceId": "JM36g0RM0ivegAGK",
+            "deviceId": "JM36xWRZq6PiwmKV",
             "name": "回路8",
             "state": 0,
             "timeCondition1OnTime": "关闭",
@@ -97,7 +97,66 @@
           }
         ],
         "sun": {
-          "deviceId": "JM36g0RM0ivegAGK",
+          "deviceId": "JM36xWRZq6PiwmKV",
+          "batteryVoltage": 0,
+          "batteryCurrent": 0,
+          "batteryPlateVoltage": 0
+        }
+      },
+      {
+        "id": 3,
+        "sn": "JM453Sa4a8pdYdgV",
+        "regionId": 1,
+        "name": "洗车房",
+        "genre": "四回路控制",
+        "state": 1,
+        "isSun": false,
+        "loopNumber": 4,
+        "onlineTime": "2025-01-19T09:46:00.028035846+08:00",
+        "deviceLoops": [
+          {
+            "id": 1,
+            "deviceId": "JM453Sa4a8pdYdgV",
+            "name": "回路1",
+            "state": 0,
+            "timeCondition1OnTime": "关闭",
+            "timeCondition1OffTime": "关闭",
+            "timeCondition2OnTime": "关闭",
+            "timeCondition2OffTime": "关闭"
+          },
+          {
+            "id": 2,
+            "deviceId": "JM453Sa4a8pdYdgV",
+            "name": "回路2",
+            "state": 0,
+            "timeCondition1OnTime": "关闭",
+            "timeCondition1OffTime": "关闭",
+            "timeCondition2OnTime": "关闭",
+            "timeCondition2OffTime": "关闭"
+          },
+          {
+            "id": 3,
+            "deviceId": "JM453Sa4a8pdYdgV",
+            "name": "回路3",
+            "state": 0,
+            "timeCondition1OnTime": "关闭",
+            "timeCondition1OffTime": "关闭",
+            "timeCondition2OnTime": "关闭",
+            "timeCondition2OffTime": "关闭"
+          },
+          {
+            "id": 4,
+            "deviceId": "JM453Sa4a8pdYdgV",
+            "name": "回路4",
+            "state": 0,
+            "timeCondition1OnTime": "关闭",
+            "timeCondition1OffTime": "关闭",
+            "timeCondition2OnTime": "关闭",
+            "timeCondition2OffTime": "关闭"
+          }
+        ],
+        "sun": {
+          "deviceId": "",
           "batteryVoltage": 0,
           "batteryCurrent": 0,
           "batteryPlateVoltage": 0
@@ -105,18 +164,136 @@
       },
       {
         "id": 2,
-        "sn": "JM45hGVLg03gz1Kh",
+        "sn": "JM45U0zGDCMhgrxc",
+        "regionId": 1,
+        "name": "污泥厂大配电房",
+        "genre": "四回路控制",
+        "state": 1,
+        "isSun": false,
+        "loopNumber": 4,
+        "onlineTime": "2025-01-19T09:46:00.027293637+08:00",
+        "deviceLoops": [
+          {
+            "id": 1,
+            "deviceId": "JM45U0zGDCMhgrxc",
+            "name": "回路1",
+            "state": 0,
+            "timeCondition1OnTime": "关闭",
+            "timeCondition1OffTime": "关闭",
+            "timeCondition2OnTime": "关闭",
+            "timeCondition2OffTime": "关闭"
+          },
+          {
+            "id": 2,
+            "deviceId": "JM45U0zGDCMhgrxc",
+            "name": "回路2",
+            "state": 0,
+            "timeCondition1OnTime": "关闭",
+            "timeCondition1OffTime": "关闭",
+            "timeCondition2OnTime": "关闭",
+            "timeCondition2OffTime": "关闭"
+          },
+          {
+            "id": 3,
+            "deviceId": "JM45U0zGDCMhgrxc",
+            "name": "回路3",
+            "state": 0,
+            "timeCondition1OnTime": "关闭",
+            "timeCondition1OffTime": "关闭",
+            "timeCondition2OnTime": "关闭",
+            "timeCondition2OffTime": "关闭"
+          },
+          {
+            "id": 4,
+            "deviceId": "JM45U0zGDCMhgrxc",
+            "name": "回路4",
+            "state": 0,
+            "timeCondition1OnTime": "关闭",
+            "timeCondition1OffTime": "关闭",
+            "timeCondition2OnTime": "关闭",
+            "timeCondition2OffTime": "关闭"
+          }
+        ],
+        "sun": {
+          "deviceId": "",
+          "batteryVoltage": 0,
+          "batteryCurrent": 0,
+          "batteryPlateVoltage": 0
+        }
+      },
+      {
+        "id": 4,
+        "sn": "JM45S67eqnSKueAK",
         "regionId": 1,
-        "name": "测试31",
+        "name": "生活区",
         "genre": "四回路控制",
-        "state": 0,
+        "state": 1,
         "isSun": false,
         "loopNumber": 4,
-        "onlineTime": "2024-12-02T15:13:28.6958017+08:00",
+        "onlineTime": "2025-01-19T09:44:00.051568026+08:00",
+        "deviceLoops": [
+          {
+            "id": 1,
+            "deviceId": "JM45S67eqnSKueAK",
+            "name": "回路1",
+            "state": 0,
+            "timeCondition1OnTime": "关闭",
+            "timeCondition1OffTime": "关闭",
+            "timeCondition2OnTime": "关闭",
+            "timeCondition2OffTime": "关闭"
+          },
+          {
+            "id": 2,
+            "deviceId": "JM45S67eqnSKueAK",
+            "name": "回路2",
+            "state": 0,
+            "timeCondition1OnTime": "关闭",
+            "timeCondition1OffTime": "关闭",
+            "timeCondition2OnTime": "关闭",
+            "timeCondition2OffTime": "关闭"
+          },
+          {
+            "id": 3,
+            "deviceId": "JM45S67eqnSKueAK",
+            "name": "回路3",
+            "state": 0,
+            "timeCondition1OnTime": "关闭",
+            "timeCondition1OffTime": "关闭",
+            "timeCondition2OnTime": "关闭",
+            "timeCondition2OffTime": "关闭"
+          },
+          {
+            "id": 4,
+            "deviceId": "JM45S67eqnSKueAK",
+            "name": "回路4",
+            "state": 0,
+            "timeCondition1OnTime": "关闭",
+            "timeCondition1OffTime": "关闭",
+            "timeCondition2OnTime": "关闭",
+            "timeCondition2OffTime": "关闭"
+          }
+        ],
+        "sun": {
+          "deviceId": "",
+          "batteryVoltage": 0,
+          "batteryCurrent": 0,
+          "batteryPlateVoltage": 0
+        }
+      },
+      {
+        "id": 5,
+        "sn": "JM36g0RM0ivegAGK",
+        "regionId": 1,
+        "name": "入厂道路",
+        "genre": "八回路控制",
+        "state": 1,
+        "isSun": false,
+        "loopNumber": 8,
+        "onlineTime": "2025-01-19T09:46:00.039018537+08:00",
         "deviceLoops": [
           {
             "id": 1,
-            "deviceId": "JM45zpMXCeW4SG7G",
+            "deviceId": "JM36g0RM0ivegAGK",
             "name": "回路1",
             "state": 0,
             "timeCondition1OnTime": "关闭",
@@ -126,7 +303,7 @@
           },
           {
             "id": 2,
-            "deviceId": "JM45zpMXCeW4SG7G",
+            "deviceId": "JM36g0RM0ivegAGK",
             "name": "回路2",
             "state": 0,
             "timeCondition1OnTime": "关闭",
@@ -136,7 +313,7 @@
           },
           {
             "id": 3,
-            "deviceId": "JM45zpMXCeW4SG7G",
+            "deviceId": "JM36g0RM0ivegAGK",
             "name": "回路3",
             "state": 0,
             "timeCondition1OnTime": "关闭",
@@ -146,13 +323,53 @@
           },
           {
             "id": 4,
-            "deviceId": "JM45zpMXCeW4SG7G",
+            "deviceId": "JM36g0RM0ivegAGK",
             "name": "回路4",
             "state": 0,
             "timeCondition1OnTime": "关闭",
             "timeCondition1OffTime": "关闭",
             "timeCondition2OnTime": "关闭",
             "timeCondition2OffTime": "关闭"
+          },
+          {
+            "id": 5,
+            "deviceId": "JM36g0RM0ivegAGK",
+            "name": "回路5",
+            "state": 0,
+            "timeCondition1OnTime": "关闭",
+            "timeCondition1OffTime": "关闭",
+            "timeCondition2OnTime": "关闭",
+            "timeCondition2OffTime": "关闭"
+          },
+          {
+            "id": 6,
+            "deviceId": "JM36g0RM0ivegAGK",
+            "name": "回路6",
+            "state": 0,
+            "timeCondition1OnTime": "关闭",
+            "timeCondition1OffTime": "关闭",
+            "timeCondition2OnTime": "关闭",
+            "timeCondition2OffTime": "关闭"
+          },
+          {
+            "id": 7,
+            "deviceId": "JM36g0RM0ivegAGK",
+            "name": "回路7",
+            "state": 0,
+            "timeCondition1OnTime": "关闭",
+            "timeCondition1OffTime": "关闭",
+            "timeCondition2OnTime": "关闭",
+            "timeCondition2OffTime": "关闭"
+          },
+          {
+            "id": 8,
+            "deviceId": "JM36g0RM0ivegAGK",
+            "name": "回路8",
+            "state": 0,
+            "timeCondition1OnTime": "关闭",
+            "timeCondition1OffTime": "关闭",
+            "timeCondition2OnTime": "关闭",
+            "timeCondition2OffTime": "关闭"
           }
         ],
         "sun": {

utils/myTool.go

@@ -37,9 +37,9 @@ func GetOnlineDevices() (devices []dao.Device, err error) {
 
 	for _, region := range regions {
 		for _, device := range region.Devices {
-			if device.State == 0 {
-				continue
-			}
+			//if device.State == 0 {
+			//	continue
+			//}
 			devices = append(devices, device)
 		}
 	}
@@ -136,22 +136,31 @@ func ReadDevice(conn net.Conn) (data []byte) {
 	return buffer
 }
 
-// WriteAndReadDevice 又写又读
 func WriteAndReadDevice(frame []byte, conn net.Conn, former, after int) (data []byte, err error) {
 	// 发送 Modbus RTU 帧
-	//FE 04 03 EE 00 08 85 B2
 	n, err := conn.Write(frame)
 	if err != nil {
 		fmt.Println("Error writing to connection:", err)
 		return
 	}
+
+	// 等待一段时间以接收响应
 	time.Sleep(1000 * time.Millisecond)
-	buffer := make([]byte, 1024)
+
 	// 读取响应
+	buffer := make([]byte, 1024)
 	n, err = conn.Read(buffer)
 	if err != nil {
 		fmt.Println("Error reading from connection:", err)
 		return
 	}
+
+	// 检查读取的字节数是否足够
+	if n < former+after {
+		err = fmt.Errorf("not enough bytes read to satisfy the slice range")
+		return
+	}
+
+	// 返回子切片
 	return buffer[former : n-after], err
 }

work/MyJob.go

@@ -11,6 +11,7 @@ func MyJob() {
 
 	_ = c.AddFunc("0 */2 * * * ?", func() {
 		modbus.GetSunPowerInfo()
+		modbus.GetDeviceInfo()
 	})
 	_ = c.AddFunc("0 * * * * ?", func() {
 		service.Cron{}.RelayOnOffTimeTask()