community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

complete the event filter

Browse Source
This commit is contained in:
lashanfaliq95 2018-07-15 10:58:09 +05:30
parent e1ffd6341d
commit 3a7136abf9
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceEventManagementServiceImpl.java
View File

@ -444,12 +444,8 @@ public class DeviceEventManagementServiceImpl implements DeviceEventManagementSe
String query; String query;
if (min != 0 & max != 0) { if (min != 0 & max != 0) {
query = parameter + " : [" + min + " TO " + max + "]"; query = parameter + " : [" + min + " TO " + max + "]";
} else if (min != 0 & max == 0) {
query = parameter + " : [ " + min + " TO *]";
} else if (max != 0 & min == 0) {
query = parameter + " : [* TO " + max + "]";
} else { } else {
String errorMessage = "One of the range values need to be given"; String errorMessage = "The of range values need to be given";
log.error(errorMessage); log.error(errorMessage);
return Response.status(Response.Status.BAD_REQUEST).build(); return Response.status(Response.Status.BAD_REQUEST).build();
} }
@ -467,17 +463,14 @@ public class DeviceEventManagementServiceImpl implements DeviceEventManagementSe
List<SortByField> sortByFields = new ArrayList<>(); List<SortByField> sortByFields = new ArrayList<>();
SortByField sortByField = new SortByField(TIMESTAMP_FIELD_NAME, SortType.DESC); SortByField sortByField = new SortByField(TIMESTAMP_FIELD_NAME, SortType.DESC);
sortByFields.add(sortByField); sortByFields.add(sortByField);
EventRecords eventRecords = getAllEventsForDevice(sensorTableName, query, sortByFields, 0, 100); EventRecords eventRecords = getAllEventsForDevice(sensorTableName, query, sortByFields, 0, 100);
List<Record> filterdEvents = eventRecords.getRecord(); List<Record> filterdEvents = eventRecords.getRecord();
List<Record> uniqueFilterdEvents = new ArrayList<Record>(); List<Record> uniqueFilterdEvents = new ArrayList<Record>();
Set<String> devices = new HashSet<>(); Set<String> devices = new HashSet<>();
for (int i = 0; i < filterdEvents.size(); i++) { for (int i = 0; i < filterdEvents.size(); i++) {
String deviceid = (String) filterdEvents.get(i).getValue("meta_deviceId"); String deviceid = (String) filterdEvents.get(i).getValue("meta_deviceId");
long timestamp=(long).filterdEvents.get(i).getTimestamp(); long timestamp=(long)filterdEvents.get(i).getTimestamp();
Calendar c = java.util.Calendar.getInstance(); Calendar c = java.util.Calendar.getInstance();
long currentTimestamp = c.getTimeInMillis(); long currentTimestamp = c.getTimeInMillis();
if (!devices.contains(deviceid) && (currentTimestamp-timestamp<=300*1000)) { if (!devices.contains(deviceid) && (currentTimestamp-timestamp<=300*1000)) {