From 6c3f37816c8a6f5136636757226d5e2afc62b944 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=95=B8=E9=9D=9E?= <8153694@qq.com>
Date: Thu, 29 Feb 2024 11:35:25 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E7=BD=B2=E8=B5=84=E6=BA=90=E6=B7=BB?=
=?UTF-8?q?=E5=8A=A0=E5=88=86=E8=BE=A8=E7=8E=87=E5=AD=97=E5=85=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../xhx/busiz/web/DeviceApiController.java | 32 +++++++++++--------
1 file changed, 18 insertions(+), 14 deletions(-)
diff --git a/device-manager/src/main/java/com/mortals/xhx/busiz/web/DeviceApiController.java b/device-manager/src/main/java/com/mortals/xhx/busiz/web/DeviceApiController.java
index e613abb3..5a731af2 100644
--- a/device-manager/src/main/java/com/mortals/xhx/busiz/web/DeviceApiController.java
+++ b/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);
--
2.24.3