 lixioayao
|
37c874d181
修复区域core的bug,area_tool 升井的时候不能直接reset
|
6 years ago |
 chensongchao
|
8a0a2d2542
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
chensongchao
|
f13831b7aa
修改禁止人员下井,新增最下系统定时加载数据
|
6 years ago |
|
lixioayao
|
6e0e4a8f2b
为区域超员增加了锁，防止同时产生相同的告警事件
|
6 years ago |
|
lixioayao
|
757446bc36
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
 zzj
|
e9adb47b32
修改task相关线程间传输数据处理相关的内容，确保子类数据能够正确的构造、析构。
|
6 years ago |
|
lixioayao
|
d9ac303540
修复人卡离开区域消除告警bug 打开一人多卡功能
|
6 years ago |
|
zzj
|
203f267454
地图为0
|
6 years ago |
|
zzj
|
50e98b54c3
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
zzj
|
1f07ba41bb
根据日志文件分析是否存在延时重传问题；
|
6 years ago |
|
lixioayao
|
a833f07b0e
完善删除区域逻辑
|
6 years ago |
|
chensongchao
|
544409c913
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
chensongchao
|
66e4b9b892
修改禁止人员下井功能 数据初始化问题
|
6 years ago |
|
lixioayao
|
d18aca22ca
del a.cpp
|
6 years ago |
|
lixioayao
|
9a156ff918
修复前端推送区域消息处理逻辑bug
|
6 years ago |
|
lixioayao
|
58cd290ead
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
lixioayao
|
3a616ffd3c
pos area...
|
6 years ago |
|
zzj
|
9220df4c6c
连接失败时加了个日志
|
6 years ago |
|
zzj
|
5770e1f941
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
zzj
|
ef0b2c1185
socket超时时主动关闭连接。
|
6 years ago |
|
lixioayao
|
3d164e17fa
log for bug
|
6 years ago |
|
chensongchao
|
a80dab38f2
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
 liheting
|
21703b3189
Merge branch 'master' of chensongchao/ya-serv into master
|
6 years ago |
|
zzj
|
c7f714629c
添加分站连接和断开时的日志
|
6 years ago |
|
chensongchao
|
a3017796ba
修改禁止人员下井功能
|
6 years ago |
|
chensongchao
|
6f6e83f113
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
chensongchao
|
5820dcb5dc
修改禁止人员下井功能。。解决可能多线程导致的问题
|
6 years ago |
|
lixioayao
|
0dc4010092
fix conflict
|
6 years ago |
|
lixioayao
|
4c0918a89c
wsTimer.
|
6 years ago |
|
zzj
|
7692dbbdd0
添加报文太大、太小时报错及关闭连接的功能
|
6 years ago |
