添加批量激活设备

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

@@ -158,7 +158,7 @@ public class DeviceApiController {
             //authInfo.setHost(masterhost);
             //设备地址修改为客户端访问服务端的ip地址
            // authInfo.setHost(url.getHost());
-            if(Validator.isIpv4(serverName)){
+            if(!ObjectUtils.isEmpty(serverName)&&Validator.isIpv4(serverName)){
                 authInfo.setHost(serverName);
             }else{
                 log.info("设置后台定义的参数地址!{}",url.toString());
@@ -200,7 +200,7 @@ public class DeviceApiController {
             //对外地址，访问ip+端口 端口号由platformEntity.getSendUrl()获取
             URI uri = new URI(platformEntity.getSendUrl());
             int port = uri.getPort();
-            if (port != -1 && Validator.isIpv4(serverName)) {
+            if (port != -1 &&!ObjectUtils.isEmpty(serverName)&& Validator.isIpv4(serverName)) {
                 String serverUrl = UrlBuilder.ofHttp(serverName).setPort(port).build();
                 serverInfo.setServerUrl(serverUrl);
             } else {
@@ -931,7 +931,7 @@ public class DeviceApiController {
         }
         //log.info("domain:" + GlobalSysInfo.getParamValue(PARAM_SERVER_HTTP_URL, ""));
         String domain = GlobalSysInfo.getParamValue(PARAM_SERVER_HTTP_URL, "http://192.168.3.24:11078");
-        if(Validator.isIpv4(serverName)){
+        if(!ObjectUtils.isEmpty(serverName)&&Validator.isIpv4(serverName)){
             String str = UrlBuilder.ofHttp(serverName).setPort(serverPort>0?serverPort:11078).addPath(homeUrl).build();
             String decodeStr = URLDecoder.decode(str, Charset.defaultCharset());
             serverInfo.setHomeUrl(decodeStr);
@@ -960,7 +960,7 @@ public class DeviceApiController {
             }
         }
         String domain = GlobalSysInfo.getParamValue(PARAM_SERVER_HTTP_URL, "http://192.168.0.98:11091");
-        if(Validator.isIpv4(serverName)){
+        if(!ObjectUtils.isEmpty(serverName)&&Validator.isIpv4(serverName)){
             String str = UrlBuilder.ofHttp(serverName).setPort(serverPort>0?serverPort:11078).addPath(download).build();
             String decodeStr = URLDecoder.decode(str, Charset.defaultCharset());
             productVersionInfo.setDownloadUrl(decodeStr);