inosh
/
device-mgt-plugins
forked from community/device-mgt-plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

few changes in virtual firealarm stats api

Browse Source
revert-dabc3590
ayyoob 9 years ago
parent 9c3b6e6b15
commit e3f117e8fe
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File

3
components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmControllerService.java
Unescape View File

@ -106,8 +106,7 @@ public interface VirtualFireAlarmControllerService {
@Consumes("application/json") @Consumes("application/json")
@Produces("application/json") @Produces("application/json")
Response getVirtualFirealarmStats(@PathParam("deviceId") String deviceId, Response getVirtualFirealarmStats(@PathParam("deviceId") String deviceId,
@PathParam("sensorName") String sensor, @PathParam("sensorName") String sensor, @QueryParam("from") long from,
@QueryParam("username") String user, @QueryParam("from") long from,
@QueryParam("to") long to); @QueryParam("to") long to);
} }

7
components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmControllerServiceImpl.java
Unescape View File

@ -179,12 +179,11 @@ public class VirtualFireAlarmControllerServiceImpl implements VirtualFireAlarmCo
@Consumes("application/json") @Consumes("application/json")
@Produces("application/json") @Produces("application/json")
public Response getVirtualFirealarmStats(@PathParam("deviceId") String deviceId, public Response getVirtualFirealarmStats(@PathParam("deviceId") String deviceId,
@PathParam("sensorName") String sensor, @PathParam("sensorName") String sensor, @QueryParam("from") long from,
@QueryParam("username") String user, @QueryParam("from") long from,
@QueryParam("to") long to) { @QueryParam("to") long to) {
String fromDate = String.valueOf(from); String fromDate = String.valueOf(from);
String toDate = String.valueOf(to); String toDate = String.valueOf(to);
String query = "owner:" + user + " AND deviceId:" + deviceId + " AND deviceType:" + String query = "deviceId:" + deviceId + " AND deviceType:" +
VirtualFireAlarmConstants.DEVICE_TYPE + " AND time : [" + fromDate + " TO " + toDate + "]"; VirtualFireAlarmConstants.DEVICE_TYPE + " AND time : [" + fromDate + " TO " + toDate + "]";
String sensorTableName = getSensorEventTableName(sensor); String sensorTableName = getSensorEventTableName(sensor);
try { try {
@ -194,7 +193,7 @@ public class VirtualFireAlarmControllerServiceImpl implements VirtualFireAlarmCo
} }
if (sensorTableName != null) { if (sensorTableName != null) {
List<SortByField> sortByFields = new ArrayList<>(); List<SortByField> sortByFields = new ArrayList<>();
SortByField sortByField = new SortByField("time", SORT.ASC, false); SortByField sortByField = new SortByField("time", SORT.DESC, true);
sortByFields.add(sortByField); sortByFields.add(sortByField);
List<SensorRecord> sensorRecords = APIUtil.getAllEventsForDevice(sensorTableName, query, sortByFields); List<SensorRecord> sensorRecords = APIUtil.getAllEventsForDevice(sensorTableName, query, sortByFields);
return Response.status(Response.Status.OK.getStatusCode()).entity(sensorRecords).build(); return Response.status(Response.Status.OK.getStatusCode()).entity(sensorRecords).build();

Write Preview
Loading…
Cancel
Save