to restart connection pool
This commit is contained in:
msyu
+23
-93
@@ -7,7 +7,7 @@
|
||||
|
||||
<!---спецификация полей, пригодных для фильтрации (?и сортировки)--->
|
||||
<cfset this.fieldsSpec={
|
||||
rating_uid={prefix="b", type="guid"},
|
||||
<!--- rating_uid={prefix="b", type="guid"},
|
||||
dt_created={prefix="b", type="date"},
|
||||
dt_updated={prefix="b", type="date"},
|
||||
contragent_id={prefix="b", type="integer"},
|
||||
@@ -16,7 +16,7 @@
|
||||
icon_url={prefix="b", type="string"},
|
||||
descr={prefix="b", type="integer"},
|
||||
is_enabled={prefix="b", type="boolean"},
|
||||
sort={prefix="b", type="integer"}
|
||||
sort={prefix="b", type="integer"} --->
|
||||
}
|
||||
/>
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
<cfargument name="instanceUid" type="string" hint="type:guid" required/>
|
||||
<cfargument name="dtFrom" type="string" hint="type:datetime" required/>
|
||||
<cfargument name="dtTo" type="string" hint="type:datetime" required/><!--- default=Now() --->
|
||||
<cfargument name="intervalSeconds" type="string" hint="type:integer" required/><!--- default=Now() --->
|
||||
<cfargument name="intervalSeconds" type="string" hint="type:integer" required/>
|
||||
<!--- Как ограничить число точек? Или задавать начало, интервал и число точек? --->
|
||||
|
||||
<cfset var local={}/>
|
||||
@@ -36,12 +36,11 @@
|
||||
|
||||
<!---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, "dtFrom", "date")/>
|
||||
<cfset this.helper.validateField(arguments, "dtTo", "date")/>
|
||||
<cfset this.helper.validateField(arguments, "intervalSeconds", "integer")/>
|
||||
|
||||
<!---мы мирно игнорируем поля, отсутствующие в спецификации, что позволяет не делать исключения для orderBy и т.п.--->
|
||||
<cfset var filter=this.helper.parseFilterParams(this.fieldsSpec)/>
|
||||
<!--- <cfset var order=this.helper.parseOrderBy(this.fieldsSpec, arguments.orderBy)/> --->
|
||||
|
||||
<cfcatch type="invalidParamValue">
|
||||
<cfreturn representationOf(this.helper.formatBadRequestError(cfcatch)).withStatus(400)/>
|
||||
@@ -52,52 +51,32 @@
|
||||
</cftry>
|
||||
|
||||
<cfset var out={}/>
|
||||
<cfset var maxrows=arguments.pageSize*arguments.page/>
|
||||
<cfset var startrow=arguments.pageSize*(arguments.page-1)+1/>
|
||||
<!--- <cfset var maxrows=arguments.pageSize*arguments.page/>
|
||||
<cfset var startrow=arguments.pageSize*(arguments.page-1)+1/> --->
|
||||
|
||||
<!--- <cfset request.locateIamService()/> --->
|
||||
<!--- проверить принадлежность метрики клиенту --->
|
||||
|
||||
<cfquery name="local.qRead" result="local.result">
|
||||
select
|
||||
<m:field_set titleMapOut="local.titleMap" lengthOut="local.fieldCount">
|
||||
<m:field>b.rating_uid::text as rating_uid</m:field>
|
||||
<m:field>b.rating</m:field>
|
||||
<m:field>b.descr</m:field>
|
||||
<m:field>b.url</m:field>
|
||||
<m:field>b.icon_url</m:field>
|
||||
<m:field>b.contragent_id</m:field>
|
||||
<m:field>b.sort</m:field>
|
||||
<m:field formatter=#request.castToBool#>b.is_enabled</m:field>
|
||||
<!--- <m:field>k.external_uid</m:field> --->
|
||||
<m:field>to_char(b.dt_created, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_created</m:field>
|
||||
<m:field>to_char(b.dt_updated, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_updated</m:field>
|
||||
<m:field>to_char(o.dt_created, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as t</m:field>
|
||||
<m:field>1.23 as v</m:field>
|
||||
</m:field_set>
|
||||
from rating b
|
||||
/*left outer join contragent k on (b.contragent_id=k.contragent_id)*/
|
||||
where 1=1 <m:filter_build filter=#filter#/>
|
||||
from instance_operation o
|
||||
|
||||
<!--- where
|
||||
AND (b.contragent_id = <cfqueryparam cfsqltype="cf_sql_integer" value=#arguments.contragentId# null=#!isNumeric(arguments.contragentId)#/>
|
||||
OR b.contragent_id=-1)/*общая букмарка*/
|
||||
OR b.contragent_id=-1)
|
||||
order by b.contragent_id desc, b.sort asc
|
||||
<!--- <m:order_build sortCollection=#this.helper.parseNumericOrder(local.titleMap, arguments.orderBy)# fieldCount=0/>--->
|
||||
limit #maxrows#
|
||||
limit #maxrows# --->
|
||||
</cfquery>
|
||||
<!--- <cfdump var=#local.qRead#/><cfabort/> --->
|
||||
|
||||
|
||||
<cfquery name="local.qTotal">
|
||||
select count(*) as cnt
|
||||
from rating b
|
||||
/*left outer join contragent k on (b.contragent_id=k.contragent_id)*/
|
||||
where 1=1
|
||||
AND (b.contragent_id = <cfqueryparam cfsqltype="cf_sql_integer" value=#arguments.contragentId# null=#!isNumeric(arguments.contragentId)#/>)
|
||||
</cfquery>
|
||||
|
||||
<cfset "out.queryDurationMs"=getTickCount() - request.startTickCount/>
|
||||
<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 "out.total"=#local.qTotal.cnt#/> --->
|
||||
|
||||
<cfset "out.dtFrom"=#arguments.dtFrom#/>
|
||||
<cfset "out.dtTo"=#arguments.dtTo#/>
|
||||
<cfset "out.intervalSeconds"=#arguments.intervalSeconds#/>
|
||||
|
||||
<cfset var resultCollection=[]/>
|
||||
<cfloop query=#local.qRead# startRow=#startrow# endRow=#(startrow+maxrows-1)#>
|
||||
@@ -107,9 +86,9 @@
|
||||
</cfloop>
|
||||
|
||||
<cfset "out.size"=#arrayLen(resultCollection)#/>
|
||||
<cfset "out.results"=#resultCollection#/>
|
||||
<cfset "out.results"=#resultCollection#/>
|
||||
<cfset "out.runDurationMs"=getTickCount()-request.startTickCount/>
|
||||
<!---<cfset "out.sql"=#local.result.sql#/>--->
|
||||
|
||||
<cfreturn representationOf(out)/>
|
||||
|
||||
<cfcatch type="any">
|
||||
@@ -120,55 +99,6 @@
|
||||
</cffunction>
|
||||
|
||||
|
||||
<cffunction name="post" hint="Создание нового букмарка.">
|
||||
<cfargument name="rating" type="string" required=true hint="type:string description: заголовок"/><!--- чистить против XSS --->
|
||||
<cfargument name="descr" type="string" required=false default="" hint="type:boolean description: пользовательское примечание"/>
|
||||
<cfargument name="url" type="string" required=false default="" hint="type:string description: url"/><!--- чистить против XSS --->
|
||||
<cfargument name="iconUrl" type="string" required=false default="" hint="type:string description: url иконки"/><!--- чистить против XSS --->
|
||||
<cfargument name="sort" type="string" required=false default="100" hint="type:integer description: целое число для сортировки"/>
|
||||
<cfargument name="isEnabled" type="string" required=false default="1" hint="type:boolean description: вкл"/>
|
||||
|
||||
<cftry>
|
||||
<cfset this.helper.validateField(arguments, "ratingUid", "guid")/>
|
||||
<cfset this.helper.validateField(arguments, "sort", "integer")/>
|
||||
<cfset this.helper.validateField(arguments, "isEnabled", "boolean")/>
|
||||
|
||||
<cfcatch type="invalidParamValue">
|
||||
<cfreturn representationOf(this.helper.formatBadRequestError(cfcatch)).withStatus(400)/>
|
||||
</cfcatch>
|
||||
</cftry>
|
||||
|
||||
<cfset local={}/>
|
||||
<cfset local.ratingUid=#createGUID()#/>
|
||||
|
||||
<cftry>
|
||||
<cfquery name="local.qSave">
|
||||
insert into rating (
|
||||
rating_uid,contragent_id, rating,url,icon_url,descr,sort,is_enabled,dt_created,creator_id
|
||||
) values (
|
||||
<cfqueryparam cfsqltype="cf_sql_other" value="#local.ratingUid#"/>
|
||||
,<cfqueryparam cfsqltype="cf_sql_integer" value="#arguments.contragentId#"/>
|
||||
,<cfqueryparam cfsqltype="cf_sql_varchar" value="#cleanInput(arguments.rating)#"/>
|
||||
,<cfqueryparam cfsqltype="cf_sql_varchar" value="#arguments.url#"/>
|
||||
,<cfqueryparam cfsqltype="cf_sql_varchar" value="#arguments.iconUrl#"/>
|
||||
,<cfqueryparam cfsqltype="cf_sql_varchar" value="#cleanInput(arguments.descr)#"/>
|
||||
,<cfqueryparam cfsqltype="cf_sql_integer" value="#arguments.sort#"/>
|
||||
,<cfqueryparam cfsqltype="cf_sql_bit" value="#arguments.isEnabled#" null=#!isValid("boolean",arguments.isEnabled)#/>
|
||||
,<cfqueryparam cfsqltype="cf_sql_timestamp" value="#Now()#" />
|
||||
,<cfqueryparam cfsqltype="cf_sql_integer" value="#arguments.usrId#" />
|
||||
);
|
||||
</cfquery>
|
||||
|
||||
<cfcatch type="any">
|
||||
<cfreturn representationOf(this.helper.formatException(cfcatch, "Internal Error")).withStatus(500)/>
|
||||
</cfcatch>
|
||||
</cftry>
|
||||
|
||||
<cfreturn noData()
|
||||
.withHeaders({location: "./#local.ratingUid#"})
|
||||
.withStatus(201, "Created")
|
||||
/>
|
||||
</cffunction>
|
||||
|
||||
<cfscript>
|
||||
function plain2htm(s) {
|
||||
|
||||
Reference in New Issue
Block a user