 chensongchao
|
26e79143a7
新增井下警告文件到makefile.am
|
6 years ago |
|
chensongchao
|
aa43e7cef7
db_api 和 项目中使用的libya_db.so统一代码
|
6 years ago |
|
chensongchao
|
364e6a65cd
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
chensongchao
|
a8f40e184b
初始化井下超员警告判断
|
6 years ago |
 lixioayao
|
afa4e0f573
解决冲突，删除不需编译的文件
|
6 years ago |
|
lixioayao
|
7711ab8706
重构event && 拆离card文件减少文件依赖 && db和websocket 独立模块 && 增加分站中断告警，红膜考勤，采煤机数据解析
|
6 years ago |
|
chensongchao
|
e51105da6c
移植人员井下超员告警正常功能已完成
|
6 years ago |
 zzj
|
8726c44463
删除无需git源代码管理的文件
|
6 years ago |
|
zzj
|
d2fe4c25eb
删除无需源代码管理的文件
|
6 years ago |
|
zzj
|
14abe7ae3d
删除不必要的文件
|
6 years ago |
|
lixioayao
|
71a8aed0ad
reader_error && IDSDK && common function
|
6 years ago |
|
zzj
|
3adc48e1e8
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
zzj
|
1ef398c8a7
新建
|
6 years ago |
|
zzj
|
0e5c26419d
调整文件结构,db、websocket调整为静态库
|
6 years ago |
|
陈松潮
|
dad5b41c5e
Merge branch 'master' of chensongchao/ya-serv into master
|
6 years ago |
|
chensongchao
|
0fe457c798
删除db_api下的文件，改用 libya_db.so进行DB操作
|
6 years ago |
|
zzj
|
498f4f5831
修改了文件访问模式，应该是windows版本复制过来的时候没有设置好
|
6 years ago |
|
zzj
|
966d8abd30
1、db_api 中的源文件减去可执行的情况... chmod a-x *
|
6 years ago |
|
lixioayao
|
47468d0b71
makefile* automake
|
6 years ago |
|
lixioayao
|
13fb70e05c
merge main.cpp card.cpp
|
6 years ago |
|
lixioayao
|
b5149ee14e
point.h
|
6 years ago |
|
chensongchao
|
21dac69844
把数据库的连接池单实例创建 放到CDBSingletionDefine.h 对应修改调用头文件
|
6 years ago |
|
lixioayao
|
3cb767b4b9
handle his_location..
|
6 years ago |
 lainian
|
483190582b
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
lainian
|
1865ff3d5f
update db_api
|
6 years ago |
 daiyueteng
|
dd076817a9
加载采煤机 掘进机
|
6 years ago |
|
lainian
|
27f4258e50
no
|
6 years ago |
|
lixioayao
|
8dd720e30c
three rates
|
6 years ago |
|
lixioayao
|
a96598ccb5
three rates ....and staff_id
|
6 years ago |
|
lixioayao
|
208e296358
添加历史轨迹
|
6 years ago |
