Change #321

Changed by	lixing
Changed at	Thu 29 Dec 2016 16:56:02
Repository	http://192.168.123.218:8888/svn/BH5000/MiddleWare/trunk
Project	MiddleWare
Revision	12604

Comments

[CHG]  Merge-4.8.x 12536,12540,12547,12569,12603
1. 数据保留失败
2. 振动报警数据同步只同步了一级转速
3. 修改了21036接口获取沉降波形错误
4. 没做标记的开停车数据，数据量超过400的时候，查不出数据。
5. 发生快变且报警的数据存储一份到报警数据表中

Changed files

INCLUDE/BHKD_utilities.h
S_OfflineSvr/PlantInfo.cpp
S_OfflineSvr/TransactData.cpp
S_OnlineSvr/AlarmPlantInfo.cpp
S_OnlineSvr/AlarmPlantInfo.h
S_OnlineSvr/OnlineGlobal.h
S_OnlineSvr/PlantInfo.cpp
S_OnlineSvr/TransactDaqData.cpp
S_SystemSvr/SysGlobal.h