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

添加无线下位机配置,完善本地web数据显示

This commit is contained in:
fish 2019-03-22 15:27:48 +08:00
parent b557176ceb
commit bba19a1e4e
3 changed files with 51 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
loadconfig.go
View File

@ -95,11 +95,12 @@ func init() {
DEVICEDATAS.Lock() DEVICEDATAS.Lock()
DEVICEDATAS.DATA = make(map[string]Device) DEVICEDATAS.DATA = make(map[string]Device)
//初始化设备，目前conf.DEVICES_LIST 指的是lora //初始化设备，目前conf.DEVICES_LIST
for _, i := range conf.DEVICES_LIST { for _, i := range conf.DEVICES_LIST {
device.DATA = make(map[string]interface{}) device.DATA = make(map[string]interface{})
device.ID = i[0] device.ID = i[0]
device.VERSION = i[2] device.VERSION = i[2]
//版本号+编号
DEVICEDATAS.DATA[i[2]+"_"+i[3]] = device DEVICEDATAS.DATA[i[2]+"_"+i[3]] = device
} }
DEVICEDATAS.Unlock() DEVICEDATAS.Unlock()

13
router.go
View File

@ -202,10 +202,14 @@ func seat_api(c *gin.Context) {
type_id := c.Param("id") type_id := c.Param("id")
var data Seat_data var data Seat_data
var conf_data [][]interface{} var conf_data [][]interface{}
//conf.GATEWAY_INFO.CONFIG 采集器配置信息
for _, i := range conf.GATEWAY_INFO.CONFIG { for _, i := range conf.GATEWAY_INFO.CONFIG {
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]
log.Println("conf.data:", i.DATA) log.Println("conf.data:", i.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 DEVICEDATAS.DATA[version+"_"+num].DATA["data"+strconv.Itoa(k+1)] != nil { if DEVICEDATAS.DATA[version+"_"+num].DATA["data"+strconv.Itoa(k+1)] != nil {
@ -233,11 +237,13 @@ 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)
var data = make([]string, 2) var data = make([]string, 2)
//配置表中devices_list
//例如["4E5D52DD-EB81-43C0-A2B6-04E432412EBA", "loraport", "yunhorn_kgl_l_v1", "1"],
for _, i := range conf.DEVICES_LIST { for _, i := range conf.DEVICES_LIST {
//[4E5D52DD-EB81-43C0-A2B6-04E432412EBA loraport yunhorn_kgl_l_v1 1] // log.Println("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&")
log.Println("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&") // log.Println(i)
log.Println(i)
if id == i[0] { if id == i[0] {
data[0], data[1] = i[2], i[3] data[0], data[1] = i[2], i[3]
log.Println(data) log.Println(data)
@ -246,6 +252,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)
return data return data
} }

13
worker.go
View File

@ -86,10 +86,21 @@ func yunhorn_ys_l_v1(data_buf []byte) {
demoDevice.DATA["data"+strconv.Itoa(3)] = rand.Intn(2) demoDevice.DATA["data"+strconv.Itoa(3)] = rand.Intn(2)
//485 //485
if(data_type[0]==2){ if data_type[0] == 2 {
demoDevice.DATA["data"+strconv.Itoa(8)] = rand.Intn(2) demoDevice.DATA["data"+strconv.Itoa(8)] = rand.Intn(2)
} else { } else {
demoDevice.DATA["data"+strconv.Itoa(7)] = data_int[0] demoDevice.DATA["data"+strconv.Itoa(7)] = data_int[0]
var device Device
device.Lock()
device.ID = demoDevice.ID
device.VERSION = demoDevice.VERSION
device.ONLINE = demoDevice.ONLINE
device.DATA = make(map[string]interface{})
device.DATA["data1"] = data_int[0]
device.Unlock()
DEVICEDATAS.DATA[demoDevice.VERSION+"_1"] = device
} }
device.DATA = demoDevice.DATA device.DATA = demoDevice.DATA