接口测试增加验证

src/main/java/com/neotel/smfcore/core/equipment/rest/EquipConfigController.java

@@ -72,7 +72,12 @@ public class EquipConfigController {
                 String ip = config.GetConfigValue("host", "");
                 String ip = config.GetConfigValue("host", "");
                 int webPort = config.GetConfigValue("webPort", 0);
                 int webPort = config.GetConfigValue("webPort", 0);
                 String webUrl = String.format("ws://%s:%d/", ip, webPort);
                 String webUrl = String.format("ws://%s:%d/", ip, webPort);
-
+                if (ObjectUtil.isEmpty(ip)) {
+                    return ResultBean.newErrorResult(1, "smfcore.valueCanotNull", "{0}不能为空", new String[]{"host"});
+                }
+                if (ObjectUtil.isEmpty(webPort)||webPort==0) {
+                    return ResultBean.newErrorResult(1, "smfcore.valueCanotNull", "{0}不能为空", new String[]{"webPort"});
+                }
                 if (TMSCommunicator.wsURL.equals(webUrl)) {
                 if (TMSCommunicator.wsURL.equals(webUrl)) {
                     result = tmsCommunicator.isConnected();
                     result = tmsCommunicator.isConnected();
                 } else {
                 } else {
@@ -81,6 +86,12 @@ public class EquipConfigController {
             } else {
             } else {
                 String ip = config.GetConfigValue("host", "");
                 String ip = config.GetConfigValue("host", "");
                 int apiPort = config.GetConfigValue("apiPort", 0);
                 int apiPort = config.GetConfigValue("apiPort", 0);
+                if (ObjectUtil.isEmpty(ip)) {
+                    return ResultBean.newErrorResult(1, "smfcore.valueCanotNull", "{0}不能为空", new String[]{"host"});
+                }
+                if (ObjectUtil.isEmpty(apiPort)||apiPort==0) {
+                    return ResultBean.newErrorResult(1, "smfcore.valueCanotNull", "{0}不能为空", new String[]{"apiPort"});
+                }
                 result=tmsApis.TestApi(ip,apiPort);
                 result=tmsApis.TestApi(ip,apiPort);
             }
             }
 
 

src/main/java/com/neotel/smfcore/core/equipment/util/EquipConfigUtil.java

@@ -58,8 +58,16 @@ public class EquipConfigUtil {
         if(equipType.equals(EquipmentType.PANACIMNEOLINK.name())) {
         if(equipType.equals(EquipmentType.PANACIMNEOLINK.name())) {
             //增加配置
             //增加配置
             LinkedHashMap<String, Object> defMap = new LinkedHashMap<>();
             LinkedHashMap<String, Object> defMap = new LinkedHashMap<>();
-            defMap.put("PanaCIMIP", dataCache.getCache(Constants.Cache_PanaCIMIP));
-            defMap.put("PanaCIMPort", dataCache.getCache(Constants.Cache_PanaCIMPort));
+            String ip=dataCache.getCache(Constants.Cache_PanaCIMIP);
+            if(ip==null){
+                ip="";
+            }
+            String port=dataCache.getCache(Constants.Cache_PanaCIMPort);
+            if(port==null){
+                port="";
+            }
+            defMap.put("PanaCIMIP", ip);
+            defMap.put("PanaCIMPort", port);
             configInfo.setApiConfigMap(defMap);
             configInfo.setApiConfigMap(defMap);
 
 
         }
         }

src/main/java/com/neotel/smfcore/custom/hanwha/handler/TMSApis.java

@@ -546,6 +546,7 @@ public class TMSApis  {
                 storageTypes.add(type);
                 storageTypes.add(type);
                 isConns.add(Integer.parseInt(conCode));
                 isConns.add(Integer.parseInt(conCode));
                 i++;
                 i++;
+                break;
             }
             }
 
 
             String RequestID="0";
             String RequestID="0";

src/main/java/com/neotel/smfcore/custom/panacim/PanaApiController.java

@@ -737,6 +737,10 @@ public class PanaApiController extends BaseSmfApiListener {
         String keepAliveUrl=getkeepAliveUrl();
         String keepAliveUrl=getkeepAliveUrl();
         try{
         try{
 
 
+            if(ObjectUtil.isEmpty(keepAliveUrl)){
+                log.error("未找到地址 keepAliveUrl，返回false");
+                return false;
+            }
             Map<String,Object> result = HttpHelper.getJsonResult(keepAliveUrl,new HashMap<>(),3000);
             Map<String,Object> result = HttpHelper.getJsonResult(keepAliveUrl,new HashMap<>(),3000);
             if(result!=null&&result.size()==2){
             if(result!=null&&result.size()==2){
                 int code=(Integer)result.get("code");
                 int code=(Integer)result.get("code");