 zzj
|
af40608071
Merge branch 'master' of daiyueteng/ya-serv into master
|
6 years ago |
 daiyueteng
|
c74c6956bd
web重连
|
6 years ago |
 zzj
|
8fecf823c6
修改 area_business 接口,添加 m_business_type 属性
|
6 years ago |
|
zzj
|
6598bb82a4
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
zzj
|
b92c83b7ad
区域业务类型改为从0bit开始
|
6 years ago |
 liheting
|
0ef39b79a1
Merge branch 'master' of chensongchao/ya-serv into master
|
6 years ago |
 chensongchao
|
5700b07a70
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
chensongchao
|
94487ca933
三率告警问题，
|
6 years ago |
 lixioayao
|
02202b9f78
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
lixioayao
|
e6fd2833f9
告警更新curval，修复了产生告警是，找不到卡，推送时导致宕机bug
|
6 years ago |
|
zzj
|
b8eee2b90c
变量初始化
|
6 years ago |
|
zzj
|
d21313a51f
初始化struct tm变量
|
6 years ago |
|
zzj
|
f23e0612bd
Merge branch 'master' of chensongchao/ya-serv into master
|
6 years ago |
|
chensongchao
|
83c357e1c6
编译问题，写错了
|
6 years ago |
|
zzj
|
ed1fd5ebbb
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
zzj
|
3c859796f4
修改函数传参 std::string ---> std::string& const
|
6 years ago |
|
liheting
|
61b063787d
Merge branch 'master' of chensongchao/ya-serv into master
|
6 years ago |
|
chensongchao
|
a89877cb8a
三率告警回调设置
|
6 years ago |
|
chensongchao
|
3c241e3569
模拟工具推送北翼胶带掘进机脚本，采集宕机。map查找写反了，没查到到数据，则继续运行导致修改了回调函数指针
|
6 years ago |
|
lixioayao
|
acfa158ff5
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
lixioayao
|
26ed2cf916
超速超时添加日志
|
6 years ago |
|
zzj
|
ef7f265c92
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
zzj
|
6f7f926dfd
分站路径为空时，输出warn
|
6 years ago |
|
zzj
|
1c464ece3d
测试换行
|
6 years ago |
|
chensongchao
|
130e125658
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
lixioayao
|
577e1672cf
count_checker
|
6 years ago |
|
chensongchao
|
95c3682ac7
使用主干版本
|
6 years ago |
|
chensongchao
|
db236a0960
去掉打印日志
|
6 years ago |
|
chensongchao
|
07a1f1bf8e
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
chensongchao
|
9976991351
fix:2397 告警台：车辆区域超员告警无法实时恢复-BUG
|
6 years ago |
