smishchuk/svc-api-x
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

run bug fixes

Browse Source
This commit is contained in:
msyu
2024-11-09 18:14:15 +03:00
parent c0ddf96357
commit 89ecbb4083
4 changed files with 38 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
v1/resources/instance_operation.cfc
+11 -11
View File
@@ -17,7 +17,7 @@
<cfset var out={}/>
<cfquery name="local.qIinstanceOperation" result="local.result">
<cfquery name="local.qInstanceOperation" result="local.result">
select
<m:field_set titleMapOut="local.titleMap" lengthOut="local.fieldCount">
<m:field title="instance Operation Uid">o.instance_operation_uid::text as instance_operation_uid</m:field>
@@ -39,8 +39,7 @@
<m:field title="dt_created">to_char(o.dt_created, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_created</m:field>
<m:field title="Услуга">v.svc</m:field>
<!--- <m:field>(select instance_state_uid::text from instance_state ist where ist.instance_operation_uid=o.instance_operation_uid order by ist.version desc limit 1) as instance_state_uid</m:field> --->
</m:field_set>
</m:field_set>
from instance_operation o
join instance e on (o.instance_uid=e.instance_uid)
join specification_item i on (e.specification_item_id=i.specification_item_id)
@@ -49,11 +48,12 @@
join contragent k on (d.contragent_id=k.contragent_id)
<!--- join usr u on (k.contragent_id=u.contragent_id) --->
join svc v on (e.service_id=v.svc_id)
where u.usr_id=<cfqueryparam cfsqltype="cf_sql_integer" value=#arguments.usrId#/>
AND o.instance_operation_uid=<cfqueryparam cfsqltype="cf_sql_other" value="#arguments.instanceOperationUid#" null=#!isValid('guid',arguments.instanceOperationUid)#/>
where <!--- u.usr_id=<cfqueryparam cfsqltype="cf_sql_integer" value=#arguments.usrId#/> AND--->
o.instance_operation_uid=<cfqueryparam cfsqltype="cf_sql_other" value="#arguments.instanceOperationUid#" null=#!isValid('guid',arguments.instanceOperationUid)#/>
AND s.specification_id=<cfqueryparam cfsqltype="cf_sql_integer" value=#arguments.specificationId#/>
</cfquery>
<cfif local.qIinstanceOperation.recordCount EQ 0>
<cfif local.qInstanceOperation.recordCount EQ 0>
<cfreturn representationOf(this.helper.formatMessage("Not Found")).withStatus(404)/>
</cfif>
@@ -70,7 +70,7 @@
<!--- <m:field formatter=#function(x){return (deserializeJson(x))}#>ios.stage_data::text as stage_data</m:field> --->
</m:field_set>
from instance_operation_stage ios
where ios.instance_operation_uid=<cfqueryparam cfsqltype="cf_sql_other" value="#qIinstanceOperation.instance_operation_uid#" null=#!isValid('guid',qInstanceOperation.instance_operation_uid)#/>
where ios.instance_operation_uid=<cfqueryparam cfsqltype="cf_sql_other" value="#local.qInstanceOperation.instance_operation_uid#" null=#!isValid('guid',local.qInstanceOperation.instance_operation_uid)#/>
order by dt_start asc
</cfquery>
@@ -86,7 +86,7 @@
<m:field title="instance_data" formatter=#function(x){return (deserializeJson(x))}#>st.instance_data::text as instance_data</m:field>
</m:field_set>
from instance_state st
where st.instance_operation_uid=<cfqueryparam cfsqltype="cf_sql_other" value="#qInstanceOperation.instance_operation_uid#" null=#!isValid('guid',qInstanceOperation.instance_operation_uid)#/>
where st.instance_operation_uid=<cfqueryparam cfsqltype="cf_sql_other" value="#local.qInstanceOperation.instance_operation_uid#" null=#!isValid('guid',local.qInstanceOperation.instance_operation_uid)#/>
order by st.version desc limit 1
</cfquery>
@@ -103,14 +103,14 @@
</m:field_set>
from instance_operation_cfs_param iop
join svc_operation_cfs_param sop on (iop.svc_operation_cfs_param_id=sop.svc_operation_cfs_param_id)
where iop.instance_operation_uid=<cfqueryparam cfsqltype="cf_sql_other" value="#qInstanceOperation.instance_operation_uid#" null=#!isValid('guid',qInstanceOperation.instance_operation_uid)#/>
where iop.instance_operation_uid=<cfqueryparam cfsqltype="cf_sql_other" value="#local.qInstanceOperation.instance_operation_uid#" null=#!isValid('guid',local.qInstanceOperation.instance_operation_uid)#/>
order by iop.dt_created
</cfquery>
<cfset "out.queryDurationMs"=getTickCount() - request.startTickCount/>
<cfset "out.instance" = this.helper.appendRecord(
structNew("linked"), "", local.titleMap, local.qIinstanceOperation, this.helper.snake2camel
structNew("linked"), "", local.titleMap, local.qInstanceOperation, this.helper.snake2camel
)/>
<cfset "out.instance.cfsParams"=[]/>
@@ -123,7 +123,7 @@
<cfset arrayAppend(out.instance.stages, this.helper.appendRecord(structNew("linked"), "", local.stageMap, local.qStage, this.helper.snake2camel))/>
</cfloop>
<cfset "out.instance.state"=this.helper.appendRecord(structNew("linked"), "", local.stateTitleMap, local.qState, this.helper.snake2camel)/>
<cfset "out.instance.state"=(local.qState.recordCount GT 0) ? this.helper.appendRecord(structNew("linked"), "", local.stateTitleMap, local.qState, this.helper.snake2camel) : {}/>
<cfset "out.runDurationMs"=getTickCount() - request.startTickCount/>
<cfreturn representationOf(out) />
v1/resources/instance_operation_run.cfc
+13 -10
View File
@@ -30,7 +30,6 @@
<!--- <cfreturn representationOf("Not Implemented yet").withStatus(501)/> --->
<cfreturn noData()
.withHeaders({location: "./#local.instanceUid#"})
@@ -162,14 +161,18 @@
charset="utf-8"
result="job"
>
<cfhttpparam type="HEADER" name="Authorization" value="#ORCHESTRATOR_AUTH#">
<cfhttpparam type="HEADER" name="Authorization" value="#request.ORCHESTRATOR_AUTH#">
<cfhttpparam type="HEADER" name="Accept" value="application/json">
</cfhttp>
</cfhttp>
<cfset var jobData=#deserializeJson(job.filecontent)#/>
<!--- jobData: <cfdump var=#jobData#/> --->
<cfset operation_url=jobData.executable.url />
<cfquery name="qSetStatusUrl" datasource="#request.DS#">
<cfquery name="qSetStatusUrl">
update instance_operation
set status_url=<cfqueryparam cfsqltype="cf_sql_varchar" value="#operation_url#wfapi/describe"/>
where instance_operation_uid=<cfqueryparam cfsqltype="cf_sql_other" value=#instance_operation_uid#/>
set status_url=<cfqueryparam cfsqltype="cf_sql_varchar" value="#operation_url#api/json"/><!--- *** костыль --->
where instance_operation_uid=<cfqueryparam cfsqltype="cf_sql_other" value=#arguments.instanceOperationUid#/>
</cfquery>
<cfcatch type="any">
@@ -181,15 +184,15 @@
</cffunction>
<cffunction name="setInstanceOperationRfsParam">
<cfargument name="instance_operation_uid" type="guid">
<cfargument name="instanceOperationUid" type="guid">
<cfargument name="param"><!--- значение не должно содержать лишних пробелов, чувствительность к регистру определяется БД --->
<cfargument name="val">
<cfquery name="qSaveRfsParam">
insert into instance_operation_param (instance_operation_uid,param,param_value)
values (
<cfqueryparam cfsqltype="cf_sql_other" value="#ARGUMENTS.instance_operation_uid#"/>
,<cfqueryparam cfsqltype="cf_sql_varchar" value="#ARGUMENTS.param#"/>
,<cfqueryparam cfsqltype="cf_sql_varchar" value="#ARGUMENTS.val#"/>
<cfqueryparam cfsqltype="cf_sql_other" value="#arguments.instanceOperationUid#"/>
,<cfqueryparam cfsqltype="cf_sql_varchar" value="#arguments.param#"/>
,<cfqueryparam cfsqltype="cf_sql_varchar" value="#arguments.val#"/>
)
/*PostgreSQL specific*/
ON CONFLICT (instance_operation_uid,param)