|
|
|
@@ -15,7 +15,7 @@
|
|
|
|
|
is_production_ready={prefix="s", type="boolean"},
|
|
|
|
|
svc={prefix="s", type="string"},
|
|
|
|
|
svc_short={prefix="s", type="string"},
|
|
|
|
|
orchestrator_name={prefix="s", type="string"},
|
|
|
|
|
<!--- orchestrator_name={prefix="s", type="string"}, --->
|
|
|
|
|
code={prefix="s", type="string"},
|
|
|
|
|
version={prefix="s", type="string"},
|
|
|
|
|
descr={prefix="s", type="string"},
|
|
|
|
@@ -30,14 +30,12 @@
|
|
|
|
|
<cfargument name="page" type="string" hint="type:integer" default="1"/>
|
|
|
|
|
<cfargument name="orderBy" type="string" hint="type:string, description:comma-separated list of fields to sort by, example:fld1.ASC,fld2.DESC,fld3.ASC" default=""/> --->
|
|
|
|
|
|
|
|
|
|
<cfset local={}/>
|
|
|
|
|
|
|
|
|
|
<cfset var local={}/>
|
|
|
|
|
|
|
|
|
|
<!---parse and validate request parameters--->
|
|
|
|
|
<cftry>
|
|
|
|
|
<!--- <cfset this.helper.validateField(arguments, "pageSize", "integer")/>
|
|
|
|
|
<cfset this.helper.validateField(arguments, "page", "integer")/> --->
|
|
|
|
|
|
|
|
|
|
<cfset this.helper.validateField(arguments, "page", "integer")/> --->
|
|
|
|
|
<!---мы мирно игнорируем поля, отсутствующие в спецификации, что позволяет не делать исключения для orderBy и т.п.--->
|
|
|
|
|
<cfset var filter=this.helper.parseFilterParams(this.fieldsSpec)/>
|
|
|
|
|
<!--- <cfset var order=this.helper.parseOrderBy(this.fieldsSpec, arguments.orderBy)/> --->
|
|
|
|
@@ -48,13 +46,11 @@
|
|
|
|
|
<cfcatch type="any">
|
|
|
|
|
<cfreturn representationOf(cfcatch)/>
|
|
|
|
|
</cfcatch>
|
|
|
|
|
</cftry>
|
|
|
|
|
|
|
|
|
|
</cftry>
|
|
|
|
|
|
|
|
|
|
<cfset var out=structNew("linked")/>
|
|
|
|
|
<!--- <cfset var maxrows=arguments.pageSize*arguments.page/>
|
|
|
|
|
<cfset var startrow=arguments.pageSize*(arguments.page-1)+1/> --->
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<cfquery name="local.qRead" result="local.result">
|
|
|
|
|
select
|
|
|
|
@@ -62,7 +58,7 @@
|
|
|
|
|
<m:field title="ID" cfSqlType="CF_SQL_INTEGER">s.svc_id</m:field>
|
|
|
|
|
<m:field title="Сервис">s.svc</m:field>
|
|
|
|
|
<m:field title="Сокращение">s.svc_short</m:field>
|
|
|
|
|
<m:field>s.orchestrator_name</m:field>
|
|
|
|
|
<!--- <m:field>s.orchestrator_name</m:field> --->
|
|
|
|
|
<m:field title="Код">s.code</m:field>
|
|
|
|
|
<m:field title="URL создания">(select url from svc_operation so where so.operation='create' AND so.svc_id=s.svc_id limit 1) as create_url</m:field>
|
|
|
|
|
<m:field formatter=#function(x){return x NEQ 0}#>s.is_production_ready</m:field>
|
|
|
|
@@ -79,37 +75,47 @@
|
|
|
|
|
from svc s
|
|
|
|
|
left outer join svc_group_svc sg on (s.svc_id=sg.svc_id AND sg.is_enabled)
|
|
|
|
|
left outer join svc_group g on (sg.svc_group_id=g.svc_group_id)
|
|
|
|
|
where 1=1 <m:filter_build filter=#filter#/>
|
|
|
|
|
where 1=1 <m:filter_build filter=#filter#/>
|
|
|
|
|
order by g.sort, g.svc_group_id
|
|
|
|
|
<!--- <m:order_build sortCollection=#this.helper.parseNumericOrder(local.titleMap, arguments.orderBy)# fieldCount=0/><!---no sort --->length limit--->
|
|
|
|
|
<!--- limit #maxrows# --->
|
|
|
|
|
</cfquery>
|
|
|
|
|
|
|
|
|
|
<cftry>
|
|
|
|
|
<!--- <cftry>
|
|
|
|
|
<cfquery name="local.qTotal">
|
|
|
|
|
select count(*) as cnt
|
|
|
|
|
from svc
|
|
|
|
|
where 1=1
|
|
|
|
|
</cfquery>
|
|
|
|
|
<cfcatch type="any">
|
|
|
|
|
<!--- <cfreturn representationOf(createObject("java", "java.lang.System").getEnv())/> --->
|
|
|
|
|
<cfcatch type="any">
|
|
|
|
|
<cfreturn representationOf(cfcatch)/>
|
|
|
|
|
</cfcatch>
|
|
|
|
|
</cftry>
|
|
|
|
|
</cftry> --->
|
|
|
|
|
|
|
|
|
|
<!--- <cfreturn representationOf("Проверка связи 7")/> --->
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<cfset "out.queryDurationMs"=getTickCount() - request.startTickCount/>
|
|
|
|
|
<cfset "out.total"=#local.qTotal.cnt#/>
|
|
|
|
|
<!--- <cfset "out.total"=#local.qTotal.cnt#/> --->
|
|
|
|
|
<cfset "out.resultSetSize"=#local.qRead.recordCount#/>
|
|
|
|
|
<!--- <cfset "out.pageSize"=#arguments.pageSize*1#/>
|
|
|
|
|
<cfset "out.page"=#arguments.page*1#/>
|
|
|
|
|
<cfset "out.orderBy"=#arguments.orderBy#/> --->
|
|
|
|
|
|
|
|
|
|
<cfset var resultCollection=[]/>
|
|
|
|
|
<cfloop query=#local.qRead# <!--- startRow=#startrow# endRow=#(startrow+maxrows-1)# --->>
|
|
|
|
|
<cfset var rec={}/>
|
|
|
|
|
<cfset this.helper.appendRecord(rec, "", local.titleMap, local.qRead, this.helper.snake2camel)/>
|
|
|
|
|
<cfset var svcMap = structCopy(local.titleMap)/><!--- ради аккуратности, дальше local.titleMap все равно не используем --->
|
|
|
|
|
<cfset var groupMap = withdrawStructKeys(svcMap, "svc_group_id,svc_group")/>
|
|
|
|
|
|
|
|
|
|
<cfloop query=#local.qRead# group="svc_group_id"<!--- startRow=#startrow# endRow=#(startrow+maxrows-1)# --->>
|
|
|
|
|
<cfset var rec = structNew("linked")/>
|
|
|
|
|
<cfset this.helper.appendRecord(rec, "", groupMap, local.qRead, this.helper.snake2camel)/>
|
|
|
|
|
|
|
|
|
|
<cfset "rec.services"=[]/>
|
|
|
|
|
<cfset var svcRec = structNew("linked")/>
|
|
|
|
|
<cfloop group="svc_id">
|
|
|
|
|
<cfset this.helper.appendRecord(svcRec, "", svcMap, local.qRead, this.helper.snake2camel)/>
|
|
|
|
|
<cfset arrayAppend(rec.services, svcRec)/>
|
|
|
|
|
</cfloop>
|
|
|
|
|
|
|
|
|
|
<cfset arrayAppend(resultCollection, rec)/>
|
|
|
|
|
</cfloop>
|
|
|
|
|
|
|
|
|
@@ -120,5 +126,22 @@
|
|
|
|
|
<cfreturn representationOf(out)/>
|
|
|
|
|
|
|
|
|
|
</cffunction>
|
|
|
|
|
|
|
|
|
|
<cffunction name="withdrawStructKeys" access="private" returntype="struct">
|
|
|
|
|
<!--- переносим ключи из входной структуры в возвращаемую (во входной удаляем) --->
|
|
|
|
|
<cfargument name="structFrom" type="struct"/>
|
|
|
|
|
<cfargument name="keyList" type="string"/>
|
|
|
|
|
|
|
|
|
|
<cfset var structOut = {}/>
|
|
|
|
|
|
|
|
|
|
<cfloop list=#arguments.keyList# item="key">
|
|
|
|
|
<cfif structKeyExists(arguments.structFrom, key)>
|
|
|
|
|
<cfset structInsert(structOut, key, structFind(structFrom, key))/>
|
|
|
|
|
<cfset structDelete(arguments.structFrom, key)/>
|
|
|
|
|
</cfif>
|
|
|
|
|
</cfloop>
|
|
|
|
|
|
|
|
|
|
<cfreturn structOut/>
|
|
|
|
|
</cffunction>
|
|
|
|
|
|
|
|
|
|
</cfcomponent>
|
msyu