Skip to content

D
device-new-platform
Commit e969d5df authored by 赵啸非's avatar 赵啸非
Browse files
Options

部署资源添加分辨率字典

parent 58bd1241
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 16 deletions
device-manager/src/main/java/com/mortals/xhx/busiz/web/DeviceApiController.java
View file @ e969d5df
...@@ -224,20 +224,24 @@ public class DeviceApiController { ...@@ -224,20 +224,24 @@ public class DeviceApiController {
query.setImageResolution(resolution); query.setImageResolution(resolution);
query.setDistribute(DistributeEnum.是.getValue()); query.setDistribute(DistributeEnum.是.getValue());
DeviceModuleDistributeEntity distribute = deviceModuleDistributeService.selectOne(query); DeviceModuleDistributeEntity distribute = deviceModuleDistributeService.selectOne(query);
//homeDeviceUrl/1/pdj/1920x1080 if(!ObjectUtils.isEmpty(distribute)){
String homeUrl = String.format("/homeDeviceUrl/%s/%s/%s", distribute.getSiteId(), distribute.getProductCode(), distribute.getImageResolutionValue()); //homeDeviceUrl/1/pdj/1920x1080
//根据部署的资源 生成homeurl String homeUrl = String.format("/homeDeviceUrl/%s/%s/%s", distribute.getSiteId(), distribute.getProductCode(), distribute.getImageResolutionValue());
String domain = GlobalSysInfo.getParamValue(PARAM_SERVER_HTTP_URL, "http://192.168.0.98:11078"); //根据部署的资源 生成homeurl
if (!ObjectUtils.isEmpty(serverName) && Validator.isIpv4(serverName)) { String domain = GlobalSysInfo.getParamValue(PARAM_SERVER_HTTP_URL, "http://192.168.0.98:11078");
String str = UrlBuilder.of().setScheme(scheme).setHost(serverName).setPort(serverPort > 0 ? serverPort : 11078).addPath(homeUrl).build(); if (!ObjectUtils.isEmpty(serverName) && Validator.isIpv4(serverName)) {
String decodeStr = URLDecoder.decode(str, Charset.defaultCharset()); String str = UrlBuilder.of().setScheme(scheme).setHost(serverName).setPort(serverPort > 0 ? serverPort : 11078).addPath(homeUrl).build();
serverInfo.setHomeUrl(decodeStr); String decodeStr = URLDecoder.decode(str, Charset.defaultCharset());
serverInfo.setEventUrl(productEntity.getEventUrl()); serverInfo.setHomeUrl(decodeStr);
} else { serverInfo.setEventUrl(productEntity.getEventUrl());
String str = UrlBuilder.of(domain.trim()).addPath(homeUrl).build(); } else {
String decodeStr = URLDecoder.decode(str, Charset.defaultCharset()); String str = UrlBuilder.of(domain.trim()).addPath(homeUrl).build();
serverInfo.setHomeUrl(decodeStr); String decodeStr = URLDecoder.decode(str, Charset.defaultCharset());
serverInfo.setEventUrl(productEntity.getEventUrl()); serverInfo.setHomeUrl(decodeStr);
serverInfo.setEventUrl(productEntity.getEventUrl());
}
}else{
buildHomeUrlBySite(deviceEntity, productEntity, serverInfo, serverName, serverPort);
} }
}else{ }else{
buildHomeUrlBySite(deviceEntity, productEntity, serverInfo, serverName, serverPort); buildHomeUrlBySite(deviceEntity, productEntity, serverInfo, serverName, serverPort);
......
device-manager/src/test/java/com/mortals/httpclient/device/DeviceController.http
View file @ e969d5df
...@@ -111,12 +111,12 @@ client.global.set("authToken", JSON.parse(response.body).data); ...@@ -111,12 +111,12 @@ client.global.set("authToken", JSON.parse(response.body).data);
###注册设备 ###注册设备 D8-BB-C1-D7-E2-E3
POST {{baseUrl}}/api/register POST {{baseUrl}}/api/register
Content-Type: application/json Content-Type: application/json
{ {
"deviceCode": "5E-C5-16-0C-A6-0E" "deviceCode": "D8-BB-C1-D7-E2-E3"
} }
###获取产品与 ###获取产品与
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment