v1.0.33: cfthread — мгновенный ответ + один запрос на все файлы
This commit is contained in:
+82
-128
@@ -5,156 +5,110 @@
|
||||
<cfheader name="Access-Control-Allow-Headers" value="Content-Type">
|
||||
|
||||
<cfif cgi.request_method EQ "OPTIONS">
|
||||
<cfheader name="Content-Type" value="text/plain">
|
||||
<cfoutput>OK</cfoutput>
|
||||
<cfabort>
|
||||
<cfoutput>OK</cfoutput><cfabort>
|
||||
</cfif>
|
||||
|
||||
<cfset result = {ok: false, error: "no file"}>
|
||||
|
||||
<cftry>
|
||||
<!--- JSON-загрузка: {files: [{filename, data}], contract_id?} или {filename, data} --->
|
||||
<cfset ct = cgi.http_content_type>
|
||||
<!--- JSON: {filename, data} или {files: [{filename, data}]} --->
|
||||
<cfif ct CONTAINS "application/json">
|
||||
<cfset body = toString(getHttpRequestData().content)>
|
||||
<cfset data = deserializeJSON(body)>
|
||||
<!--- Один файл или массив --->
|
||||
<cfif structKeyExists(data, "files") AND isArray(data.files)>
|
||||
<cfset fileList = data.files>
|
||||
<cfelseif structKeyExists(data, "filename")>
|
||||
<cfset fileList = [data]>
|
||||
<cfelse>
|
||||
<cfset result = {ok: false, error: "JSON: files array or filename required"}>
|
||||
<cfoutput>#serializeJSON(result)#</cfoutput>
|
||||
<cfabort>
|
||||
<cfset result = {ok: false, error: "JSON: filename required"}>
|
||||
<cfoutput>#serializeJSON(result)#</cfoutput><cfabort>
|
||||
</cfif>
|
||||
<cfset contractId = structKeyExists(data, "contract_id") ? data.contract_id : "">
|
||||
<!--- Обработать каждый файл --->
|
||||
<cfset results = []>
|
||||
<cfloop array="#fileList#" index="fdata">
|
||||
<cftry>
|
||||
<cfset clientFile = fdata.filename>
|
||||
<cfset originalBytes = fdata.data>
|
||||
<cfset mime = "application/octet-stream">
|
||||
<cfset ext = listLast(clientFile, ".")>
|
||||
<cfif ext EQ "pdf"><cfset mime = "application/pdf">
|
||||
<cfelseif ext EQ "docx"><cfset mime = "application/vnd.openxmlformats-officedocument.wordprocessingml.document">
|
||||
<cfelseif ext EQ "doc"><cfset mime = "application/msword">
|
||||
<cfelseif ext EQ "zip"><cfset mime = "application/zip">
|
||||
</cfif>
|
||||
|
||||
<cftransaction>
|
||||
<cfquery datasource="baza">
|
||||
INSERT INTO documents (filename, mime_type, original_bytes, status)
|
||||
VALUES (
|
||||
<cfqueryparam value="#clientFile#" cfsqltype="cf_sql_varchar">,
|
||||
<cfqueryparam value="#mime#" cfsqltype="cf_sql_varchar">,
|
||||
<cfqueryparam value="#originalBytes#" cfsqltype="cf_sql_varchar">,
|
||||
'uploaded'
|
||||
)
|
||||
</cfquery>
|
||||
<cfquery name="doc" datasource="baza">
|
||||
SELECT id FROM documents
|
||||
WHERE filename = <cfqueryparam value="#clientFile#" cfsqltype="cf_sql_varchar">
|
||||
AND status = 'uploaded' ORDER BY created_at DESC LIMIT 1
|
||||
</cfquery>
|
||||
<cfif len(contractId)>
|
||||
<cfset cid = {id: contractId}>
|
||||
<cfset suppType = "additional">
|
||||
<cfelse>
|
||||
<cfquery datasource="baza">
|
||||
INSERT INTO contracts (number, client) VALUES (
|
||||
<cfqueryparam value="б/н #dateFormat(now(), 'yyyymmdd')#-#timeFormat(now(), 'HHmm')#" cfsqltype="cf_sql_varchar">, ''
|
||||
)
|
||||
</cfquery>
|
||||
<cfquery name="cid" datasource="baza">
|
||||
SELECT id FROM contracts ORDER BY created_at DESC LIMIT 1
|
||||
</cfquery>
|
||||
<cfset contractId = cid.id>
|
||||
<cfset suppType = "initial">
|
||||
<!--- Фоновая обработка — мгновенный ответ --->
|
||||
<cfset fileListJson = serializeJSON(fileList)>
|
||||
<cfthread action="run" name="up_#createUUID()#" flj="#fileListJson#" cid="#contractId#">
|
||||
<cfset var fileList = deserializeJSON(flj)>
|
||||
<cfset var contractId = cid>
|
||||
<cfloop array="#fileList#" index="var fdata">
|
||||
<cftry>
|
||||
<cfset var clientFile = fdata.filename>
|
||||
<cfset var originalBytes = fdata.data>
|
||||
<cfset var mime = "application/octet-stream">
|
||||
<cfset var ext = listLast(clientFile, ".")>
|
||||
<cfif ext EQ "pdf"><cfset mime = "application/pdf">
|
||||
<cfelseif ext EQ "docx"><cfset mime = "application/vnd.openxmlformats-officedocument.wordprocessingml.document">
|
||||
<cfelseif ext EQ "doc"><cfset mime = "application/msword">
|
||||
<cfelseif ext EQ "zip"><cfset mime = "application/zip">
|
||||
</cfif>
|
||||
<cfquery datasource="baza">
|
||||
INSERT INTO supplements (contract_id, document_id, type) VALUES (
|
||||
<cfqueryparam value="#cid.id#" cfsqltype="cf_sql_varchar">,
|
||||
<cfqueryparam value="#doc.id#" cfsqltype="cf_sql_varchar">,
|
||||
<cfqueryparam value="#suppType#" cfsqltype="cf_sql_varchar">
|
||||
)
|
||||
</cfquery>
|
||||
</cftransaction>
|
||||
|
||||
<cfset arrayAppend(results, {ok: true, doc_id: doc.id, contract_id: cid.id, filename: clientFile, size: len(originalBytes)})>
|
||||
<cfcatch>
|
||||
<cfset arrayAppend(results, {ok: false, filename: fdata.filename, error: cfcatch.message})>
|
||||
</cfcatch>
|
||||
</cftry>
|
||||
</cfloop>
|
||||
<cfset result = {ok: true, results: results, contract_id: contractId}>
|
||||
<cfoutput>#serializeJSON(result)#</cfoutput>
|
||||
<cfabort>
|
||||
<!--- Multipart: curl/API --->
|
||||
<cftransaction>
|
||||
<cfquery datasource="baza">
|
||||
INSERT INTO documents (filename, mime_type, original_bytes, status)
|
||||
VALUES (<cfqueryparam value="#clientFile#" cfsqltype="cf_sql_varchar">,<cfqueryparam value="#mime#" cfsqltype="cf_sql_varchar">,<cfqueryparam value="#originalBytes#" cfsqltype="cf_sql_varchar">,'uploaded')
|
||||
</cfquery>
|
||||
<cfquery name="var doc" datasource="baza">
|
||||
SELECT id FROM documents WHERE filename=<cfqueryparam value="#clientFile#" cfsqltype="cf_sql_varchar"> AND status='uploaded' ORDER BY created_at DESC LIMIT 1
|
||||
</cfquery>
|
||||
<cfif len(contractId)>
|
||||
<cfset var suppType = "additional">
|
||||
<cfelse>
|
||||
<cfquery datasource="baza">
|
||||
INSERT INTO contracts (number, client) VALUES (<cfqueryparam value="б/н #dateFormat(now(),'yyyymmdd')#-#timeFormat(now(),'HHmm')#" cfsqltype="cf_sql_varchar">,'')
|
||||
</cfquery>
|
||||
<cfquery name="var nc" datasource="baza">
|
||||
SELECT id FROM contracts ORDER BY created_at DESC LIMIT 1
|
||||
</cfquery>
|
||||
<cfset contractId = nc.id>
|
||||
<cfset var suppType = "initial">
|
||||
</cfif>
|
||||
<cfquery datasource="baza">
|
||||
INSERT INTO supplements (contract_id, document_id, type) VALUES (<cfqueryparam value="#contractId#" cfsqltype="cf_sql_varchar">,<cfqueryparam value="#doc.id#" cfsqltype="cf_sql_varchar">,<cfqueryparam value="#suppType#" cfsqltype="cf_sql_varchar">)
|
||||
</cfquery>
|
||||
</cftransaction>
|
||||
<cfcatch></cfcatch>
|
||||
</cftry>
|
||||
</cfloop>
|
||||
</cfthread>
|
||||
<cfset result = {ok: true, count: arrayLen(fileList), contract_id: contractId}>
|
||||
<!--- Multipart: curl -F --->
|
||||
<cfelseif structKeyExists(form, "files") AND len(form.files)>
|
||||
<cffile action="upload" fileField="files" destination="#getTempDirectory()#" nameConflict="makeUnique" result="upload">
|
||||
<cfset clientFile = upload.clientFile>
|
||||
<cfset contractId = structKeyExists(form, "contract_id") ? form.contract_id : "">
|
||||
<cffile action="readBinary" file="#upload.serverDirectory#/#upload.serverFile#" variable="fileBytes">
|
||||
<cfset originalBytes = toBase64(fileBytes)>
|
||||
<cfset fileSize = upload.fileSize>
|
||||
<cfelse>
|
||||
<cfoutput>#serializeJSON(result)#</cfoutput>
|
||||
<cfabort>
|
||||
</cfif>
|
||||
|
||||
<!--- MIME --->
|
||||
<cfset mime = "application/octet-stream">
|
||||
<cfset ext = listLast(clientFile, ".")>
|
||||
<cfif ext EQ "pdf"><cfset mime = "application/pdf">
|
||||
<cfelseif ext EQ "docx"><cfset mime = "application/vnd.openxmlformats-officedocument.wordprocessingml.document">
|
||||
<cfelseif ext EQ "doc"><cfset mime = "application/msword">
|
||||
<cfelseif ext EQ "zip"><cfset mime = "application/zip">
|
||||
</cfif>
|
||||
|
||||
<cftransaction>
|
||||
<cfquery datasource="baza">
|
||||
INSERT INTO documents (filename, mime_type, original_bytes, status)
|
||||
VALUES (
|
||||
<cfqueryparam value="#clientFile#" cfsqltype="cf_sql_varchar">,
|
||||
<cfqueryparam value="#mime#" cfsqltype="cf_sql_varchar">,
|
||||
<cfqueryparam value="#originalBytes#" cfsqltype="cf_sql_varchar">,
|
||||
'uploaded'
|
||||
)
|
||||
</cfquery>
|
||||
<cfquery name="doc" datasource="baza">
|
||||
SELECT id FROM documents
|
||||
WHERE filename = <cfqueryparam value="#clientFile#" cfsqltype="cf_sql_varchar">
|
||||
AND status = 'uploaded' ORDER BY created_at DESC LIMIT 1
|
||||
</cfquery>
|
||||
<cfif len(contractId)>
|
||||
<cfset cid = {id: contractId}>
|
||||
<cfset suppType = "additional">
|
||||
<cfelse>
|
||||
<cfquery datasource="baza">
|
||||
INSERT INTO contracts (number, client) VALUES (
|
||||
<cfqueryparam value="б/н #dateFormat(now(), 'yyyymmdd')#-#timeFormat(now(), 'HHmm')#" cfsqltype="cf_sql_varchar">, ''
|
||||
)
|
||||
</cfquery>
|
||||
<cfquery name="cid" datasource="baza">
|
||||
SELECT id FROM contracts ORDER BY created_at DESC LIMIT 1
|
||||
</cfquery>
|
||||
<cfset suppType = "initial">
|
||||
<cfset mime = "application/octet-stream">
|
||||
<cfset ext = listLast(upload.clientFile, ".")>
|
||||
<cfif ext EQ "pdf"><cfset mime = "application/pdf">
|
||||
<cfelseif ext EQ "docx"><cfset mime = "application/vnd.openxmlformats-officedocument.wordprocessingml.document">
|
||||
<cfelseif ext EQ "doc"><cfset mime = "application/msword">
|
||||
<cfelseif ext EQ "zip"><cfset mime = "application/zip">
|
||||
</cfif>
|
||||
<cfquery datasource="baza">
|
||||
INSERT INTO supplements (contract_id, document_id, type) VALUES (
|
||||
<cfqueryparam value="#cid.id#" cfsqltype="cf_sql_varchar">,
|
||||
<cfqueryparam value="#doc.id#" cfsqltype="cf_sql_varchar">,
|
||||
<cfqueryparam value="#suppType#" cfsqltype="cf_sql_varchar">
|
||||
)
|
||||
</cfquery>
|
||||
</cftransaction>
|
||||
|
||||
<cfset result = {ok: true, contract_id: cid.id, doc_id: doc.id, filename: clientFile, size: fileSize}>
|
||||
|
||||
<cfset contractId = structKeyExists(form, "contract_id") ? form.contract_id : "">
|
||||
<cftransaction>
|
||||
<cfquery datasource="baza">
|
||||
INSERT INTO documents (filename, mime_type, original_bytes, status) VALUES (<cfqueryparam value="#upload.clientFile#" cfsqltype="cf_sql_varchar">,<cfqueryparam value="#mime#" cfsqltype="cf_sql_varchar">,<cfqueryparam value="#toBase64(fileBytes)#" cfsqltype="cf_sql_varchar">,'uploaded')
|
||||
</cfquery>
|
||||
<cfquery name="doc" datasource="baza">
|
||||
SELECT id FROM documents WHERE filename=<cfqueryparam value="#upload.clientFile#" cfsqltype="cf_sql_varchar"> AND status='uploaded' ORDER BY created_at DESC LIMIT 1
|
||||
</cfquery>
|
||||
<cfif len(contractId)>
|
||||
<cfset suppType = "additional">
|
||||
<cfelse>
|
||||
<cfquery datasource="baza">
|
||||
INSERT INTO contracts (number, client) VALUES (<cfqueryparam value="б/н #dateFormat(now(),'yyyymmdd')#-#timeFormat(now(),'HHmm')#" cfsqltype="cf_sql_varchar">,'')
|
||||
</cfquery>
|
||||
<cfquery name="cid" datasource="baza">
|
||||
SELECT id FROM contracts ORDER BY created_at DESC LIMIT 1
|
||||
</cfquery>
|
||||
<cfset contractId = cid.id>
|
||||
<cfset suppType = "initial">
|
||||
</cfif>
|
||||
<cfquery datasource="baza">
|
||||
INSERT INTO supplements (contract_id, document_id, type) VALUES (<cfqueryparam value="#contractId#" cfsqltype="cf_sql_varchar">,<cfqueryparam value="#doc.id#" cfsqltype="cf_sql_varchar">,<cfqueryparam value="#suppType#" cfsqltype="cf_sql_varchar">)
|
||||
</cfquery>
|
||||
</cftransaction>
|
||||
<cfset result = {ok: true, contract_id: contractId, doc_id: doc.id, filename: upload.clientFile, size: upload.fileSize}>
|
||||
</cfif>
|
||||
<cfcatch>
|
||||
<cfset result = {ok: false, error: cfcatch.message, detail: cfcatch.detail}>
|
||||
<cfset result = {ok: false, error: cfcatch.message}>
|
||||
</cfcatch>
|
||||
</cftry>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user