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

完善有线方案和无线方案的初始化

This commit is contained in:
yu 2019-05-13 16:52:17 +08:00
parent 77d7fac622
commit 69c9c2d829
5 changed files with 46 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
conf/gateway.conf
View File

@ -224,5 +224,6 @@
"tcp_port":10090, "tcp_port":10090,
"api_port":10086, "api_port":10086,
"pro_category":1, "pro_category":1,
"syn_data":true "syn_data":false,
"syn_extension_Time":false
} }

3
conf/gatewayConfRead.text
View File

@ -9,5 +9,6 @@
"tcp_port" 程序tcp端口 "tcp_port" 程序tcp端口
"api_port" 程序api端口 "api_port" 程序api端口
"pro_category":程序类别 0-有线,1-无线,2-混合 "pro_category":程序类别 0-有线,1-无线,2-混合
"syn_data" 定时同步数据开关, 0-关,1-开 "syn_data" 定时同步数据开关, false-关,true-开
"syn_extension_Time" 定时获取数据防抖时间开关 进入以及离开时间配置 目前是dpark使用 true为打开,false为关闭

1
loadconfig.go
View File

@ -41,6 +41,7 @@ type Conf struct {
APIPORT int `json:"api_port"` APIPORT int `json:"api_port"`
PROCATEGORY int `json:"pro_category"` PROCATEGORY int `json:"pro_category"`
SYNDATA bool `json:"syn_data"` SYNDATA bool `json:"syn_data"`
SYNEXTENSIONTIME bool `json:"syn_extension_Time"`
} }
//无线 下位机 //无线 下位机

31
main.go
View File

