From 2b6b9281bdbe69262eb62d52a1e59cd50dd9246b Mon Sep 17 00:00:00 2001 From: yu Date: Mon, 13 May 2019 16:05:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=9C=89=E7=BA=BF=E5=92=8C?= =?UTF-8?q?=E6=97=A0=E7=BA=BF=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E9=A1=B9,=E5=90=8C=E6=AD=A5=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=85=8D=E7=BD=AE=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf/gateway.conf | 4 +- conf/gateway.conf_bak | 196 ++++++++++++++++++++++++++++++++++++++ conf/gatewayConfRead.text | 13 +++ golbalHelp.go | 15 +++ loadconfig.go | 13 +-- main.go | 16 ++-- worker.go | 2 +- 7 files changed, 239 insertions(+), 20 deletions(-) create mode 100644 conf/gateway.conf_bak create mode 100644 conf/gatewayConfRead.text diff --git a/conf/gateway.conf b/conf/gateway.conf index b04205d..2ba63bb 100644 --- a/conf/gateway.conf +++ b/conf/gateway.conf @@ -222,5 +222,7 @@ "check_serial":true, "dpark_location":"spaoDevs", "tcp_port":10090, - "api_port":10086 + "api_port":10086, + "pro_category":1, + "syn_data":true } diff --git a/conf/gateway.conf_bak b/conf/gateway.conf_bak new file mode 100644 index 0000000..8eee4f1 --- /dev/null +++ b/conf/gateway.conf_bak @@ -0,0 +1,196 @@ +{ + "gateway_info": { + "id": "F23FACD2-7D85-4FCC-88E3-C5B78931A26D", + "version": "yunhorn_gw_c_v1", + "location": [113.960347, 22.54143], + "单位": "深圳市云兴科技", + "config": [ + + { + "id": "deb03e28-ddcb-4e5d-aa31-d870a1f0f09b", + "version": "yunhorn_kgl_c8_v1", + "data": [ + ["女厕位", 1], + ["女厕位", 2], + ["女厕位", 3], + ["女厕位", 4], + ["女厕位", 5], + ["女厕位", 6], + ["男厕位", 7], + ["男厕位", 8] + ] + }, + { + "id": "EC13C2D9-6A93-4894-BB5B-89BDAA786D8A", + "version": "yunhorn_kgl_c8_v1", + "data": [ + ["男厕位", 1], + ["男厕位", 2], + ["男厕位", 3], + ["男厕位", 4], + ["男厕位", 5], + ["男厕位", 6], + ["纸巾卷", 7], + ["纸巾抽", 8] + ] + }, { + "id": "82BF7B5E-EC0D-4DB6-807F-B097C3C84073", + "version": "yunhorn_kgl_c8_v1", + "data": [ + ["母婴", 1], + ["残卫", 1], + ["残卫", 2], + ["男便池", 4], + ["男便池", 5], + ["男便池", 6], + ["男便池", 7], + ["男便池", 8] + ] + }, { + "id": "F5B7FDCC-79A8-499E-A925-F2FF357BE30D", + "version": "yunhorn_kgl_c8_v1", + "data": [ + ["男厕位", 9], + ["男厕位", 10], + ["女厕位", 14], + ["女厕位", 15], + ["女厕位", 16], + ["女厕位", 17], + ["女厕位", 18], + [null, null] + ] + }, + { + "id": "00DD66A6-378E-450D-98AA-44AC02741980", + "version": "yunhorn_kgl_c16_v1", + "data": [ + ["女厕位", 1], + ["女厕位", 2], + ["女厕位", 3], + ["女厕位", 4], + ["女厕位", 5], + ["女厕位", 6], + ["女厕位", 7], + ["女厕位", 8], + ["女厕位", 9], + ["女厕位", 10], + ["女厕位", 11], + ["女厕位", 12], + ["女厕位", 13], + ["男便池", 1], + ["男便池", 2], + ["男便池", 3] + ] + }, + { + "id": "4E5D52DD-EB81-43C0-A2B6-04E432412EBA", + "version": "yunhorn_kgl_l_v1", + "data": [ + ["纸巾卷", 1] + ] + } + ] + }, + "devices_list": [ + ["00DD66A6-378E-450D-98AA-44AC02741980","port1","yunhorn_kgl_c16_v1","1"], + ["4E5D52DD-EB81-43C0-A2B6-04E432412EBA", "loraport", "yunhorn_kgl_l_v1", "1"], + ["EB5B0798-9B7F-474E-AAB8-467FD5FE1293", "loraport", "yunhorn_kgl_l_v1", "2"] + ], + "serialports_list": { + "port1": { + "com": "/dev/ttyUSB0", + "bauds": 9600, + "size": 8, + "parity": "N", + "stopbits": 1, + "readtimeout": 100, + "note": "lorawan" + } + }, + "rs485devices": { + "deb03e28-ddcb-4e5d-aa31-d870a1f0f09b": { + "version": "yunhorn_ys_l_v1", + "num": "1", + "command": [ + [8, 3, 0, 1, 0, 2, 149, 82] + ] + }, + "15394892-E8B0-4FF2-BC35-1BF380BD1B68": { + "version": "yunhorn_xsy_c_v1", + "num": "1", + "command": [ + [8, 3, 0, 1, 0, 2, 149, 82] + ] + }, + "EC13C2D9-6A93-4894-BB5B-89BDAA786D8A": { + "version": "yunhorn_kgl_c8_v1", + "num": "1", + "command": [ + [1, 2, 0, 0, 0, 1, 185, 202], + [1, 2, 0, 1, 0, 1, 232, 10], + [1, 2, 0, 2, 0, 1, 24, 10], + [1, 2, 0, 3, 0, 1, 73, 202], + [1, 2, 0, 4, 0, 1, 248, 11], + [1, 2, 0, 5, 0, 1, 169, 203], + [1, 2, 0, 6, 0, 1, 89, 203], + [1, 2, 0, 7, 0, 1, 8, 11] + ] + }, + "00DD66A6-378E-450D-98AA-44AC02741980": { + "version": "yunhorn_kgl_c16_v1", + "num": "1", + "command": [ + [3, 2, 0, 0, 0, 16, 120, 36] + ] + }, + "52A79B3D-D9D9-48AF-AEB4-7D456BA22B31": { + "version": "yunhorn_db_c_v1", + "num": "1", + "command": [ + [104, 65, 4, 0, 120, 16, 68, 104, 17, 4, 51, 51, 52, 51, 195, 22] + ] + }, + "607E11C4-8986-4F8E-807E-FFA655A6F677": { + "version": "yunhorn_sb_c_v1", + "num": "1", + "command": [ + [104, 16, 103, 19, 146, 128, 1, 0, 0, 1, 3, 31, 144, 2, 186, 22] + ] + }, + "066BB944-AFA2-4E5D-86FA-61D9080A97BB": { + "version": "yunhorn_kq_c_v1", + "num": "1", + "command": [ + [2, 3, 0, 0, 0, 7, 4, 59] + ] + }, + "22E175B2-8DD5-4740-B428-0297F409AA47": { + "version": "yunhorn_lhq_c_v1", + "num": "1", + "command": [ + [4, 3, 0, 6, 0, 1, 100, 94] + ] + }, + "20F44B9C-E4A1-478E-B28F-0B7B14A2AF64": { + "version": "yunhorn_aq_c_v1", + "num": "1", + "command": [ + [3, 3, 0, 0, 0, 1, 133, 232] + ] + } + }, + "loradevices_list": { + "4E5D52DD-EB81-43C0-A2B6-04E432412EBA": { + "version": "yunhorn_zjj_l_v1", + "num": "1", + "command": [ + [85, 2, 242, 170] + ] + } + }, + "iconurl": "http://192.168.3.188/icons/", + "websocketurl": ["192.168.3.216:8080", "/echo"], + "post_to_server": "https://smartoilets.cn/socketServer/statis/push", + "debug": true, + "openserial":true +} diff --git a/conf/gatewayConfRead.text b/conf/gatewayConfRead.text new file mode 100644 index 0000000..35fda8a --- /dev/null +++ b/conf/gatewayConfRead.text @@ -0,0 +1,13 @@ +"iconurl": "http://192.168.3.188/icons/", +"websocketurl": ["192.168.3.216:8080", "/echo"], +"post_to_server": "https://smartoilets.cn/socketServer/statis/push", 云端接收数据api路径 +"debug": 是否打印debug日志 true为打印,false为不打印 +"openserial": 打开串口,true为打开,false为关闭 +"open_tcp_server" 打开tcp服务器, true为打开,false为关闭 +"check_serial" 检查串口 +"dpark_location": dpark地点名,云端用于数据对应 A点配置了哪些设备 +"tcp_port" 程序tcp端口 +"api_port" 程序api端口 +"pro_category":程序类别 0-有线,1-无线,2-混合 +"syn_data" 定时同步数据开关, 0-关,1-开 + diff --git a/golbalHelp.go b/golbalHelp.go index fc7efd8..5802bf5 100644 --- a/golbalHelp.go +++ b/golbalHelp.go @@ -10,5 +10,20 @@ const ( CODE1005 = 1005 //评价 CODE1006 = 1006 + //dpark 数据发送 改变以及定时都有 + CODE1008 = 1008 + //dpark 数据定时发送 + CODE1009 = 1009 + // + CODE1010 = 1010 //云端数据交互code end + + + //pro_category 程序类别 + //有线 + PRO_CATEGORY_WIRED = 0 + //无线 + PRO_CATEGORY_WIRELESS = 1 + //混合 + PRO_CATEGORY_HYBRID = 2 ) diff --git a/loadconfig.go b/loadconfig.go index 28ca5e8..3a5e4ce 100644 --- a/loadconfig.go +++ b/loadconfig.go @@ -39,6 +39,8 @@ type Conf struct { DPARKLOCATION string `json:"dpark_location"` TCPPORT int `json:"tcp_port"` APIPORT int `json:"api_port"` + PROCATEGORY int `json:"pro_category"` + SYNDATA bool `json:"syn_data"` } //无线 下位机 @@ -123,7 +125,6 @@ func init() { for _,v := range conf.LORANODES { v.CURRENT_DATA = -1 - // log.Println("&&&&&&&&&&&&&&&&&&&",v) v.TIME = time.Now() loraNodeMap.Store(v.ADR,v) } @@ -131,19 +132,9 @@ func init() { DEVICEDATAS.Lock() DEVICEDATAS.DATA = make(map[string]Device) - //校验是否有设置重复串口 - //var serialPort = make(map[string]int) - //初始化设备，目前conf.DEVICES_LIST for _, i := range conf.DEVICES_LIST { - //if _, c := serialPort[i[1]]; c { - // log.Println("repeatd serial port:", i[1]) - // os.Exit(3) - //} else { - // serialPort[i[1]] = 0 - //} - device.DATA = make(map[string]interface{}) device.ID = i[0] device.VERSION = i[2] diff --git a/main.go b/main.go index 752137e..1d85d6d 100644 --- a/main.go +++ b/main.go @@ -20,19 +20,21 @@ func main() { //获取数据防抖处理时间配置 go getConf() - // c.AddFunc("0, *, *, *, *, *", func() { - // send_data(CODE1001) - // }) - //一分钟一次 同步数据 c.AddFunc("0, *, *, *, *, *", func() { - yunhorn_hb_dpark_v1() + if conf.SYNDATA { + if conf.PROCATEGORY == PRO_CATEGORY_WIRED { + send_data(CODE1001) + }else if conf.PROCATEGORY == PRO_CATEGORY_WIRELESS{ + yunhorn_hb_dpark_v1() + } + } }) - c.AddFunc("*/10, *, *, *, *, *", func() { + // c.AddFunc("*/10, *, *, *, *, *", func() { // devices := []Device{} // log.Println(string(build_data(1001,devices))) - }) + // }) c.AddFunc("*/30, *, *, *, *, *", func() { getConf() diff --git a/worker.go b/worker.go index d765c1e..a5babd4 100644 --- a/worker.go +++ b/worker.go @@ -118,7 +118,7 @@ func yunhorn_hb_dpark_v1(){ var R_data P1004_6 //心跳数据 - R_data.CODE = 1009 + R_data.CODE = CODE1009 //spao点的公厕 R_data.ID = conf.DPARKLOCATION //尿布台