Nail/contractor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
naeel
2026-06-18 19:49:57 +04:00
parent 51b9566046
commit bca1bba6d0
2 changed files with 110 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
index.cfm
+37 -41
View File
@@ -64,7 +64,7 @@
<body>
<div class="topbar">
<img src="/nubes-logo.svg" alt="Nubes">
<span class="title">Сверка договоров <span style="font-weight:400;color:var(--muted);font-size:12px;">v1.0.24 — Lucee</span></span>
<span class="title">Сверка договоров <span style="font-weight:400;color:var(--muted);font-size:12px;">v1.0.25 — Lucee</span></span>
</div>
<div class="content">
@@ -221,7 +221,7 @@ fileInput.addEventListener('change', function() {
renderTable();
});
// ── Загрузка (XHR с прогрессом) ──────────────────────────
// ── Загрузка (FileReader → base64 → JSON POST) ─────────
uploadBtn.addEventListener('click', function() {
if (fileQueue.length === 0) return;
uploadBtn.disabled = true;
@@ -241,53 +241,49 @@ uploadBtn.addEventListener('click', function() {
var f = fileQueue[i];
if (f.status === 'uploaded') { uploadNext(i + 1); return; }
f.status = '0%';
f.status = 'читаю...';
renderTable();
uploadTimer.textContent = 'Загрузка ' + (i+1) + '/' + fileQueue.length + '...';
var xhr = new XMLHttpRequest();
var fd = new FormData();
fd.append('files', f.file);
if (contractId) fd.append('contract_id', contractId);
var reader = new FileReader();
reader.onload = function(e) {
// data:application/pdf;base64,xxxx → xxxx
var b64 = e.target.result.split(',')[1];
var payload = {filename: f.name, data: b64};
if (contractId) payload.contract_id = contractId;
xhr.open('POST', '/upload.cfm');
xhr.timeout = 120000;
xhr.upload.onprogress = function(e) {
if (e.lengthComputable) {
f.status = Math.round(e.loaded / e.total * 100) + '%';
renderTable();
}
};
xhr.onload = function() {
try {
var r = JSON.parse(xhr.responseText);
if (r.OK) {
contractId = r.CONTRACT_ID;
f.doc_id = r.DOC_ID;
f.status = 'uploaded';
var elapsed = ((Date.now() - uploadStartTime) / 1000).toFixed(1);
log('✅ ' + f.name + ' (' + formatSize(f.size) + ') — ' + elapsed + 'с');
} else {
fetch('/upload.cfm', {
method: 'POST',
headers: {'Content-Type': 'application/json'},
body: JSON.stringify(payload)
}).then(function(r) { return r.json(); })
.then(function(r) {
if (r.OK) {
contractId = r.CONTRACT_ID;
f.doc_id = r.DOC_ID;
f.status = 'uploaded';
var elapsed = ((Date.now() - uploadStartTime) / 1000).toFixed(1);
log('✅ ' + f.name + ' (' + formatSize(f.size) + ') — ' + elapsed + 'с');
} else {
f.status = 'error';
log('❌ ' + f.name + ': ' + (r.ERROR || ''));
}
renderTable();
uploadNext(i + 1);
}).catch(function(e) {
f.status = 'error';
log('❌ ' + f.name + ': ' + (r.ERROR || ''));
}
} catch(e) { f.status = 'error'; log('❌ ' + f.name + ': ' + e.message); }
log('❌ ' + f.name + ': ' + e.message);
renderTable();
uploadNext(i + 1);
});
};
reader.onerror = function() {
f.status = 'error';
log('❌ ' + f.name + ': ошибка чтения');
renderTable();
uploadNext(i + 1);
};
xhr.onerror = function() {
f.status = 'error (status=0 — обрыв)';
log('❌ ' + f.name + ': сеть (status=0)');
renderTable();
uploadNext(i + 1);
};
xhr.ontimeout = function() {
f.status = 'error (таймаут)';
log('❌ ' + f.name + ': таймаут 120с');
renderTable();
uploadNext(i + 1);
};
xhr.send(fd);
reader.readAsDataURL(f.file);
}
uploadNext(0);
});
upload.cfm
+73 -59
View File
@@ -13,69 +13,83 @@
<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}>
</cfcatch>