|
|
|
@ -302,11 +302,12 @@ public class VirtualFireAlarmService {
|
|
|
|
@GET
|
|
|
|
@GET
|
|
|
|
@Produces("application/octet-stream")
|
|
|
|
@Produces("application/octet-stream")
|
|
|
|
public Response downloadSketch(@QueryParam("owner") String owner,
|
|
|
|
public Response downloadSketch(@QueryParam("owner") String owner,
|
|
|
|
|
|
|
|
// @QueryParam("deviceName") String customDeviceName,
|
|
|
|
@PathParam("sketch_type") String sketchType) {
|
|
|
|
@PathParam("sketch_type") String sketchType) {
|
|
|
|
|
|
|
|
|
|
|
|
ZipArchive zipFile = null;
|
|
|
|
ZipArchive zipFile = null;
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
zipFile = createDownloadFile(owner, sketchType);
|
|
|
|
zipFile = createDownloadFile(owner, "SMEANS FireAlarm", sketchType);
|
|
|
|
Response.ResponseBuilder rb = Response.ok(zipFile.getZipFile());
|
|
|
|
Response.ResponseBuilder rb = Response.ok(zipFile.getZipFile());
|
|
|
|
rb.header("Content-Disposition",
|
|
|
|
rb.header("Content-Disposition",
|
|
|
|
"attachment; filename=\"" + zipFile.getFileName() + "\"");
|
|
|
|
"attachment; filename=\"" + zipFile.getFileName() + "\"");
|
|
|
|
@ -326,11 +327,12 @@ public class VirtualFireAlarmService {
|
|
|
|
@Path("manager/device/{sketch_type}/generate_link")
|
|
|
|
@Path("manager/device/{sketch_type}/generate_link")
|
|
|
|
@GET
|
|
|
|
@GET
|
|
|
|
public Response generateSketchLink(@QueryParam("owner") String owner,
|
|
|
|
public Response generateSketchLink(@QueryParam("owner") String owner,
|
|
|
|
|
|
|
|
@QueryParam("deviceName") String customDeviceName,
|
|
|
|
@PathParam("sketch_type") String sketchType) {
|
|
|
|
@PathParam("sketch_type") String sketchType) {
|
|
|
|
|
|
|
|
|
|
|
|
ZipArchive zipFile = null;
|
|
|
|
ZipArchive zipFile = null;
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
zipFile = createDownloadFile(owner, sketchType);
|
|
|
|
zipFile = createDownloadFile(owner, customDeviceName, sketchType);
|
|
|
|
Response.ResponseBuilder rb = Response.ok(zipFile.getDeviceId());
|
|
|
|
Response.ResponseBuilder rb = Response.ok(zipFile.getDeviceId());
|
|
|
|
return rb.build();
|
|
|
|
return rb.build();
|
|
|
|
} catch (IllegalArgumentException ex) {
|
|
|
|
} catch (IllegalArgumentException ex) {
|
|
|
|
@ -345,7 +347,7 @@ public class VirtualFireAlarmService {
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
private ZipArchive createDownloadFile(String owner, String sketchType)
|
|
|
|
private ZipArchive createDownloadFile(String owner, String customDeviceName, String sketchType)
|
|
|
|
throws DeviceManagementException, AccessTokenException, DeviceControllerException {
|
|
|
|
throws DeviceManagementException, AccessTokenException, DeviceControllerException {
|
|
|
|
if (owner == null) {
|
|
|
|
if (owner == null) {
|
|
|
|
throw new IllegalArgumentException("Error on createDownloadFile() Owner is null!");
|
|
|
|
throw new IllegalArgumentException("Error on createDownloadFile() Owner is null!");
|
|
|
|
@ -356,7 +358,6 @@ public class VirtualFireAlarmService {
|
|
|
|
|
|
|
|
|
|
|
|
TokenClient accessTokenClient = new TokenClient(VirtualFireAlarmConstants.DEVICE_TYPE);
|
|
|
|
TokenClient accessTokenClient = new TokenClient(VirtualFireAlarmConstants.DEVICE_TYPE);
|
|
|
|
AccessTokenInfo accessTokenInfo = null;
|
|
|
|
AccessTokenInfo accessTokenInfo = null;
|
|
|
|
|
|
|
|
|
|
|
|
accessTokenInfo = accessTokenClient.getAccessToken(owner, deviceId);
|
|
|
|
accessTokenInfo = accessTokenClient.getAccessToken(owner, deviceId);
|
|
|
|
|
|
|
|
|
|
|
|
//create token
|
|
|
|
//create token
|
|
|
|
@ -373,21 +374,25 @@ public class VirtualFireAlarmService {
|
|
|
|
XmppServerClient xmppServerClient = new XmppServerClient();
|
|
|
|
XmppServerClient xmppServerClient = new XmppServerClient();
|
|
|
|
xmppServerClient.initControlQueue();
|
|
|
|
xmppServerClient.initControlQueue();
|
|
|
|
boolean status;
|
|
|
|
boolean status;
|
|
|
|
|
|
|
|
|
|
|
|
if (XmppConfig.getInstance().isEnabled()) {
|
|
|
|
if (XmppConfig.getInstance().isEnabled()) {
|
|
|
|
status = xmppServerClient.createXMPPAccount(newXmppAccount);
|
|
|
|
status = xmppServerClient.createXMPPAccount(newXmppAccount);
|
|
|
|
|
|
|
|
|
|
|
|
if (!status) {
|
|
|
|
if (!status) {
|
|
|
|
String msg =
|
|
|
|
String msg =
|
|
|
|
"XMPP Account was not created for device - " + deviceId + " of owner - " +
|
|
|
|
"XMPP Account was not created for device - " + deviceId + " of owner - " +
|
|
|
|
owner +
|
|
|
|
owner +
|
|
|
|
". XMPP might have been disabled in org.wso2.carbon.device.mgt.iot.common.config.server.configs";
|
|
|
|
".XMPP might have been disabled in org.wso2.carbon.device.mgt.iot" +
|
|
|
|
|
|
|
|
".common.config.server.configs";
|
|
|
|
log.warn(msg);
|
|
|
|
log.warn(msg);
|
|
|
|
throw new DeviceManagementException(msg);
|
|
|
|
throw new DeviceManagementException(msg);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
status = register(deviceId, owner + "s_" + sketchType + "_" + deviceId.substring(0,
|
|
|
|
|
|
|
|
3),
|
|
|
|
//Register the device with CDMF
|
|
|
|
owner);
|
|
|
|
String deviceName = customDeviceName + "_" + deviceId;
|
|
|
|
|
|
|
|
status = register(deviceId, deviceName, owner);
|
|
|
|
|
|
|
|
// status = register(deviceId, owner + "s_" + sketchType + "_" + deviceId.substring(0, 3),
|
|
|
|
|
|
|
|
// owner);
|
|
|
|
if (!status) {
|
|
|
|
if (!status) {
|
|
|
|
String msg = "Error occurred while registering the device with " + "id: " + deviceId
|
|
|
|
String msg = "Error occurred while registering the device with " + "id: " + deviceId
|
|
|
|
+ " owner:" + owner;
|
|
|
|
+ " owner:" + owner;
|
|
|
|
@ -397,8 +402,8 @@ public class VirtualFireAlarmService {
|
|
|
|
|
|
|
|
|
|
|
|
ZipUtil ziputil = new ZipUtil();
|
|
|
|
ZipUtil ziputil = new ZipUtil();
|
|
|
|
ZipArchive zipFile = null;
|
|
|
|
ZipArchive zipFile = null;
|
|
|
|
|
|
|
|
zipFile = ziputil.downloadSketch(owner, SUPER_TENANT, sketchType, deviceId, deviceName,
|
|
|
|
zipFile = ziputil.downloadSketch(owner,SUPER_TENANT, sketchType, deviceId, accessToken, refreshToken);
|
|
|
|
accessToken, refreshToken);
|
|
|
|
zipFile.setDeviceId(deviceId);
|
|
|
|
zipFile.setDeviceId(deviceId);
|
|
|
|
return zipFile;
|
|
|
|
return zipFile;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -474,7 +479,8 @@ public class VirtualFireAlarmService {
|
|
|
|
String protocolString = protocol.toUpperCase();
|
|
|
|
String protocolString = protocol.toUpperCase();
|
|
|
|
String callUrlPattern = VirtualFireAlarmConstants.BULB_CONTEXT + switchToState;
|
|
|
|
String callUrlPattern = VirtualFireAlarmConstants.BULB_CONTEXT + switchToState;
|
|
|
|
|
|
|
|
|
|
|
|
log.info("Sending command: '" + callUrlPattern + "' to virtual-firealarm at: " + deviceIP + " " +
|
|
|
|
log.info("Sending command: '" + callUrlPattern + "' to virtual-firealarm at: " + deviceIP +
|
|
|
|
|
|
|
|
" " +
|
|
|
|
"via" + " " + protocolString);
|
|
|
|
"via" + " " + protocolString);
|
|
|
|
|
|
|
|
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
@ -483,11 +489,13 @@ public class VirtualFireAlarmService {
|
|
|
|
sendCommandViaHTTP(deviceIP, 9090, callUrlPattern, true);
|
|
|
|
sendCommandViaHTTP(deviceIP, 9090, callUrlPattern, true);
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
case MQTT_PROTOCOL:
|
|
|
|
case MQTT_PROTOCOL:
|
|
|
|
sendCommandViaMQTT(owner, deviceId, VirtualFireAlarmConstants.BULB_CONTEXT.replace("/", ""),
|
|
|
|
sendCommandViaMQTT(owner, deviceId,
|
|
|
|
|
|
|
|
VirtualFireAlarmConstants.BULB_CONTEXT.replace("/", ""),
|
|
|
|
switchToState);
|
|
|
|
switchToState);
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
case XMPP_PROTOCOL:
|
|
|
|
case XMPP_PROTOCOL:
|
|
|
|
sendCommandViaXMPP(owner, deviceId, VirtualFireAlarmConstants.BULB_CONTEXT, switchToState);
|
|
|
|
sendCommandViaXMPP(owner, deviceId, VirtualFireAlarmConstants.BULB_CONTEXT,
|
|
|
|
|
|
|
|
switchToState);
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
default:
|
|
|
|
if (protocolString == null) {
|
|
|
|
if (protocolString == null) {
|
|
|
|
@ -542,24 +550,34 @@ public class VirtualFireAlarmService {
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
switch (protocol) {
|
|
|
|
switch (protocol) {
|
|
|
|
case HTTP_PROTOCOL:
|
|
|
|
case HTTP_PROTOCOL:
|
|
|
|
log.info("Sending request to read sonar value at : " + deviceIp + " via " + HTTP_PROTOCOL);
|
|
|
|
log.info("Sending request to read sonar value at : " + deviceIp + " via " +
|
|
|
|
replyMsg = sendCommandViaHTTP(deviceIp, 9090, VirtualFireAlarmConstants.SONAR_CONTEXT, false);
|
|
|
|
HTTP_PROTOCOL);
|
|
|
|
|
|
|
|
replyMsg = sendCommandViaHTTP(deviceIp, 9090,
|
|
|
|
|
|
|
|
VirtualFireAlarmConstants.SONAR_CONTEXT, false);
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
case MQTT_PROTOCOL:
|
|
|
|
case MQTT_PROTOCOL:
|
|
|
|
log.info("Sending request to read sonar value at : " + deviceIp + " via " + MQTT_PROTOCOL);
|
|
|
|
log.info("Sending request to read sonar value at : " + deviceIp + " via " +
|
|
|
|
sendCommandViaMQTT(owner, deviceId, VirtualFireAlarmConstants.SONAR_CONTEXT.replace("/", ""), "");
|
|
|
|
MQTT_PROTOCOL);
|
|
|
|
|
|
|
|
sendCommandViaMQTT(owner, deviceId,
|
|
|
|
|
|
|
|
VirtualFireAlarmConstants.SONAR_CONTEXT.replace("/", ""),
|
|
|
|
|
|
|
|
"");
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
case XMPP_PROTOCOL:
|
|
|
|
case XMPP_PROTOCOL:
|
|
|
|
log.info("Sending request to read sonar value at : " + deviceIp + " via " + XMPP_PROTOCOL);
|
|
|
|
log.info("Sending request to read sonar value at : " + deviceIp + " via " +
|
|
|
|
replyMsg = sendCommandViaXMPP(owner, deviceId, VirtualFireAlarmConstants.SONAR_CONTEXT, ".");
|
|
|
|
XMPP_PROTOCOL);
|
|
|
|
|
|
|
|
replyMsg = sendCommandViaXMPP(owner, deviceId,
|
|
|
|
|
|
|
|
VirtualFireAlarmConstants.SONAR_CONTEXT, ".");
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
default:
|
|
|
|
if (protocol == null) {
|
|
|
|
if (protocol == null) {
|
|
|
|
log.info("Sending request to read sonar value at : " + deviceIp + " via " + HTTP_PROTOCOL);
|
|
|
|
log.info("Sending request to read sonar value at : " + deviceIp + " via " +
|
|
|
|
replyMsg = sendCommandViaHTTP(deviceIp, 9090, VirtualFireAlarmConstants.SONAR_CONTEXT, false);
|
|
|
|
HTTP_PROTOCOL);
|
|
|
|
|
|
|
|
replyMsg = sendCommandViaHTTP(deviceIp, 9090,
|
|
|
|
|
|
|
|
VirtualFireAlarmConstants.SONAR_CONTEXT,
|
|
|
|
|
|
|
|
false);
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
replyMsg = "Requested protocol '" + protocol + "' is not supported";
|
|
|
|
replyMsg = "Requested protocol '" + protocol + "' is not supported";
|
|
|
|
response.setStatus(Response.Status.NOT_ACCEPTABLE.getStatusCode());
|
|
|
|
response.setStatus(Response.Status.NOT_ACCEPTABLE.getStatusCode());
|
|
|
|
@ -612,24 +630,38 @@ public class VirtualFireAlarmService {
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
switch (protocol) {
|
|
|
|
switch (protocol) {
|
|
|
|
case HTTP_PROTOCOL:
|
|
|
|
case HTTP_PROTOCOL:
|
|
|
|
log.info("Sending request to read virtual-firealarm-temperature at : " + deviceIp + " via " + HTTP_PROTOCOL);
|
|
|
|
log.info("Sending request to read virtual-firealarm-temperature at : " +
|
|
|
|
replyMsg = sendCommandViaHTTP(deviceIp, 9090, VirtualFireAlarmConstants.TEMPERATURE_CONTEXT, false);
|
|
|
|
deviceIp + " via " + HTTP_PROTOCOL);
|
|
|
|
|
|
|
|
replyMsg = sendCommandViaHTTP(deviceIp, 9090,
|
|
|
|
|
|
|
|
VirtualFireAlarmConstants.TEMPERATURE_CONTEXT,
|
|
|
|
|
|
|
|
false);
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
case MQTT_PROTOCOL:
|
|
|
|
case MQTT_PROTOCOL:
|
|
|
|
log.info("Sending request to read virtual-firealarm-temperature at : " + deviceIp + " via " + MQTT_PROTOCOL);
|
|
|
|
log.info("Sending request to read virtual-firealarm-temperature at : " +
|
|
|
|
sendCommandViaMQTT(owner, deviceId, VirtualFireAlarmConstants.TEMPERATURE_CONTEXT.replace("/", ""), "");
|
|
|
|
deviceIp + " via " + MQTT_PROTOCOL);
|
|
|
|
|
|
|
|
sendCommandViaMQTT(owner, deviceId,
|
|
|
|
|
|
|
|
VirtualFireAlarmConstants.TEMPERATURE_CONTEXT.replace("/",
|
|
|
|
|
|
|
|
""),
|
|
|
|
|
|
|
|
"");
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
case XMPP_PROTOCOL:
|
|
|
|
case XMPP_PROTOCOL:
|
|
|
|
log.info("Sending request to read virtual-firealarm-temperature at : " + deviceIp + " via " + XMPP_PROTOCOL);
|
|
|
|
log.info("Sending request to read virtual-firealarm-temperature at : " +
|
|
|
|
replyMsg = sendCommandViaXMPP(owner, deviceId, VirtualFireAlarmConstants.TEMPERATURE_CONTEXT, ".");
|
|
|
|
deviceIp + " via " + XMPP_PROTOCOL);
|
|
|
|
|
|
|
|
replyMsg = sendCommandViaXMPP(owner, deviceId,
|
|
|
|
|
|
|
|
VirtualFireAlarmConstants.TEMPERATURE_CONTEXT,
|
|
|
|
|
|
|
|
".");
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
default:
|
|
|
|
if (protocol == null) {
|
|
|
|
if (protocol == null) {
|
|
|
|
log.info("Sending request to read virtual-firealarm-temperature at : " + deviceIp + " via " + HTTP_PROTOCOL);
|
|
|
|
log.info("Sending request to read virtual-firealarm-temperature at : " +
|
|
|
|
replyMsg = sendCommandViaHTTP(deviceIp, 9090, VirtualFireAlarmConstants.TEMPERATURE_CONTEXT, false);
|
|
|
|
deviceIp + " via " + HTTP_PROTOCOL);
|
|
|
|
|
|
|
|
replyMsg = sendCommandViaHTTP(deviceIp, 9090,
|
|
|
|
|
|
|
|
VirtualFireAlarmConstants
|
|
|
|
|
|
|
|
.TEMPERATURE_CONTEXT,
|
|
|
|
|
|
|
|
false);
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
replyMsg = "Requested protocol '" + protocol + "' is not supported";
|
|
|
|
replyMsg = "Requested protocol '" + protocol + "' is not supported";
|
|
|
|
response.setStatus(Response.Status.NOT_ACCEPTABLE.getStatusCode());
|
|
|
|
response.setStatus(Response.Status.NOT_ACCEPTABLE.getStatusCode());
|
|
|
|
@ -667,7 +699,9 @@ public class VirtualFireAlarmService {
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
} else if (!registeredIp.equals(deviceIp)) {
|
|
|
|
} else if (!registeredIp.equals(deviceIp)) {
|
|
|
|
log.warn("Conflicting IP: Received IP is " + deviceIp + ". Device with ID " +
|
|
|
|
log.warn("Conflicting IP: Received IP is " + deviceIp + ". Device with ID " +
|
|
|
|
deviceId + " is already registered under some other IP. Re-registration " + "required");
|
|
|
|
deviceId +
|
|
|
|
|
|
|
|
" is already registered under some other IP. Re-registration " +
|
|
|
|
|
|
|
|
"required");
|
|
|
|
response.setStatus(Response.Status.CONFLICT.getStatusCode());
|
|
|
|
response.setStatus(Response.Status.CONFLICT.getStatusCode());
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -677,7 +711,8 @@ public class VirtualFireAlarmService {
|
|
|
|
ctx.setTenantDomain(SUPER_TENANT, true);
|
|
|
|
ctx.setTenantDomain(SUPER_TENANT, true);
|
|
|
|
DeviceAnalyticsService deviceAnalyticsService = (DeviceAnalyticsService) ctx
|
|
|
|
DeviceAnalyticsService deviceAnalyticsService = (DeviceAnalyticsService) ctx
|
|
|
|
.getOSGiService(DeviceAnalyticsService.class, null);
|
|
|
|
.getOSGiService(DeviceAnalyticsService.class, null);
|
|
|
|
Object metdaData[] = {dataMsg.owner, VirtualFireAlarmConstants.DEVICE_TYPE, dataMsg.deviceId,
|
|
|
|
Object metdaData[] =
|
|
|
|
|
|
|
|
{dataMsg.owner, VirtualFireAlarmConstants.DEVICE_TYPE, dataMsg.deviceId,
|
|
|
|
System.currentTimeMillis()};
|
|
|
|
System.currentTimeMillis()};
|
|
|
|
Object payloadData[] = {temperature};
|
|
|
|
Object payloadData[] = {temperature};
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
@ -887,7 +922,9 @@ public class VirtualFireAlarmService {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
String responseMsg = "";
|
|
|
|
String responseMsg = "";
|
|
|
|
String urlString = VirtualFireAlarmConstants.URL_PREFIX + deviceIp + ":" + deviceServerPort + callUrlPattern;
|
|
|
|
String urlString =
|
|
|
|
|
|
|
|
VirtualFireAlarmConstants.URL_PREFIX + deviceIp + ":" + deviceServerPort +
|
|
|
|
|
|
|
|
callUrlPattern;
|
|
|
|
|
|
|
|
|
|
|
|
if (log.isDebugEnabled()) {
|
|
|
|
if (log.isDebugEnabled()) {
|
|
|
|
log.debug(urlString);
|
|
|
|
log.debug(urlString);
|
|
|
|
|
Shabirmean
9 years ago