|
db
|
42dfe4e53f
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 anni fa |
|
module_service
|
046323dac3
修改手动升井逻辑，不在盲区的卡，不允许升井
|
6 anni fa |
|
monkey_car
|
019252d59f
----
|
6 anni fa |
|
websocket
|
be91fa8d4c
处理 websocket 登录时异步回调问题
|
6 anni fa |
|
.gitignore
|
c74c6956bd
web重连
|
6 anni fa |
|
COPYING
|
77366d3fd3
初始化
|
6 anni fa |
|
INSTALL
|
77366d3fd3
初始化
|
6 anni fa |
|
Makefile.am
|
345b916eed
web实时修改人员及车辆信息,调试。新增禁止指定人员下井web更改通知采集服务器
|
6 anni fa |
|
README.md
|
cf36edfa89
README.md 添加中文说明
|
6 anni fa |
|
ant.cpp
|
67ef324abb
add log fro att.分站id变成-id,坐标保留3位数
|
6 anni fa |
|
ant.h
|
ec809e00ad
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 anni fa |
|
area.cpp
|
6466e775ff
1、区域修改业务类型，
|
6 anni fa |
|
area.h
|
6466e775ff
1、区域修改业务类型，
|
6 anni fa |
|
area_business.cpp
|
653947693b
从0开始，与数据库保持一致
|
6 anni fa |
|
area_business.h
|
8fecf823c6
修改 area_business 接口,添加 m_business_type 属性
|
6 anni fa |
|
async.cpp
|
969c17d516
no
|
6 anni fa |
|
base64.cpp
|
77366d3fd3
初始化
|
6 anni fa |
|
base64.h
|
77366d3fd3
初始化
|
6 anni fa |
|
bindmorecard.cpp
|
f4f8eeb8cf
fix morecard bug, && web bug
|
6 anni fa |
|
bindmorecard.h
|
97b8f2c6bf
his location for card
|
6 anni fa |
|
card.cpp
|
cb7ff6c56a
修改初始化人员及车辆的接口参数由int64->string。修改对应的代码
|
6 anni fa |
|
card.h
|
cb7ff6c56a
修改初始化人员及车辆的接口参数由int64->string。修改对应的代码
|
6 anni fa |
|
cardMgr.cpp
|
dd076817a9
加载采煤机 掘进机
|
6 anni fa |
|
cardMgr.h
|
df1d088cb0
record staffer no.
|
6 anni fa |
|
card_area.cpp
|
f5f6fbbef5
del site_area.h include
|
6 anni fa |
|
card_area.h
|
0e5c26419d
调整文件结构,db、websocket调整为静态库
|
6 anni fa |
|
card_base.cpp
|
42dfe4e53f
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 anni fa |
|
card_base.h
|
3c859796f4
修改函数传参 std::string ---> std::string& const
|
6 anni fa |
|
card_car.cpp
|
3c859796f4
修改函数传参 std::string ---> std::string& const
|
6 anni fa |
|
card_car.h
|
3c859796f4
修改函数传参 std::string ---> std::string& const
|
6 anni fa |
|
card_message_handle.cpp
|
4f78658f4d
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 anni fa |
|
card_message_handle.h
|
6466e775ff
1、区域修改业务类型，
|
6 anni fa |
|
card_path.cpp
|
01e73c2917
printf-->log_info
|
6 anni fa |
|
card_path.h
|
f9d366923c
inifile && sit_list write-copy
|
6 anni fa |
|
card_person.cpp
|
97390d4bbb
add CHAR_LOCATEDATASMALL_TOF_EXTEND
|
6 anni fa |
|
card_person.h
|
ae0533bbfa
人员曲线增加真实人数曲线
|
6 anni fa |
|
card_timer.xx
|
77366d3fd3
初始化
|
6 anni fa |
|
client.cpp
|
b8eee2b90c
变量初始化
|
6 anni fa |
|
clock.h
|
b20d3dab24
clock.h test
|
6 anni fa |
|
common.h
|
204034d4b3
删除车辆超时告警
|
6 anni fa |
|
common_tool.h
|
67ef324abb
add log fro att.分站id变成-id,坐标保留3位数
|
6 anni fa |
|
config.ini
|
0e5c26419d
调整文件结构,db、websocket调整为静态库
|
6 anni fa |
|
configure
|
46a3031e93
ya-serv目录自动编译db,websocket
|
6 anni fa |
|
configure.ac
|
46a3031e93
ya-serv目录自动编译db,websocket
|
6 anni fa |
|
configure.scan
|
47468d0b71
makefile* automake
|
6 anni fa |
|
crc.cpp
|
594b7137d1
修正crc计算的bug
|
6 anni fa |
|
crc.h
|
c9ffb81d0d
修改了一个bug,添加了crc校验算法文件
|
6 anni fa |
|
data_reader_antenna.txt
|
084021a7c1
monkeycar && push web
|
6 anni fa |
|
depcomp
|
969c17d516
no
|
6 anni fa |
|
event.cpp
|
e38251469e
fix bug for his_event_data
|
6 anni fa |
|
event.h
|
169544e01a
增加告警显示等级，针对不同性质的用户进行区别显示
|
6 anni fa |
|
forbid_staff_down_mine.cpp
|
cb7ff6c56a
修改初始化人员及车辆的接口参数由int64->string。修改对应的代码
|
6 anni fa |
|
forbid_staff_down_mine.h
|
345b916eed
web实时修改人员及车辆信息,调试。新增禁止指定人员下井web更改通知采集服务器
|
6 anni fa |
|
geo_hash.cpp
|
9271dd8f34
bak
|
6 anni fa |
|
geo_hash.h
|
9271dd8f34
bak
|
6 anni fa |
|
his_location.h
|
cc829e277b
修改his_location表结构
|
6 anni fa |
|
install-sh
|
969c17d516
no
|
6 anni fa |
|
io_buf.h
|
77366d3fd3
初始化
|
6 anni fa |
|
landmark.cpp
|
21dac69844
把数据库的连接池单实例创建 放到CDBSingletionDefine.h 对应修改调用头文件
|
6 anni fa |
|
landmark.h
|
f40cd71b08
monkeycar , and push card point to web
|
6 anni fa |
|
line.h
|
b1e5544770
merge..lemons's project
|
6 anni fa |
|
line_fit.cpp
|
b1e5544770
merge..lemons's project
|
6 anni fa |
|
line_fit.h
|
b1e5544770
merge..lemons's project
|
6 anni fa |
|
loc_message.h
|
5056e94235
将区域相关的业务结构进行了调整，接口基本梳理完成，设想如下：
|
6 anni fa |
|
loc_point.cpp
|
5056e94235
将区域相关的业务结构进行了调整，接口基本梳理完成，设想如下：
|
6 anni fa |
|
loc_point.h
|
dab3d33ffd
repair card && push list to web
|
6 anni fa |
|
loc_tool.cpp
|
5056e94235
将区域相关的业务结构进行了调整，接口基本梳理完成，设想如下：
|
6 anni fa |
|
loc_tool.h
|
78db8ce5c7
v1.0
|
6 anni fa |
|
main.cpp
|
be91fa8d4c
处理 websocket 登录时异步回调问题
|
6 anni fa |
|
main_test.h
|
cce64fe3d4
fix reader_erro
|
6 anni fa |
|
message.cpp
|
13de702069
message.h
|
6 anni fa |
|
message.h
|
97390d4bbb
add CHAR_LOCATEDATASMALL_TOF_EXTEND
|
6 anni fa |
|
message_file.cpp
|
77366d3fd3
初始化
|
6 anni fa |
|
message_file.h
|
77366d3fd3
初始化
|
6 anni fa |
|
mine.cpp
|
ad69fa3744
把之前的功能移到新框架上,1.井下，区域 超时超员 2.分站掉电 3.禁区进入呼叫
|
6 anni fa |
|
mine.h
|
67bab23f20
初步整理
|
6 anni fa |
|
mine_business.cpp
|
169544e01a
增加告警显示等级，针对不同性质的用户进行区别显示
|
6 anni fa |
|
mine_business.h
|
ae0533bbfa
人员曲线增加真实人数曲线
|
6 anni fa |
|
missing
|
969c17d516
no
|
6 anni fa |
|
net-service.cpp
|
bc5e6642ef
net 日期 月份+1
|
6 anni fa |
|
net-service.h
|
d5bc8c846b
添加分站供电状态变化告警接口“
|
6 anni fa |
|
path_tof.txt
|
548da1cc39
help .. up_mine.
|
6 anni fa |
|
point.cpp
|
f40cd71b08
monkeycar , and push card point to web
|
6 anni fa |
|
point.h
|
06057441c8
rear end
|
6 anni fa |
|
select_tool.cpp
|
5056e94235
将区域相关的业务结构进行了调整，接口基本梳理完成，设想如下：
|
6 anni fa |
|
select_tool.h
|
2d6fd0f8f7
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 anni fa |
|
special_area.cpp
|
21dac69844
把数据库的连接池单实例创建 放到CDBSingletionDefine.h 对应修改调用头文件
|
6 anni fa |
|
special_area.h
|
6487155a15
自动拖车
|
6 anni fa |
|
tdoa_sync.cpp
|
77366d3fd3
初始化
|
6 anni fa |
|
tdoa_sync.h
|
77366d3fd3
初始化
|
6 anni fa |
|
test.cpp
|
6466e775ff
1、区域修改业务类型，
|
6 anni fa |
|
tool_time.h
|
d21313a51f
初始化struct tm变量
|
6 anni fa |
|
tqueue.h
|
9271dd8f34
bak
|
6 anni fa |
|
visit.cpp
|
dab3d33ffd
repair card && push list to web
|
6 anni fa |
|
visit.h
|
3179448d2a
添加visit/accept,write-copy机制
|
6 anni fa |
|
web-client.cpp
|
8b1e7e3d01
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 anni fa |
|
web-client.h
|
77366d3fd3
初始化
|
6 anni fa |
|
webc.i
|
77366d3fd3
初始化
|
6 anni fa |
|
worker.cpp
|
6466e775ff
1、区域修改业务类型，
|
6 anni fa |
|
worker.h
|
6466e775ff
1、区域修改业务类型，
|
6 anni fa |
|
write-copy.h
|
969c17d516
no
|
6 anni fa |
|
ya_setting.cpp
|
552fe6a22a
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 anni fa |
|
ya_setting.h
|
06057441c8
rear end
|
6 anni fa |
|
zexception.h
|
5056e94235
将区域相关的业务结构进行了调整，接口基本梳理完成，设想如下：
|
6 anni fa |
|
zio.h
|
77366d3fd3
初始化
|
6 anni fa |
|
zlist.h
|
b1e5544770
merge..lemons's project
|
6 anni fa |
|
zloop.h
|
02a4b42a34
修改可能引起多初始化的bug
|
6 anni fa |
|
znet.cpp
|
4cacfcec12
时间戳检查移动到 site 类
|
6 anni fa |
|
znet.h
|
4cacfcec12
时间戳检查移动到 site 类
|
6 anni fa |
|
zstream.h
|
77366d3fd3
初始化
|
6 anni fa |
zzj
be91fa8d4c
处理 websocket 登录时异步回调问题