@ -16,9 +16,15 @@ func main() {
go serial_run() go serial_run()
c := cron.New() c := cron.New()
// send_data(CODE1001)
//获取数据防抖处理时间配置 //获取数据防抖处理时间配置
go getConf() if conf.SYNEXTENSIONTIME {
go getConf()
}
//有线方案,发送全部数据,包括gateway配置
if conf.PROCATEGORY == PRO_CATEGORY_WIRED {
go send_data(CODE1001)
}
//一分钟一次 同步数据 //一分钟一次 同步数据
c.AddFunc("0, *, *, *, *, *", func() { c.AddFunc("0, *, *, *, *, *", func() {
@ -37,7 +43,10 @@ func main() {
// }) // })
c.AddFunc("*/30, *, *, *, *, *", func() { c.AddFunc("*/30, *, *, *, *, *", func() {
getConf() //dpark客户需要拉取api获取数据防抖时间配置
if conf.SYNEXTENSIONTIME {
getConf()
}
}) })
c.AddFunc("0, */10, *, *, *, *", savedata_cron) c.AddFunc("0, */10, *, *, *, *", savedata_cron)
@ -45,15 +54,15 @@ func main() {
c.AddFunc("0, 0, *, *, *, *", get_weather) c.AddFunc("0, 0, *, *, *, *", get_weather)
c.Start() c.Start()
tcp_port := strconv.Itoa(conf.TCPPORT)
listener, err := net.Listen("tcp", "0.0.0.0:"+tcp_port)
if err != nil {
log.Printf("listen fail, err: %v\n", err)
return
}
if conf.OPENTCPSETVER { if conf.OPENTCPSETVER {
tcp_port := strconv.Itoa(conf.TCPPORT)
listener, err := net.Listen("tcp", "0.0.0.0:"+tcp_port)
if err != nil {
log.Printf("listen fail, err: %v\n", err)
return
}
for { for {
conn, err := listener.Accept() conn, err := listener.Accept()
if err != nil { if err != nil {

45
serial_init.go
View File

@ -26,20 +26,17 @@ func serial_run() {
for _, i := range port_arr { for _, i := range port_arr {
var PARITY serial.Parity var PARITY serial.Parity
switch conf.SERIALPORTS_LIST[i].PARITY { switch conf.SERIALPORTS_LIST[i].PARITY {
case "N": case "N":
PARITY = 'N' PARITY = 'N'
case "E": case "E":
PARITY = 'E' PARITY = 'E'
} }
// 打开串口 // 打开串口
SERIAL_PORT[i], err = serial.OpenPort(&serial.Config{ SERIAL_PORT[i], err = serial.OpenPort(&serial.Config{
Name: conf.SERIALPORTS_LIST[i].COM, Name: conf.SERIALPORTS_LIST[i].COM,
Baud: conf.SERIALPORTS_LIST[i].BAUDS, Baud: conf.SERIALPORTS_LIST[i].BAUDS,
Parity: PARITY, Parity: PARITY,
ReadTimeout: time.Millisecond * time.Duration(conf.SERIALPORTS_LIST[i].READTIMEOUT), ReadTimeout: time.Millisecond * time.Duration(conf.SERIALPORTS_LIST[i].READTIMEOUT),
// ReadTimeout: time.Second * time.Duration(conf.SERIALPORTS_LIST[i].READTIMEOUT),
}) })
check(err) check(err)
defer SERIAL_PORT[i].Close() defer SERIAL_PORT[i].Close()
@ -72,22 +69,22 @@ func run_port_device(port *serial.Port, the_same_port_devices [][]string) {
for { for {
for _, i := range the_same_port_devices { for _, i := range the_same_port_devices {
switch i[2] { switch i[2] {
case "yunhorn_sb_c_v1": case "yunhorn_sb_c_v1":
yunhorn_sb_c_v1(port, i[0], conf.RS485DEVICES[i[0]].COMMAND, conf.RS485DEVICES[i[0]].NUM) yunhorn_sb_c_v1(port, i[0], conf.RS485DEVICES[i[0]].COMMAND, conf.RS485DEVICES[i[0]].NUM)
case "yunhorn_db_c_v1": case "yunhorn_db_c_v1":
yunhorn_db_c_v1(port, i[0], conf.RS485DEVICES[i[0]].COMMAND, conf.RS485DEVICES[i[0]].NUM) yunhorn_db_c_v1(port, i[0], conf.RS485DEVICES[i[0]].COMMAND, conf.RS485DEVICES[i[0]].NUM)
case "yunhorn_kq_c_v1": case "yunhorn_kq_c_v1":
yunhorn_kq_c_v1(port, i[0], conf.RS485DEVICES[i[0]].COMMAND, conf.RS485DEVICES[i[0]].NUM) yunhorn_kq_c_v1(port, i[0], conf.RS485DEVICES[i[0]].COMMAND, conf.RS485DEVICES[i[0]].NUM)
case "yunhorn_lhq_c_v1": case "yunhorn_lhq_c_v1":
yunhorn_lhq_c_v1(port, i[0], conf.RS485DEVICES[i[0]].COMMAND, conf.RS485DEVICES[i[0]].NUM) yunhorn_lhq_c_v1(port, i[0], conf.RS485DEVICES[i[0]].COMMAND, conf.RS485DEVICES[i[0]].NUM)
case "yunhorn_aq_c_v1": case "yunhorn_aq_c_v1":
yunhorn_aq_c_v1(port, i[0], conf.RS485DEVICES[i[0]].COMMAND, conf.RS485DEVICES[i[0]].NUM) yunhorn_aq_c_v1(port, i[0], conf.RS485DEVICES[i[0]].COMMAND, conf.RS485DEVICES[i[0]].NUM)
case "yunhorn_kgl_c8_v1": case "yunhorn_kgl_c8_v1":
yunhorn_kgl_c8_v1(port, i[0], conf.RS485DEVICES[i[0]].COMMAND, conf.RS485DEVICES[i[0]].NUM) yunhorn_kgl_c8_v1(port, i[0], conf.RS485DEVICES[i[0]].COMMAND, conf.RS485DEVICES[i[0]].NUM)
case "yunhorn_kgl_c16_v1": case "yunhorn_kgl_c16_v1":
yunhorn_kgl_c16_v1(port, i[0], conf.RS485DEVICES[i[0]].COMMAND, conf.RS485DEVICES[i[0]].NUM) yunhorn_kgl_c16_v1(port, i[0], conf.RS485DEVICES[i[0]].COMMAND, conf.RS485DEVICES[i[0]].NUM)
case "yunhorn_xsy_l_v1": case "yunhorn_xsy_l_v1":
yunhorn_xsy_l_v1(port, i[0], conf.RS485DEVICES[i[0]].COMMAND, conf.RS485DEVICES[i[0]].NUM) yunhorn_xsy_l_v1(port, i[0], conf.RS485DEVICES[i[0]].COMMAND, conf.RS485DEVICES[i[0]].NUM)
} }
} }
time.Sleep(time.Duration(1) * time.Millisecond) time.Sleep(time.Duration(1) * time.Millisecond)