v1.0.25: загрузка JSON/base64 — без бинарного multipart

This commit is contained in:
2026-06-18 19:49:57 +04:00
parent 51b9566046
commit bca1bba6d0
2 changed files with 110 additions and 100 deletions
+73 -59
View File
@@ -13,68 +13,82 @@
<cfset result = {ok: false, error: "no file"}>
<cftry>
<cfif structKeyExists(form, "files") AND len(form.files)>
<cffile action="upload" fileField="files" destination="#getTempDirectory()#" nameConflict="makeUnique" result="upload">
<cfset mime = "application/octet-stream">
<cfif listLast(upload.clientFile, ".") EQ "pdf">
<cfset mime = "application/pdf">
<cfelseif listLast(upload.clientFile, ".") EQ "docx">
<cfset mime = "application/vnd.openxmlformats-officedocument.wordprocessingml.document">
<cfelseif listLast(upload.clientFile, ".") EQ "doc">
<cfset mime = "application/msword">
<cfelseif listLast(upload.clientFile, ".") EQ "zip">
<cfset mime = "application/zip">
<!--- JSON-загрузка: {filename, data: base64, contract_id?} --->
<cfset ct = cgi.http_content_type>
<cfif ct CONTAINS "application/json">
<cfset body = toString(getHttpRequestData().content)>
<cfset data = deserializeJSON(body)>
<cfif structKeyExists(data, "filename") AND structKeyExists(data, "data")>
<cfset clientFile = data.filename>
<cfset originalBytes = data.data>
<cfset contractId = structKeyExists(data, "contract_id") ? data.contract_id : "">
<cfset fileSize = len(originalBytes)>
<cfelse>
<cfset result = {ok: false, error: "JSON: filename and data required"}>
<cfoutput>#serializeJSON(result)#</cfoutput>
<cfabort>
</cfif>
<!--- Multipart: curl/API --->
<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">
<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>
<!--- Если передан contract_id — используем существующий --->
<cfif structKeyExists(form, "contract_id") AND len(form.contract_id)>
<cfset cid = {id: form.contract_id}>
<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">
</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: upload.clientFile, size: upload.fileSize}>
<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">
</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}>
<cfcatch>
<cfset result = {ok: false, error: cfcatch.message, detail: cfcatch.detail}>