接口2.4升级到3.5,由于2.4是单机版、3.0是分布式版本,接口做了合并和修改,新的接口动态库名称为hd-datasdk-3.5.0.jar
1.层次结构的变化
原来HdSDK里的内容移动到com.baosight.hdjni下
2.连接和断开
新接口的HDDataServer增加了备机的ip和端口号,删除了资源管理和重连的接口
2.4 |
3.6 |
public static HDDataConnection getHDDataConnection(HDDataServer server) |
public static HDDataConnection getHDDataConnection(HDDataServer server) |
public static HDDataConnection getHDDataConnection(HDDataServer server, String userName, String userPwd) |
public static HDDataConnection getHDDataConnection(HDDataServer server, String userName, String userPwd) |
public static HDResourceConnection getHDResourceConnection(HDResourceServer server |
无 |
public static HDDataConnection reconnectHDDataConnection(HDDataServer server) |
无 |
3.数据查询接口的主要变化:
a.返回的List<HDRecord>变为带有错误码的pair,用来表示这条记录是否可用
b.传入参数原来用数组表示的,统一修改为List类型
c.批量查询接口增加一个名为errCode的返回参数,用来表示查询是全部成功或者是部分成功。用户在使用时,应该先判断此参数,如果全部成功,则不需要挨个判断返回的记录值;如果部分成功,还需要对单条记录对应的错误码一一进行判断。
d.批量查询接口,取消withError参数
数据查询的新旧接口对照
2.4 |
3.5 |
getRawRecordsCount(…) queryTagRawRecordsByCount(…) queryTagHisRawRecords(…) querySnapshotByTagID(…) |
相同 |
List<HDRecord> queryTagsHisInterRecordByMode(int[] tagIDs, Date interpTime, HDInterpolationMode mode) |
List<ImmutablePair<HDRecord, Integer>> queryTagsHisInterRecordByMode(List<Integer> tagIDs, Date interpTime, HDInterpolationMode mode, HDErrcode errcode) |
List<HDRecord> queryTagHisInterRecordsByMode(int tagID, Date startTime, Date endTime, long intervalInMs, HDInterpolationMode mode, boolean withError) |
List<ImmutablePair<HDRecord,Integer>> queryTagHisInterRecordsByMode(int tagID, Date startTime, Date endTime, long intervalInMs, HDInterpolationMode mode, HDErrcode errCode) |
List<HDRecord> queryTagHisInterRecordsByModeAscending(int tagID, Date startTime, Date endTime, long intervalInMs, HDInterpolationMode mode, boolean withError) |
List<ImmutablePair<HDRecord,Integer>> queryTagHisInterRecordsByModeAscending(int tagID, Date startTime, Date endTime, long intervalInMs, HDInterpolationMode mode, HDErrcode errCode) |
List<HDRecord> queryTagHisInterRecords(int tagID, Date startTime, Date endTime, long intervalInMs) |
List<ImmutablePair<HDRecord,Integer>> queryTagHisInterRecords(int tagID, Date startTime, Date endTime, long intervalInMs, HDErrcode errCode) |
List<HDRecord> querySnapshotsByIDs(int[] tagIDs, int[] errCodesOut) |
List<ImmutablePair<HDRecord, Integer>> querySnapshotsByIDs(List<Integer> tagIDs, HDErrcode errCode) |
List<HDRecord> queryTagHisInterRecordsByMode(int tagID, HDInterpolationMode mode, int nRecNum, HDRecord[] HDRecords ) |
List<ImmutablePair<HDRecord, Integer>> queryTagHisInterRecordsByMode(int tagID, HDInterpolationMode mode, int nRecNum, List<HDRecord> hdRecords , HDErrcode errCode) |
4.统计接口的变化
2.4版本的统计接口分为最大值、最小值等几个,在3.5版本统一改为一个整体的统计接口。其中可以指定statsType是某一种统计类型,支持的统计类型由原来的5种增加到了24种。
统计接口新旧对比
2.4 |
3.6 |
getTagMax(…) getTagMeanByWeightmode(…) getTagMin(…) getTagPercentGood(…) getTagSum(…) |
double getTagStats(int tagID, HDStatsType statsType, Date startTime, Date endTime, HDSampleType sampleType, int samplePeriod, int sampleOffset, double extParam1, double extParam2, String szFilterExpr, int nFilterFailMode) |
5.Tag点接口的变化
a.增加扩展属性掩码
b.批量查询返回的点带有独立的错误码,同时增加判断是否全部成功的返回码
c.增加分页查询接口
d.增加适合于全部类型点的条件查询接口
2.4 |
3.6 |
void addBasicTag(HDBasicTag basicTag, final long mask) |
void addBasicTag(HDBasicTag basicTag, final long mask, final long extmask) |
void addAlarmTag(HDAlarmTag alarmTag, final long mask) |
void addAlarmTag(HDAlarmTag alarmTag, final long mask, final long extmask) |
void deleteAlarmTagById(int tagId) |
同 |
void deleteAlarmTagByName(String tagName) |
同 |
void deleteBasicTagById(int tagId) |
同 |
void deleteBasicTagByName(String tagName) |
同 |
HDAlarmTag getAlarmTagById(int tagId) |
同 |
HDAlarmTag getAlarmTagByName(String tagName) |
同 |
HDBasicTag getBasicTagById(int tagId) |
同 |
HDBasicTag getBasicTagByName(String tagName) |
同 |
HDTagDataType getTagDataType(int tagID) |
同 |
int getTagIDByTagName(String tagName) |
同 |
List<Integer> getTagIDsByTagNames(List<String> tagNameList, int [] errorCodesOut) |
List<ImmutablePair<Integer,Integer>> getTagIDsByTagNames(List<String> tagNameList,HDErrcode errCode) |
boolean isTagNameExist(String tagName) |
同 |
void modifyAlarmTag(HDAlarmTag aTag, final long mask) |
void modifyAlarmTag(HDAlarmTag aTag, final long mask, final long extmask) |
void modifyBasicTag(HDBasicTag basicTag, final long mask) |
void modifyBasicTag(HDBasicTag basicTag, final long mask, final long extmask) |
List<HDBasicTag> queryBasicTagsByConds(HDQueryTagCondition[] queryConditions, long returnPropMask) |
List<HDBasicTag> queryBasicTagsByConds(List<HDQueryTagCondition> queryConditions, long returnPropMask, long nExtPropMask) |
List<HDBasicTag> queryBasicTagsSimple( String tagName, String tagDesc, HDTagDataType dataTypeCond, boolean fuzzy) |
同 |
|
List<HDCommTag> queryTagsByConds(List<HDQueryTagCondition> queryConditions, long tagClassMask, long propMask) |
|
List<HDCommTag> querySpecifyPageTagsByConds(List<HDQueryTagCondition> queryConditions, int limit, int offset, long TagClassMask, long PropMask) |
|
int queryTagNumCond(HDTagClass tagClass, List<HDQueryTagCondition> queryConditions) |
6.存数据接口的变化
a.传入参数数组改为List
b.saveSnapshots接口增加判断是否全部成功的接口,每一条记录对应的错误码作为返回值返回
7.报警接口的变化
a.传入参数数组改为List
b.HdTime结构体重命名为HDJniTime
c.新增报警回调接口
void acknowledgeAlarm(int nAlarmTagID, HdTime alarmTime) |
void acknowledgeAlarm(int nAlarmTagID, HDJniTime alarmTime) |
void commentAlarm( int nAlarmTagID, HdTime alarmTime, String strComment) |
void commentAlarm( int nAlarmTagID, HDJniTime alarmTime, String strComment) |
Map<Integer, List<HDAlarmRecord>> queryAlarmGroupRecords(int nAlarmGroupID, HdAlarmQuery queryCond, long nMask) |
同 |
Map<Integer, List<HDAlarmRecord>> queryAlarmRecords(int[] alarmTagIDs, HdAlarmQuery alarmQuery, long resultPropMask) |
Map<Integer, List<HDAlarmRecord>> queryAlarmRecords(List<Integer> alarmTagIDs, HdAlarmQuery alarmQuery, long resultPropMask) |
HDAlarmRecord queryAlarmSnapshot(int nAlarmTagID, long nPropMask) |
同 |
Map<Integer, HDAlarmRecord> queryAlarmSnapshots(int[] alarmTagIDs, long nMask) |
Map<Integer, HDAlarmRecord> queryAlarmSnapshots(List<Integer> alarmTagIDs, long nMask) |
Map<Integer, List<HDAlarmRecord>> queryAllAlarmRecordsByTime(int[] alarmTagIDs, Date startTime, Date endTime) |
Map<Integer, List<HDAlarmRecord>> queryAllAlarmRecordsByTime(List<Integer> alarmTagIDs, Date startTime, Date endTime) |
|
List<HDAlarmRecord> GetAlarmcallback()
|
|
int registerAmCallback() |
|
List<HDAlarmRecord> transAlarmlist(int num,List<HDJniAlarmRecord> sourceAlarmlist) |