部署资源添加分辨率字典

device-manager/src/main/java/com/mortals/xhx/busiz/web/DeviceApiController.java

@@ -514,20 +514,24 @@ public class DeviceApiController {
                 query.setImageResolution(resolution);
                 query.setDistribute(DistributeEnum.是.getValue());
                 DeviceModuleDistributeEntity distribute = deviceModuleDistributeService.selectOne(query);
-                //homeDeviceUrl/1/pdj/1920x1080
-                String homeUrl = String.format("/homeDeviceUrl/%s/%s/%s", distribute.getSiteId(), distribute.getProductCode(), distribute.getImageResolutionValue());
-                //根据部署的资源 生成homeurl
-                String domain = GlobalSysInfo.getParamValue(PARAM_SERVER_HTTP_URL, "http://192.168.0.98:11078");
-                if (!ObjectUtils.isEmpty(serverName) && Validator.isIpv4(serverName)) {
-                    String str = UrlBuilder.of().setScheme(scheme).setHost(serverName).setPort(serverPort > 0 ? serverPort : 11078).addPath(homeUrl).build();
-                    String decodeStr = URLDecoder.decode(str, Charset.defaultCharset());
-                    serverInfo.setHomeUrl(decodeStr);
-                    serverInfo.setEventUrl(productEntity.getEventUrl());
-                } else {
-                    String str = UrlBuilder.of(domain.trim()).addPath(homeUrl).build();
-                    String decodeStr = URLDecoder.decode(str, Charset.defaultCharset());
-                    serverInfo.setHomeUrl(decodeStr);
-                    serverInfo.setEventUrl(productEntity.getEventUrl());
+                if(!ObjectUtils.isEmpty(distribute)){
+                    //homeDeviceUrl/1/pdj/1920x1080
+                    String homeUrl = String.format("/homeDeviceUrl/%s/%s/%s", distribute.getSiteId(), distribute.getProductCode(), distribute.getImageResolutionValue());
+                    //根据部署的资源 生成homeurl
+                    String domain = GlobalSysInfo.getParamValue(PARAM_SERVER_HTTP_URL, "http://192.168.0.98:11078");
+                    if (!ObjectUtils.isEmpty(serverName) && Validator.isIpv4(serverName)) {
+                        String str = UrlBuilder.of().setScheme(scheme).setHost(serverName).setPort(serverPort > 0 ? serverPort : 11078).addPath(homeUrl).build();
+                        String decodeStr = URLDecoder.decode(str, Charset.defaultCharset());
+                        serverInfo.setHomeUrl(decodeStr);
+                        serverInfo.setEventUrl(productEntity.getEventUrl());
+                    } else {
+                        String str = UrlBuilder.of(domain.trim()).addPath(homeUrl).build();
+                        String decodeStr = URLDecoder.decode(str, Charset.defaultCharset());
+                        serverInfo.setHomeUrl(decodeStr);
+                        serverInfo.setEventUrl(productEntity.getEventUrl());
+                    }
+                }else{
+                    buildHomeUrlBySite(deviceEntity, productEntity, serverInfo, serverName, serverPort);
                 }
             }else{
                 buildHomeUrlBySite(deviceEntity, productEntity, serverInfo, serverName, serverPort);