sundp
/
YHGW
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

去除日志

This commit is contained in:
fish 2019-03-22 16:54:20 +08:00
parent 9ded3ef58b
commit f3d5fba717
1 changed files with 13 additions and 13 deletions

26
router.go
View File

@ -244,24 +244,24 @@ func seat_api(c *gin.Context) {
//conf.GATEWAY_INFO.CONFIG 采集器配置信息 //conf.GATEWAY_INFO.CONFIG 采集器配置信息
for _, i := range conf.GATEWAY_INFO.CONFIG { for _, i := range conf.GATEWAY_INFO.CONFIG {
if i.ID == "deb03e28-ddcb-4e5d-aa31-d870a1f0f09b" { //if i.ID == "deb03e28-ddcb-4e5d-aa31-d870a1f0f09b" {
log.Println("begin debug") // log.Println("begin debug")
} //}
arr := get_seat_device_data(i.ID) arr := get_seat_device_data(i.ID)
//获取到设备版本 //获取到设备版本
version, num := arr[0], arr[1] version, num := arr[0], arr[1]
if i.ID == "deb03e28-ddcb-4e5d-aa31-d870a1f0f09b" { //if i.ID == "deb03e28-ddcb-4e5d-aa31-d870a1f0f09b" {
log.Println("conf.data:", i.DATA) // log.Println("conf.data:", i.DATA)
log.Println("devicedatas.data:", DEVICEDATAS.DATA) // log.Println("devicedatas.data:", DEVICEDATAS.DATA)
} //}
for k, j := range i.DATA { for k, j := range i.DATA {
if DEVICEDATAS.DATA[version+"_"+num].DATA != nil { if DEVICEDATAS.DATA[version+"_"+num].DATA != nil {
if i.ID == "deb03e28-ddcb-4e5d-aa31-d870a1f0f09b" { //if i.ID == "deb03e28-ddcb-4e5d-aa31-d870a1f0f09b" {
log.Println("data:", DEVICEDATAS.DATA[version+"_"+num].DATA) // log.Println("data:", DEVICEDATAS.DATA[version+"_"+num].DATA)
} //}
if DEVICEDATAS.DATA[version+"_"+num].DATA["data"+strconv.Itoa(k+1)] != nil { if DEVICEDATAS.DATA[version+"_"+num].DATA["data"+strconv.Itoa(k+1)] != nil {
j = append(j, DEVICEDATAS.DATA[version+"_"+num].DATA["data"+strconv.Itoa(k+1)]) j = append(j, DEVICEDATAS.DATA[version+"_"+num].DATA["data"+strconv.Itoa(k+1)])
@ -271,7 +271,7 @@ func seat_api(c *gin.Context) {
} }
} }
log.Println("end conf.data:", conf_data) //log.Println("end conf.data:", conf_data)
switch type_id { switch type_id {
case "1": case "1":
@ -291,7 +291,7 @@ func seat_api(c *gin.Context) {
// 拼凑位置信息的数据 // 拼凑位置信息的数据
func get_seat_device_data(id string) []string { func get_seat_device_data(id string) []string {
log.Println("begin get_seat_device_data.id:", id) //log.Println("begin get_seat_device_data.id:", id)
var data = make([]string, 2) var data = make([]string, 2)
//配置表中devices_list //配置表中devices_list
//例如["4E5D52DD-EB81-43C0-A2B6-04E432412EBA", "loraport", "yunhorn_kgl_l_v1", "1"], //例如["4E5D52DD-EB81-43C0-A2B6-04E432412EBA", "loraport", "yunhorn_kgl_l_v1", "1"],
@ -306,7 +306,7 @@ func get_seat_device_data(id string) []string {
data[0], data[1] = "null", "null" data[0], data[1] = "null", "null"
} }
} }
log.Println("get_seat_device_data:", data) //log.Println("get_seat_device_data:", data)
return data return data
} }