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

修改默认数据防抖15s

This commit is contained in:
fish 2019-05-05 10:38:57 +08:00
parent c867893ebb
commit fca9fbd350
4 changed files with 92 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
conf/gateway.conf
View File

@ -13,7 +13,14 @@
["男厕位", 2],
["女厕位", 1],
["女厕位", 2],
["男厕位", 5]
["男厕位", 3],
["男厕位", 4],
["男厕位", 5],
["男厕位", 6],
["男厕位", 7],
["男厕位", 8],
["女厕位", 3],
["女厕位", 4]
]
}
]
@ -49,18 +56,18 @@
"adr":"0c521618",
"location_type":"changing_desk",
"location_code":"spao",
"location_data":"data1",
"location_data":"data6",
"current_data":0,
"device":"yunhorn_kgl_c16_v1_1"
},
{
"adr":"0c3b4f14",
"location_type":"changing_desk",
"location_code":"spao",
"location_data":"data2",
"current_data":0,
"device":"yunhorn_kgl_c16_v1_1"
},
"adr":"0c473018",
"location_type":"changing_desk",
"location_code":"spao",
"location_data":"data7",
"current_data":0,
"device":"yunhorn_kgl_c16_v1_1"
},
{
"adr":"0c451d14",
"location_type":"changing_desk",
@ -84,7 +91,63 @@
"location_data":"data5",
"current_data":0,
"device":"yunhorn_kgl_c16_v1_1"
}
},
{
"adr":"0c3e3c14",
"location_type":"changing_desk",
"location_code":"spao",
"location_data":"data2",
"current_data":0,
"device":"yunhorn_kgl_c16_v1_1"
},
{
"adr":"0c3c1214",
"location_type":"changing_desk",
"location_code":"spao",
"location_data":"data8",
"current_data":0,
"device":"yunhorn_kgl_c16_v1_1"
},
{
"adr":"0c3d3c14",
"location_type":"changing_desk",
"location_code":"spao",
"location_data":"data10",
"current_data":0,
"device":"yunhorn_kgl_c16_v1_1"
},
{
"adr":"0c3b4f14",
"location_type":"changing_desk",
"location_code":"spao",
"location_data":"data9",
"current_data":0,
"device":"yunhorn_kgl_c16_v1_1"
},
{
"adr":"0c360514",
"location_type":"changing_desk",
"location_code":"spao",
"location_data":"data1",
"current_data":0,
"device":"yunhorn_kgl_c16_v1_1"
},
{
"adr":"123",
"location_type":"changing_desk",
"location_code":"spao",
"location_data":"data11",
"current_data":0,
"device":"yunhorn_kgl_c16_v1_1"
},
{
"adr":"0c0a2017",
"location_type":"changing_desk",
"location_code":"spao",
"location_data":"data12",
"current_data":0,
"device":"yunhorn_kgl_c16_v1_1"
}
],
"devices_list": [
["4E5D52DD-EB81-43C0-A2B6-04E432412EBA", "loraport", "yunhorn_kgl_l_v1", "1"],

1
do_send_data.go
View File

@ -20,6 +20,7 @@ type P1004_6 struct {
VERSION string `json:"version"`
ONLINE bool `json:"online"`
DATA map[string]interface{} `json:"data"`
TIMESTAMP int64 `json:"timestamp"`
}
// 发送数据

20
router.go
View File

@ -105,7 +105,7 @@ var reactTof = 1650
var extensionInTime = 6
//数据防抖 离开时间
var extensionOutTime = 10
var extensionOutTime = 15
var extensionInTime2 = 0
@ -449,6 +449,7 @@ func dealDatav3(data []byte) string{
readyData.WriteString("*")
readyData.WriteString(tofTmp)
}
R_data.TIMESTAMP=time.Now().Unix()
data_bufTmp, _ := json.Marshal(R_data)
data_buf := string(data_bufTmp)
@ -483,7 +484,7 @@ func dealDatav3(data []byte) string{
}
// log.Println("load loraNode:",loraNode)
log.Println("yunhorndeug.push.data.cuurent_data,current",loraNode.(LoraNode).CURRENT_DATA,current)
//log.Println("yunhorndeug.push.data.cuurent_data,current",loraNode.(LoraNode).CURRENT_DATA,current)
if loraNode.(LoraNode).CURRENT_DATA != current{
//不相同，直接改变状态，更新时间
@ -508,6 +509,11 @@ func dealDatav3(data []byte) string{
changeDataV2(newLoraNode)
}
if (datatype==2 && (extensionInTime2<=0 || extensionOutTime2<=0)){
newLoraNode.CURRENT_DATA = current
changeDataV2(newLoraNode)
}
}else{
// 非首次
@ -532,7 +538,7 @@ func dealDatav3(data []byte) string{
}else{
//类型2 吸顶
if datatype==2{
if durationAsInt64 < extensionInTime2 && extensionOutTime2>0 {
if durationAsInt64 < extensionInTime2 && extensionInTime2>0 {
return ""
}
}else{
@ -560,6 +566,7 @@ func dealDatav3(data []byte) string{
changeDataV2(newLoraNode)
}else{
// loraNode.(LoraNode).CHECK_TIME = true
newLoraNode := LoraNode{}
newLoraNode.CURRENT_DATA = loraNode.(LoraNode).CURRENT_DATA
newLoraNode.TIME = time.Now()
@ -570,7 +577,14 @@ func dealDatav3(data []byte) string{
newLoraNode.LOCATION_DATA = loraNode.(LoraNode).LOCATION_DATA
newLoraNode.DEVICE = loraNode.(LoraNode).DEVICE
if (datatype==2 && (extensionInTime2<=0 || extensionOutTime2<=0)){
newLoraNode.CURRENT_DATA = current
changeDataV2(newLoraNode)
}
loraNodeMap.Store(adr,newLoraNode)
}
}

2
tcpserver.go
View File

@ -209,7 +209,7 @@ func readConn(conn net.Conn, readChan chan<- []byte, stopChan chan<- bool) {
Rdata2[i]=v
}
log.Println("===========================yunhorndeug.push.data.tcp.origin.Rdata:",Rdata2)
// log.Println("===========================yunhorndeug.push.data.tcp.origin.Rdata:",Rdata2)
// Rdata2 = make([]byte, count)