instance_operation improvement
This commit is contained in:
msyu
+3
-3
@@ -71,7 +71,7 @@
|
||||
|
||||
//variables.framework.docs={};
|
||||
variables.framework.docs.APIName="Deck API";
|
||||
variables.framework.docs.APIVersion="0.014";
|
||||
variables.framework.docs.APIVersion="0.015";
|
||||
|
||||
variables.framework.globalHeaders = structNew();
|
||||
variables.framework.globalHeaders["Access-Control-Expose-Headers"] = "Location";
|
||||
@@ -86,7 +86,7 @@
|
||||
////////////////////////////////////////////////////////
|
||||
request.ORCHESTRATOR_AUTH = createObject("java", "java.lang.System").getEnv("ORCHESTRATOR_AUTH");
|
||||
if (isNull(request.ORCHESTRATOR_AUTH)) {
|
||||
request.ORCHESTRATOR_AUTH = "Basic c3ZjX2xrdGVzdDoxMTgzZDIyNzc1OWExYjFkZmVjM2M3NTFiMzIyNzdiYTQ3";//*** времянка, дубль из корневого Application.cfm
|
||||
request.ORCHESTRATOR_AUTH = "Basic c3ZjX2xrdGVzdDoxMTgzZDIyNzc1OWExYjFkZmVjM2M3NTFiMzIyNzdiYTQ3";//*** времянка, дубль из deck/Application.cfm
|
||||
}
|
||||
//*** почему-то scope this ведет себя совершенно не так, как request и variables
|
||||
// в нем, когда переменная получает значение Empty:null, можно выполнить writedump, а в других получаем ошибку, что такой переменной нет
|
||||
@@ -183,7 +183,7 @@
|
||||
if (resp.responseheader.status_code NEQ 200) throw("IDP response not OK");
|
||||
|
||||
} catch (e) {
|
||||
if (false) { //true for local debug without IDP
|
||||
if (true) { //true for local debug without IDP
|
||||
var result='{"accounts":[{"login":"","type":"telegram"}],"avatar":["d2d2b7ac-50af-432b-b7c4-f7d6561e288a"],"company":"ООО «НУБЕС»","companyId":"8ec70ac0-546d-42a7-8cff-339c8fb51a23","contactId":"983967a3-58c2-4cdd-84a5-8b427ccfac82","email":"smishchuk@nubes.ru","externalUser":false,"fio":{"fullName":"Мищук Сергей ","name":"Сергей","secondName":"","surname":"Мищук"},"groupIds":["94bf5be7-52f4-5c13-87c3-513786934685","ab12b6b8-0265-4683-a5c2-5e1a74a55216","aff008c3-7443-50f6-86e1-ecff3cd3b04d","d6000da0-c9aa-55eb-9882-f118b432730b","d89a33dc-3177-5854-9580-f7f860a5ab7c","ddfe2555-9ef4-42cb-9a2b-7f24e61e7747","df12926f-ecb8-5479-857f-6d291464baad","fda5c295-230a-5025-9797-b8b4e99e08aa","2be9b4b6-94d1-59f9-a649-cab228d82169","64fe6f5c-a91b-5fea-a7ca-d9823701ebd4"],"integration":{"serviceId":""},"login":"smishchuk@nubes.ru","mobilePhone":[],"position":"","userId":"d72530e1-66a4-412f-a046-38153c4e5405"}';}
|
||||
}
|
||||
|
||||
|
||||
+2
-1
@@ -22,7 +22,8 @@ TODO: заменить сертификат в Application.cfc TODO: перед
|
||||
|
||||
2024-11-09 17:22:13 TODO
|
||||
+Генерация RFS (или включить в состав RUN) было сделано *** добавить изоляцию клиентов
|
||||
|
||||
Вывод CFS параметров по умолчанию для экземпляра
|
||||
Код клиента в s3 userid
|
||||
генерация значений по умолчанию для параметров (дефолты из спецификации сервиса, ? или значения для незавершенной операции)
|
||||
Генерация значений по умолчанию для уникальных полей (в зависимости от скоупа)
|
||||
Проверка уникальности в зависимости от скоупа (в том числе для displayName)
|
||||
|
||||
@@ -38,6 +38,7 @@
|
||||
<!--- <m:field title="descr">e.descr</m:field> --->
|
||||
<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>so.svc_operation_id</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>
|
||||
from instance_operation o
|
||||
@@ -48,6 +49,7 @@
|
||||
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)
|
||||
join svc_operation so on (v.svc_id=so.svc_id AND o.operation=so.operation)
|
||||
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#/>
|
||||
@@ -95,16 +97,30 @@
|
||||
<m:field_set titleMapOut="local.cfsParamTitleMap" lengthOut="fieldCount">
|
||||
<m:field title="instance_operation_cfs_param_uid">iop.instance_operation_cfs_param_uid::text as instance_operation_cfs_param_uid</m:field>
|
||||
<!--- <m:field title="instance_operation_uid">instance_operation_uid::text as instance_operation_uid</m:field> --->
|
||||
<m:field title="svc_operation_cfs_param_id">iop.svc_operation_cfs_param_id</m:field>
|
||||
<m:field title="svc_operation_cfs_param_id">sop.svc_operation_cfs_param_id</m:field>
|
||||
<m:field title="param_value">iop.param_value</m:field>
|
||||
<m:field title="dt_created">to_char(iop.dt_created, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_created</m:field>
|
||||
<m:field title="creator_id">iop.creator_id</m:field>
|
||||
<m:field title="svc_operation_cfs_param">sop.svc_operation_cfs_param</m:field>
|
||||
<m:field title="svc_operation_cfs_param">sop.svc_operation_cfs_param</m:field>
|
||||
<m:field>sop.label</m:field>
|
||||
<m:field>sop.data_type</m:field>
|
||||
<m:field>sop.value_list</m:field>
|
||||
<m:field cfSqlType="CF_SQL_INTEGER">sop.ref_svc_id</m:field>
|
||||
<m:field cfSqlType="CF_SQL_BIT">sop.is_required</m:field>
|
||||
<m:field>sop.default_value</m:field>
|
||||
<m:field>sop.descr</m:field>
|
||||
</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="#local.qInstanceOperation.instance_operation_uid#" null=#!isValid('guid',local.qInstanceOperation.instance_operation_uid)#/>
|
||||
order by iop.dt_created
|
||||
from svc_operation_cfs_param sop
|
||||
left outer join instance_operation_cfs_param iop
|
||||
on (sop.svc_operation_cfs_param_id=iop.svc_operation_cfs_param_id
|
||||
AND iop.instance_operation_uid = <cfqueryparam cfsqltype="cf_sql_other"
|
||||
value="#local.qInstanceOperation.instance_operation_uid#"
|
||||
null=#!isValid('guid',local.qInstanceOperation.instance_operation_uid)#/>
|
||||
)
|
||||
where sop.svc_operation_id = <cfqueryparam cfsqltype="cf_sql_integer"
|
||||
value=#local.qInstanceOperation.svc_operation_id#
|
||||
null=#!isValid('integer',local.qInstanceOperation.svc_operation_id)#/>
|
||||
order by sop.svc_operation_cfs_param_id
|
||||
</cfquery>
|
||||
|
||||
<cfset "out.queryDurationMs"=getTickCount() - request.startTickCount/>
|
||||
|
||||
Reference in New Issue
Block a user