diff --git a/src/main/java/neatlogic/framework/autoexec/dto/resourcecenter/sceneviewfielddeclare/OsSoftwareServiceEnvAppModuleAppSystemVo.java b/src/main/java/neatlogic/framework/autoexec/dto/resourcecenter/sceneviewfielddeclare/OsSoftwareServiceEnvAppModuleAppSystemVo.java index 0ef94cb30d37ac0b53712ee644ab4fbad1861dfa..31b4e8c452c9db02d04a832d5201a7974bd8b117 100644 --- a/src/main/java/neatlogic/framework/autoexec/dto/resourcecenter/sceneviewfielddeclare/OsSoftwareServiceEnvAppModuleAppSystemVo.java +++ b/src/main/java/neatlogic/framework/autoexec/dto/resourcecenter/sceneviewfielddeclare/OsSoftwareServiceEnvAppModuleAppSystemVo.java @@ -21,7 +21,7 @@ import neatlogic.framework.cmdb.annotation.ResourceField; import neatlogic.framework.cmdb.annotation.ResourceType; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.restful.annotation.EntityField; -@ResourceType(name = "scence_os_softwareservice_env_appmodule_appsystem", label = "操作系统与软件服务、环境、模块及应用场景", moduleId= "autoexec", functionPathList = {"配置管理/应用清单"}) +@ResourceType(name = "scence_os_softwareservice_env_appmodule_appsystem", label = "操作系统与软件服务、环境、模块及应用场景", moduleId= "autoexec") public class OsSoftwareServiceEnvAppModuleAppSystemVo { @EntityField(name = "ID", type = ApiParamType.LONG) @ResourceField(name = "id") diff --git a/src/main/java/neatlogic/framework/autoexec/script/paramtype/ScriptParamTypeBase.java b/src/main/java/neatlogic/framework/autoexec/script/paramtype/ScriptParamTypeBase.java index c8bf04d6d83a5c5e1eab8cfbceef8fb6b02e1c40..af0da954c71b6e2600d21c137e61b7247d00951f 100755 --- a/src/main/java/neatlogic/framework/autoexec/script/paramtype/ScriptParamTypeBase.java +++ b/src/main/java/neatlogic/framework/autoexec/script/paramtype/ScriptParamTypeBase.java @@ -88,6 +88,21 @@ public abstract class ScriptParamTypeBase implements IScriptParamType{ return value; } + protected String getString(JSONArray jsonArray) { + if (jsonArray.size() > 1) { + return jsonArray.toJSONString(); + } else if (jsonArray.size() == 1) { + Object obj = jsonArray.get(0); + if (obj instanceof JSONObject || obj instanceof JSONArray) { + return JSONObject.toJSONString(obj); + } else { + return obj.toString(); + } + } else { + return null; + } + } + protected List getStringList(JSONArray jsonArray) { List resultList = new ArrayList<>(); for (Object obj : jsonArray) {