فهرست منبع

fix:日志文件权限问题解决

zzf 1 سال پیش
والد
کامیت
11780e9c9e
3فایلهای تغییر یافته به همراه0 افزوده شده و 111 حذف شده
  1. 0 110
      api/gateway/sse.go
  2. BIN
      db/confrontation-training.db
  3. 0 1
      initialize/router.go

+ 0 - 110
api/gateway/sse.go

@@ -5,10 +5,8 @@ import (
 	errors "confrontation-training/err"
 	"confrontation-training/global"
 	"confrontation-training/models/gateway"
-	"confrontation-training/response"
 	"encoding/json"
 	"fmt"
-	"github.com/gin-gonic/gin"
 	"github.com/gorilla/websocket"
 	"github.com/r3labs/sse/v2"
 	"net/http"
@@ -105,114 +103,6 @@ func SseScanDevice(paramMap map[string]string, filterType string, r *http.Reques
 	}
 }
 
-func SseScanDevice2(c *gin.Context) {
-	var scanUrl = global.Config.Gateway.BaseUrl + global.Config.Gateway.ScanUrl
-	var param gateway.DeviceScanParam
-	err := c.ShouldBindJSON(&param)
-	if err != nil {
-		fmt.Printf("参数格式化异常:%s", err.Error())
-		response.Failed(errors.ParamInvalid, c)
-		return
-	}
-	paramMap := make(map[string]string)
-	if param.Chip != "" {
-		paramMap["chip"] = param.Chip
-	}
-	if param.FilterName != "" {
-		//查询设备mac过滤信息
-		filterMac := ""
-		deviceInfos, count := GetDeviceService().DeviceService.FindDeviceByType(param.FilterName)
-		if count > 0 {
-			for i := range deviceInfos {
-				filterMac += deviceInfos[i].Mac + ","
-			}
-		}
-		if len(filterMac) > 0 {
-			if strings.HasSuffix(filterMac, ",") {
-				filterMac = filterMac[0 : len(filterMac)-1]
-			}
-			paramMap["filter_mac"] = filterMac
-		}
-
-		if param.FilterName == "0" {
-			paramMap["filter_name"] = constant.FilterNameEEG
-		} else if param.FilterName == "1" {
-			paramMap["filter_name"] = constant.FilterNameECG
-		} else {
-			response.Failed(errors.ParamInvalid+":过滤类型-"+param.FilterName+"无效", c)
-			return
-		}
-	} else {
-		paramMap["filter_name"] = constant.FilterNameALL
-	}
-	if param.FilterRssi != "" {
-		paramMap["filter_rssi"] = param.FilterRssi
-	}
-	if param.FilterMac != "" {
-		paramMap["filter_mac"] = param.FilterMac
-	}
-	paramMap["active"] = "1"
-	paramMap["event"] = "1"
-	deviceMap := make(map[string]gateway.DeviceScanned)
-	if len(paramMap) > 0 {
-		for key, value := range paramMap {
-			scanUrl += "&" + key + "=" + value
-		}
-	}
-	//events := make(chan *sse.Event)
-	client := sse.NewClient(scanUrl)
-	fmt.Println("开始SSE")
-	flusher := c.Writer.(http.Flusher)
-	err = client.SubscribeRaw(func(msg *sse.Event) {
-		//fmt.Println(string(msg.Data))
-		var data gateway.DeviceScannedFromGateway
-		err := json.Unmarshal(msg.Data, &data)
-		if err != nil {
-			fmt.Printf("SSE数据转换异常:%s", err.Error())
-			return
-		}
-		deviceScanned := gateway.DeviceScanned{}
-		deviceScanned.MAC = data.Bdaddrs[0].Bdaddr
-		//if param.FilterType == "1" {
-		//	deviceService := GetDeviceService()
-		//	_, i := deviceService.FindDeviceByMac(deviceScanned.MAC)
-		//	if i > 0 {
-		//		deviceScanned.Name = data.Name
-		//		deviceScanned.Rssi = data.Rssi
-		//		deviceScanned.BdadrType = data.Bdaddrs[0].BdaddrType
-		//		deviceScanned.Chip = data.ChipId
-		//		deviceMap[deviceScanned.MAC] = deviceScanned
-		//		fmt.Println(deviceScanned)
-		//	}
-		//}
-		deviceScanned.Name = data.Name
-		deviceScanned.Rssi = data.Rssi
-		deviceScanned.BdadrType = data.Bdaddrs[0].BdaddrType
-		deviceScanned.Chip = data.ChipId
-		deviceMap[deviceScanned.MAC] = deviceScanned
-		fmt.Println(deviceScanned)
-		if len(deviceMap) > 0 {
-			marshal, _ := json.Marshal(deviceMap)
-			c.Writer.Write(marshal)
-			//fmt.Fprintf(c.Writer, string(marshal))
-			flusher.Flush()
-		}
-
-		go func() {
-			<-c.Request.Context().Done()
-			client = nil
-			return
-
-		}()
-	})
-	if err != nil {
-		fmt.Println(err.Error())
-		return
-	}
-	return
-
-}
-
 // SseOpenNotify 开启通知
 func SseOpenNotify() {
 	var notifyUrl = global.Config.Gateway.BaseUrl + global.Config.Gateway.NotifyUrl

BIN
db/confrontation-training.db


+ 0 - 1
initialize/router.go

@@ -55,7 +55,6 @@ func Router() {
 	user.POST("/change/password", gateway.GetUser().ModePass)
 	device := v1.Group("/device")
 	device.POST("/scan", gateway.ScanDevice)
-	device.POST("/scan2", gateway.SseScanDevice2)
 	device.GET("/connection", gateway.ConnectDevice)
 	device.POST("/write/data/", gateway.WriteData)
 	device.GET("/open/notify/", gateway.OpenNotify)