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

v1.0.33: cfthread — мгновенный ответ + один запрос на все файлы

Browse Source
This commit is contained in:
naeel
2026-06-18 21:12:30 +04:00
parent e20a50dc55
commit ddc3404556
2 changed files with 115 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files
index.cfm
+40 -37
View File
@@ -64,7 +64,7 @@
<body> <body>
<div class="topbar"> <div class="topbar">
<img src="/nubes-logo.svg" alt="Nubes"> <img src="/nubes-logo.svg" alt="Nubes">
<span class="title">Сверка договоров <span style="font-weight:400;color:var(--muted);font-size:12px;">v1.0.32 — Lucee</span></span> <span class="title">Сверка договоров <span style="font-weight:400;color:var(--muted);font-size:12px;">v1.0.33 — Lucee</span></span>
</div> </div>
<div class="content"> <div class="content">
@@ -221,7 +221,7 @@ fileInput.addEventListener('change', function() {
renderTable(); renderTable();
}); });
// ── Загрузка (читаем все → шлём по одному) ───────────── // ── Загрузка (читаем все → шлём одним JSON) ────────────
uploadBtn.addEventListener('click', function() { uploadBtn.addEventListener('click', function() {
if (fileQueue.length === 0) return; if (fileQueue.length === 0) return;
uploadBtn.disabled = true; uploadBtn.disabled = true;
@@ -233,13 +233,13 @@ uploadBtn.addEventListener('click', function() {
var readIdx = 0; var readIdx = 0;
function readAll() { function readAll() {
if (readIdx >= pending.length) { sendSeq(0); return; } if (readIdx >= pending.length) { sendAll(); return; }
var f = pending[readIdx]; var f = pending[readIdx];
f.status = 'читаю...'; f.status = 'читаю...';
renderTable(); renderTable();
var reader = new FileReader(); var reader = new FileReader();
reader.onload = function(e) { reader.onload = function(e) {
payloads.push({file: f, b64: e.target.result.split(',')[1]}); payloads.push({filename: f.name, data: e.target.result.split(',')[1]});
readIdx++; readIdx++;
uploadTimer.textContent = 'Чтение ' + readIdx + '/' + pending.length; uploadTimer.textContent = 'Чтение ' + readIdx + '/' + pending.length;
readAll(); readAll();
@@ -253,46 +253,49 @@ uploadBtn.addEventListener('click', function() {
reader.readAsDataURL(f.file); reader.readAsDataURL(f.file);
} }
function sendSeq(i) { function sendAll() {
if (i >= payloads.length) { if (payloads.length === 0) {
uploadTimer.style.display = 'none'; uploadTimer.style.display = 'none';
uploadBtn.disabled = false; uploadBtn.disabled = false;
var hasErrors = fileQueue.some(function(f) { return f.status && f.status.indexOf('error') === 0; }); return;
if (contractId && !hasErrors) { }
uploadTimer.textContent = 'Отправка...';
var body = {files: payloads};
if (contractId) body.contract_id = contractId;
fetch('/upload.cfm', {
method: 'POST',
headers: {'Content-Type': 'application/json'},
body: JSON.stringify(body)
}).then(function(r) { return r.json(); })
.then(function(data) {
uploadTimer.style.display = 'none';
uploadBtn.disabled = false;
if (data.OK) {
contractId = data.CONTRACT_ID || contractId;
for (var i = 0; i < pending.length; i++) {
pending[i].status = 'uploaded';
}
var elapsed = ((Date.now() - uploadStartTime) / 1000).toFixed(1);
log('✅ ' + pending.length + ' файлов — ' + elapsed + 'с');
} else {
for (var i = 0; i < pending.length; i++) {
pending[i].status = 'error: ' + (data.ERROR || 'неизв.');
}
log('❌ ' + (data.ERROR || 'неизв.'));
}
renderTable();
if (contractId) {
document.getElementById('actionsCard').style.display = 'block'; document.getElementById('actionsCard').style.display = 'block';
document.getElementById('chatCard').style.display = 'block'; document.getElementById('chatCard').style.display = 'block';
} }
return;
}
var p = payloads[i];
var f = p.file;
uploadTimer.textContent = 'Отправка ' + (i+1) + '/' + payloads.length;
var payload = {filename: f.name, data: p.b64};
if (contractId) payload.contract_id = contractId;
fetch('/upload.cfm?_=' + Date.now() + '_' + i, {
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: ' + (r.ERROR || 'неизв.');
log('❌ ' + f.name + ': ' + (r.ERROR || ''));
}
renderTable();
sendSeq(i + 1);
}).catch(function(e) { }).catch(function(e) {
f.status = 'error: ' + e.message; uploadTimer.style.display = 'none';
log('❌ ' + f.name + ': ' + e.message); uploadBtn.disabled = false;
for (var i = 0; i < pending.length; i++) {
pending[i].status = 'error: ' + e.message;
}
renderTable(); renderTable();
sendSeq(i + 1);
}); });
} }
upload.cfm
+62 -108
View File
@@ -5,67 +5,95 @@
<cfheader name="Access-Control-Allow-Headers" value="Content-Type"> <cfheader name="Access-Control-Allow-Headers" value="Content-Type">
<cfif cgi.request_method EQ "OPTIONS"> <cfif cgi.request_method EQ "OPTIONS">
<cfheader name="Content-Type" value="text/plain"> <cfoutput>OK</cfoutput><cfabort>
<cfoutput>OK</cfoutput>
<cfabort>
</cfif> </cfif>
<cfset result = {ok: false, error: "no file"}> <cfset result = {ok: false, error: "no file"}>
<cftry> <cftry>
<!--- JSON-загрузка: {files: [{filename, data}], contract_id?} или {filename, data} --->
<cfset ct = cgi.http_content_type> <cfset ct = cgi.http_content_type>
<!--- JSON: {filename, data} или {files: [{filename, data}]} --->
<cfif ct CONTAINS "application/json"> <cfif ct CONTAINS "application/json">
<cfset body = toString(getHttpRequestData().content)> <cfset body = toString(getHttpRequestData().content)>
<cfset data = deserializeJSON(body)> <cfset data = deserializeJSON(body)>
<!--- Один файл или массив --->
<cfif structKeyExists(data, "files") AND isArray(data.files)> <cfif structKeyExists(data, "files") AND isArray(data.files)>
<cfset fileList = data.files> <cfset fileList = data.files>
<cfelseif structKeyExists(data, "filename")> <cfelseif structKeyExists(data, "filename")>
<cfset fileList = [data]> <cfset fileList = [data]>
<cfelse> <cfelse>
<cfset result = {ok: false, error: "JSON: files array or filename required"}> <cfset result = {ok: false, error: "JSON: filename required"}>
<cfoutput>#serializeJSON(result)#</cfoutput> <cfoutput>#serializeJSON(result)#</cfoutput><cfabort>
<cfabort>
</cfif> </cfif>
<cfset contractId = structKeyExists(data, "contract_id") ? data.contract_id : ""> <cfset contractId = structKeyExists(data, "contract_id") ? data.contract_id : "">
<!--- Обработать каждый файл ---> <!--- Фоновая обработка — мгновенный ответ --->
<cfset results = []> <cfset fileListJson = serializeJSON(fileList)>
<cfloop array="#fileList#" index="fdata"> <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> <cftry>
<cfset clientFile = fdata.filename> <cfset var clientFile = fdata.filename>
<cfset originalBytes = fdata.data> <cfset var originalBytes = fdata.data>
<cfset mime = "application/octet-stream"> <cfset var mime = "application/octet-stream">
<cfset ext = listLast(clientFile, ".")> <cfset var ext = listLast(clientFile, ".")>
<cfif ext EQ "pdf"><cfset mime = "application/pdf"> <cfif ext EQ "pdf"><cfset mime = "application/pdf">
<cfelseif ext EQ "docx"><cfset mime = "application/vnd.openxmlformats-officedocument.wordprocessingml.document"> <cfelseif ext EQ "docx"><cfset mime = "application/vnd.openxmlformats-officedocument.wordprocessingml.document">
<cfelseif ext EQ "doc"><cfset mime = "application/msword"> <cfelseif ext EQ "doc"><cfset mime = "application/msword">
<cfelseif ext EQ "zip"><cfset mime = "application/zip"> <cfelseif ext EQ "zip"><cfset mime = "application/zip">
</cfif> </cfif>
<cftransaction> <cftransaction>
<cfquery datasource="baza"> <cfquery datasource="baza">
INSERT INTO documents (filename, mime_type, original_bytes, status) INSERT INTO documents (filename, mime_type, original_bytes, status)
VALUES ( VALUES (<cfqueryparam value="#clientFile#" cfsqltype="cf_sql_varchar">,<cfqueryparam value="#mime#" cfsqltype="cf_sql_varchar">,<cfqueryparam value="#originalBytes#" cfsqltype="cf_sql_varchar">,'uploaded')
<cfqueryparam value="#clientFile#" cfsqltype="cf_sql_varchar">,
<cfqueryparam value="#mime#" cfsqltype="cf_sql_varchar">,
<cfqueryparam value="#originalBytes#" cfsqltype="cf_sql_varchar">,
'uploaded'
)
</cfquery> </cfquery>
<cfquery name="doc" datasource="baza"> <cfquery name="var doc" datasource="baza">
SELECT id FROM documents SELECT id FROM documents WHERE filename=<cfqueryparam value="#clientFile#" cfsqltype="cf_sql_varchar"> AND status='uploaded' ORDER BY created_at DESC LIMIT 1
WHERE filename = <cfqueryparam value="#clientFile#" cfsqltype="cf_sql_varchar"> </cfquery>
AND status = 'uploaded' ORDER BY created_at DESC LIMIT 1 <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">
<cffile action="readBinary" file="#upload.serverDirectory#/#upload.serverFile#" variable="fileBytes">
<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>
<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> </cfquery>
<cfif len(contractId)> <cfif len(contractId)>
<cfset cid = {id: contractId}>
<cfset suppType = "additional"> <cfset suppType = "additional">
<cfelse> <cfelse>
<cfquery datasource="baza"> <cfquery datasource="baza">
INSERT INTO contracts (number, client) VALUES ( INSERT INTO contracts (number, client) VALUES (<cfqueryparam value="б/н #dateFormat(now(),'yyyymmdd')#-#timeFormat(now(),'HHmm')#" cfsqltype="cf_sql_varchar">,'')
<cfqueryparam value="б/н #dateFormat(now(), 'yyyymmdd')#-#timeFormat(now(), 'HHmm')#" cfsqltype="cf_sql_varchar">, ''
)
</cfquery> </cfquery>
<cfquery name="cid" datasource="baza"> <cfquery name="cid" datasource="baza">
SELECT id FROM contracts ORDER BY created_at DESC LIMIT 1 SELECT id FROM contracts ORDER BY created_at DESC LIMIT 1
@@ -74,87 +102,13 @@
<cfset suppType = "initial"> <cfset suppType = "initial">
</cfif> </cfif>
<cfquery datasource="baza"> <cfquery datasource="baza">
INSERT INTO supplements (contract_id, document_id, type) VALUES ( 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">)
<cfqueryparam value="#cid.id#" cfsqltype="cf_sql_varchar">,
<cfqueryparam value="#doc.id#" cfsqltype="cf_sql_varchar">,
<cfqueryparam value="#suppType#" cfsqltype="cf_sql_varchar">
)
</cfquery> </cfquery>
</cftransaction> </cftransaction>
<cfset result = {ok: true, contract_id: contractId, doc_id: doc.id, filename: upload.clientFile, size: upload.fileSize}>
<cfset arrayAppend(results, {ok: true, doc_id: doc.id, contract_id: cid.id, filename: clientFile, size: len(originalBytes)})> </cfif>
<cfcatch> <cfcatch>
<cfset arrayAppend(results, {ok: false, filename: fdata.filename, error: cfcatch.message})> <cfset result = {ok: false, error: cfcatch.message}>
</cfcatch>
</cftry>
</cfloop>
<cfset result = {ok: true, results: results, contract_id: contractId}>
<cfoutput>#serializeJSON(result)#</cfoutput>
<cfabort>
<!--- 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">
<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> </cfcatch>
</cftry> </cftry>