 zzj
|
6bf1e1ff7f
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
zzj
|
24abfc63a7
printf-->log_info
|
6 years ago |
 lixioayao
|
6a90c06a3d
websocket 修改Makefile.am
|
6 years ago |
 chensongchao
|
9bf3ff72d4
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
lixioayao
|
653947693b
从0开始，与数据库保持一致
|
6 years ago |
|
chensongchao
|
873c4f8beb
web实时修改人员及车辆信息，通知采集服务器重新加载修改的车辆或者人员信息
|
6 years ago |
|
lixioayao
|
06445d7fce
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
 liheting
|
16ff098473
Merge branch 'master' of daiyueteng/ya-serv into master
|
6 years ago |
|
lixioayao
|
169544e01a
增加告警显示等级，针对不同性质的用户进行区别显示
|
6 years ago |
 daiyueteng
|
1266ce93bb
web重连与静止告警
|
6 years ago |
|
daiyueteng
|
9ceda2f324
web重连与静止告警
|
6 years ago |
|
daiyueteng
|
af0c4f3934
改为无限重连
|
6 years ago |
 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 |
