 zhuyf
|
ebd80ee470
fix bug
|
3 lat temu |
 lixioayao
|
653947693b
从0开始，与数据库保持一致
|
5 lat temu |
 zzj
|
8fecf823c6
修改 area_business 接口,添加 m_business_type 属性
|
5 lat temu |
|
zzj
|
b92c83b7ad
区域业务类型改为从0bit开始
|
5 lat temu |
|
lixioayao
|
8222190a1b
修复防追尾bug
|
5 lat temu |
|
lixioayao
|
546e0f03a1
修改了分站初始化顺序，删除了不必要的函数和日志
|
5 lat temu |
 chensongchao
|
2171c2289d
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
5 lat temu |
|
chensongchao
|
ad69fa3744
把之前的功能移到新框架上,1.井下，区域 超时超员 2.分站掉电 3.禁区进入呼叫
|
5 lat temu |
 daiyueteng
|
f8f53fe812
增加几个业务 regist(10, new area_business_motionless_persion);
|
5 lat temu |
|
daiyueteng
|
8d7528d48d
增加 business_type >>= 1;
|
5 lat temu |
|
chensongchao
|
67e3bd4f46
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
5 lat temu |
|
chensongchao
|
f47437887c
同步主干代码，修改告警文件
|
5 lat temu |
|
zzj
|
ac84774560
添加某些静态成员函数的定义,添加area_business::get_...type 的定义
|
5 lat temu |
|
lixioayao
|
cce64fe3d4
fix reader_erro
|
5 lat temu |
|
chensongchao
|
276e833b5b
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
5 lat temu |
|
zzj
|
9bb99dd426
bug修改
|
5 lat temu |
|
chensongchao
|
5b2bda73ba
解决同步冲突
|
5 lat temu |
|
chensongchao
|
1d0cf5a7e1
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
5 lat temu |
|
lixioayao
|
4d72994cbf
..
|
5 lat temu |
|
zzj
|
71f50ff72f
拆分area_business.cpp中的业务到module_service/area_business_xxx.*
|
5 lat temu |
|
zzj
|
fab81c58ed
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
5 lat temu |
|
zzj
|
a9c3e76e84
修改area_business.on_enter局部参数为引用传递
|
5 lat temu |
|
daiyueteng
|
80021b0031
把#include"ya_evnet.h" 改为 #include"evnet.h"
|
5 lat temu |
|
chensongchao
|
552fe6a22a
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
5 lat temu |
|
lixioayao
|
ebc357ccad
完善区域框架逻辑
|
5 lat temu |
|
lixioayao
|
74e90d2568
区域注册area_business && 获取地标 && 完善on_point
|
5 lat temu |
|
zzj
|
6ca4cee23d
在worker线程中，添加定位卡每秒的定时调用
|
5 lat temu |
|
zzj
|
d52334c65a
将area_business修改为非共享指针返回
|
5 lat temu |
|
chensongchao
|
9ea7aebc03
隔爆电源交流电掉电告警功能
|
5 lat temu |
|
chensongchao
|
6e848b9992
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
5 lat temu |
