114 split job url

2025-06-18 19:53:39 +03:00
parent d66813302c
commit a1acf0833b
3 changed files with 205 additions and 3 deletions
@@ -51,7 +51,7 @@
 		
 		//variables.framework.docs={};
 		variables.framework.docs.APIName="Deck API";
-		variables.framework.docs.APIVersion="0.113"; /*$ git config --global --unset user.password*/
+		variables.framework.docs.APIVersion="0.114"; /*$ git config --global --unset user.password*/

 		
 		variables.framework.globalHeaders = structNew();
@@ -188,7 +188,7 @@
 		<cfargument name="instanceOperationUid" type="string" required=true hint="type:guid"/>
 		
 		<cfquery name="qInstanceOperation">
-			select so.url
+			select select so.url_prefix, so.url_suffix, o.operation, svc.version
 			from instance_operation o 
 			join instance i on (o.instance_uid=i.instance_uid)
 			left outer join svc_operation so on (i.service_id=so.svc_id AND o.operation=so.operation)
@@ -203,16 +203,18 @@
 		</cfquery>
 		
 		<!--- *** тут нужно бы указать, кто запустил операцию --->
+		<cfset submit_url="#qInstanceOperation.url_prefix##qInstanceOperation.version##qInstanceOperation.url_suffix#"/>
 		<cfquery name="qMarkOperationStart">
 			update instance_operation 
 			set dt_submit=<cfqueryparam cfsqltype="cf_sql_timestamp" value=#now()#/>
 			,dt_start=null, dt_finish=null, submit_result='0'
+			,url=<cfqueryparam cfsqltype="cf_sql_varchar" value="#submit_url#"/>
 			where instance_operation_uid=<cfqueryparam cfsqltype="cf_sql_other" value=#arguments.instanceOperationUid#/>
 		</cfquery>				
 		
 		<cftry>
 			<cfhttp method="post" 
-				url="#qInstanceOperation.url#" 
+				url="#submit_url#" 
 				multipart=true 
 				multipartType="form-data"
 				timeout="3"
@@ -0,0 +1,200 @@
+<cfcomponent extends="taffy.core.resource" taffy:uri="/rating/timeseries/{instanceUid}">
+
+	<cfsilent>
+		<cfimport prefix="m" taglib="../lib"/>
+		<cfset this.helper=CreateObject("component","lib.rest_api_helper")/><!---*** странно, почему мы его видим?---><!---вынести в апп?--->
+	</cfsilent>
+
+	<!---спецификация полей, пригодных для фильтрации (?и сортировки)--->
+	<cfset this.fieldsSpec={
+		rating_uid={prefix="b", type="guid"},
+		dt_created={prefix="b", type="date"},
+		dt_updated={prefix="b", type="date"},
+		contragent_id={prefix="b", type="integer"},
+		rating={prefix="b", type="string"},
+		url={prefix="b", type="string"},
+		icon_url={prefix="b", type="string"},
+		descr={prefix="b", type="integer"},
+		is_enabled={prefix="b", type="boolean"},	
+		sort={prefix="b", type="integer"}	
+	}
+	/>
+
+	<!--- предполагается показывать букмарки только "настоящим" клиентам, поэтому используем contragent_id как признак своих--->
+	<!--- Получаем временной ряд (возможно, векторов) и Получаем агрегат за период --->
+	
+	 <cffunction name="get" hint="Получаем список ">
+		<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()	 --->
+		<!--- Как ограничить число точек? Или задавать начало, интервал и число точек? --->
+
+		<cfset var local={}/>
+		<cftry>	<!--- отладка на время проблемы 404 --->	
+						
+		
+			<!---parse and validate request parameters--->
+			<cftry>
+				<cfset this.helper.validateField(arguments, "pageSize", "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)/> --->
+				
+				<cfcatch type="invalidParamValue">
+					<cfreturn representationOf(this.helper.formatBadRequestError(cfcatch)).withStatus(400)/>
+				</cfcatch>
+				<cfcatch type="any">
+					<cfreturn representationOf(cfcatch)/>				
+				</cfcatch>
+			</cftry>				
+			
+			<cfset var out={}/>
+			<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_set>	
+				from rating b 
+				/*left outer join contragent k on (b.contragent_id=k.contragent_id)*/
+				where 1=1 <m:filter_build filter=#filter#/>
+				AND (b.contragent_id = <cfqueryparam cfsqltype="cf_sql_integer" value=#arguments.contragentId# null=#!isNumeric(arguments.contragentId)#/>
+				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#
+			</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 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 arrayAppend(resultCollection, rec)/>
+			</cfloop>
+			
+			<cfset "out.size"=#arrayLen(resultCollection)#/>
+			<cfset "out.results"=#resultCollection#/>
+			<cfset "out.runDurationMs"=getTickCount()-request.startTickCount/>	
+			<!---<cfset "out.sql"=#local.result.sql#/>--->	
+			<cfreturn representationOf(out)/>	
+
+			<cfcatch type="any">
+				<cfreturn representationOf(cfcatch)/>
+			</cfcatch>
+		</cftry>
+		
+	</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) {
+		return replace(replace(s, chr(13),'',"ALL"),chr(10),'<br/>', "ALL"); 
+	}
+	//request.plain2htm = plain2htm;
+
+	function htm2plain(s) {
+		return replaceNoCase(s, '<br/>', '#chr(13)##chr(10)#', "ALL"); 
+	}
+	//request.htm2plain = htm2plain;
+
+	function cleanHtm(s) {
+		return replaceList(s, '<,>,"', '&lt;,&gt;,&quot;'); 
+	}
+	//request.cleanHtm = cleanHtm;
+	</cfscript>
+	
+	<cffunction name="plain2HtmClean">
+		<cfargument name="s" type="string"/>	
+		<cfreturn plain2htm(cleanHtm(s))/>
+	</cffunction>
+
+	<cffunction name="cleanInput">
+		<cfargument name="s" type="string"/>	
+		<cfreturn htmlEditFormat(s)/>
+	</cffunction>
+
+</cfcomponent>