 chensongchao
|
c70c9f0518
修改禁止人员下井的SQL
|
6 years ago |
 zzj
|
64aff59878
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
chensongchao
|
3c96940c35
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
chensongchao
|
40c18d3c6a
合并代码
|
6 years ago |
|
chensongchao
|
502b6529a6
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
zzj
|
514c23ca75
1、修改区域/区域业务类型赋值在区域更新时混淆错误的问题。
|
6 years ago |
 lixioayao
|
d006776dbe
修复限制入井初始化
|
6 years ago |
|
lixioayao
|
3291cc722a
限制人员入井
|
6 years ago |
|
lixioayao
|
d22a7215dc
m_area_type 保存区域业务逻辑值
|
6 years ago |
|
chensongchao
|
ed9d332550
去除多余的功能，禁止人员下井
|
6 years ago |
|
chensongchao
|
2e5455ee08
主干去掉 最小系统功能
|
6 years ago |
|
chensongchao
|
cc9b2c8718
主干去掉 最小系统功能
|
6 years ago |
|
chensongchao
|
fc99b141a5
主干去掉 最小系统功能
|
6 years ago |
|
chensongchao
|
400a1c7986
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
lixioayao
|
d49829f39b
del person_time
|
6 years ago |
|
lixioayao
|
c9c9d0444d
修复冲突
|
6 years ago |
|
lixioayao
|
1aaa4e4930
区域时长改成分钟
|
6 years ago |
|
zzj
|
f9c8be31c7
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
zzj
|
9332d99684
修改人员井下超时的时间单位为分钟。
|
6 years ago |
|
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 |
