瀏覽代碼

fix:蓝牙网管扫描

develoven 1 年之前
父節點
當前提交
5cabb04d58
共有 1 個文件被更改,包括 7 次插入4 次删除
  1. 7 4
      api/gateway/gateway.go

+ 7 - 4
api/gateway/gateway.go

@@ -592,11 +592,14 @@ func WriteDataEmq(c *gin.Context) {
 // @Success 200 {string} string "ok"
 // @Router /v2/gateway/find [get]
 func FindGateway(c *gin.Context) {
-	marshal, err := json.Marshal(global.GatewayList)
-	if err != nil {
-		return
+
+	var gateways []gateway.GatewayInfo
+	if len(global.DeviceMap) > 0 {
+		for _, deviceInfo := range global.GatewayList {
+			gateways = append(gateways, deviceInfo)
+		}
 	}
-	response.Success("查询网关设备完成", marshal, c)
+	response.Success("查询网关设备完成", gateways, c)
 	return
 }