 lixioayao
|
a128500faf
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
lixioayao
|
3f892d0c6c
超过一定时长后，自动升井功能
|
6 years ago |
 liheting
|
7993ac6097
Merge branch 'master' of chensongchao/ya-serv into master
|
6 years ago |
 chensongchao
|
493f9bd9ac
时间函数替换
|
6 years ago |
|
lixioayao
|
26d6c6cb66
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
chensongchao
|
72735db974
修改，优化重连
|
6 years ago |
|
liheting
|
b05dfbece6
Merge branch 'master' of liulei/ya-serv into master
|
6 years ago |
|
lixioayao
|
7bd3dd6c38
解决人卡来回往复跳动的bug
|
6 years ago |
|
chensongchao
|
76c2af1719
线程控制重连,记录ping值
|
6 years ago |
|
chensongchao
|
6adf2c09d6
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
chensongchao
|
bd529388b0
线程控制重连webserver
|
6 years ago |
 liulei
|
5d5a72f4a2
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
liulei
|
685c02f3e0
链接数据库后增加设置查询返回值为uft8
|
6 years ago |
|
lixioayao
|
14d521c6ec
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
lixioayao
|
66ea644281
解决卡加载历史时,时间加载不正确的问题 && 增加日志，打印人卡超时的信息 && 告警初始化卡的告警标志位置位
|
6 years ago |
 zzj
|
d787316e75
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
zzj
|
8e90bafda4
一些日志
|
6 years ago |
|
lixioayao
|
05754ab0f8
分站通信异常
|
6 years ago |
|
chensongchao
|
546972b2e6
线程控制重连webserver
|
6 years ago |
|
chensongchao
|
8c39db3a86
webserver重连功能重写
|
6 years ago |
|
chensongchao
|
81a9765dbd
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
lixioayao
|
cef35c98d4
人员车辆阈值为0 时不走业务。增加websocket日志
|
6 years ago |
|
lixioayao
|
6ef44b5c20
增加掉电告警标识初始化
|
6 years ago |
|
lixioayao
|
e16f4ea73e
解决升井冲突
|
6 years ago |
|
lixioayao
|
3e3cb4f97d
add const
|
6 years ago |
|
zzj
|
195e193974
手动升井..
|
6 years ago |
|
lixioayao
|
ab28ff9be8
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
lixioayao
|
1f9b7a1e1b
修复限制人员入井逻辑，修改时
|
6 years ago |
|
zzj
|
babeb78706
修改手动升井逻辑，修改卡map_id从分站直接获取。
|
6 years ago |
|
zzj
|
cf902282e0
日志输出相关的修改
|
6 years ago |
