feat: 持久化采集记录去重 + Goods系统批量导入
- collected.txt 跨文件/跨次记录已查询条码，避免重复采集 - Web UI 显示历史已采集条码计数 - Goods API 新增 POST /api/import/bypos 批量导入端点（含upsert） - 采集器 Web UI 新增一键导入按钮（登录+上传JSONL） - Windows exe 重新编译 Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
This commit is contained in:
ceyhandagdas51272
@@ -37,6 +37,11 @@
|
||||
.hit { color:#2da44e; } .miss { color:#999; } .invalid { color:#d1242f; } .error { color:#bf8700; }
|
||||
.hint { font-size:12px; color:#888; margin-top:6px; line-height:1.5; }
|
||||
.est { font-size:13px; color:#1f6feb; margin-top:6px; }
|
||||
.history-badge { display:inline-block; background:#e8f0fe; color:#1f6feb; padding:4px 12px; border-radius:12px; font-size:13px; font-weight:600; margin-bottom:10px; }
|
||||
.import-result { margin-top:10px; padding:10px; border-radius:6px; font-size:13px; }
|
||||
.import-result.ok { background:#dcfce7; color:#166534; }
|
||||
.import-result.fail { background:#fee2e2; color:#991b1b; }
|
||||
input[type=password] { width:100%; padding:8px 10px; border:1px solid #cdd5e0; border-radius:6px; font-size:14px; }
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
@@ -97,11 +102,12 @@
|
||||
</div>
|
||||
</div>
|
||||
<label style="margin-top:12px"><input type="checkbox" id="logmiss"/> 同时记录未命中/无效条码(默认只存命中)</label>
|
||||
<div class="hint">速度越快越容易触发上游频控。建议并发 3、间隔 300ms 起步,稳定后再调。已采过的条码会自动跳过(断点续采)。</div>
|
||||
<div class="hint">速度越快越容易触发上游频控。建议并发 3、间隔 300ms 起步,稳定后再调。已采过的条码会自动跳过(跨次去重)。</div>
|
||||
</div>
|
||||
|
||||
<div class="card">
|
||||
<h3>③ 运行</h3>
|
||||
<div class="history-badge" id="history-badge">历史已采集: 0 个条码</div>
|
||||
<div style="margin-bottom:12px">
|
||||
<button class="primary" id="btnStart" onclick="start()">开始采集</button>
|
||||
<button class="danger" id="btnStop" onclick="stop()" disabled>停止</button>
|
||||
@@ -116,13 +122,36 @@
|
||||
<div class="stat"><div class="n miss" id="s-miss">0</div><div class="l">未命中</div></div>
|
||||
<div class="stat"><div class="n invalid" id="s-invalid">0</div><div class="l">无效</div></div>
|
||||
<div class="stat"><div class="n error" id="s-errors">0</div><div class="l">错误</div></div>
|
||||
<div class="stat"><div class="n" id="s-skipped">0</div><div class="l">跳过</div></div>
|
||||
<div class="stat"><div class="n" id="s-skipped">0</div><div class="l">跳过(已采)</div></div>
|
||||
</div>
|
||||
<div class="hint" id="msg"></div>
|
||||
</div>
|
||||
|
||||
<div class="card">
|
||||
<h3>④ 实时结果(最近 60 条)</h3>
|
||||
<h3>④ 导入到 Goods 系统</h3>
|
||||
<div class="hint" style="margin-top:0;margin-bottom:10px">采集完成后,将数据一键导入到 OpenGoods 商品档案系统。</div>
|
||||
<div class="row">
|
||||
<div>
|
||||
<label>Goods 管理后台地址</label>
|
||||
<input type="text" id="import-url" placeholder="如 http://192.168.1.100:8080/ping"/>
|
||||
</div>
|
||||
<div>
|
||||
<label>管理员用户名</label>
|
||||
<input type="text" id="import-user" placeholder="admin"/>
|
||||
</div>
|
||||
<div>
|
||||
<label>管理员密码</label>
|
||||
<input type="password" id="import-pass"/>
|
||||
</div>
|
||||
</div>
|
||||
<div style="margin-top:12px">
|
||||
<button class="primary" id="btnImport" onclick="doImport()">导入到 Goods</button>
|
||||
</div>
|
||||
<div id="import-result"></div>
|
||||
</div>
|
||||
|
||||
<div class="card">
|
||||
<h3>⑤ 实时结果(最近 60 条)</h3>
|
||||
<div style="max-height:340px; overflow:auto">
|
||||
<table>
|
||||
<thead><tr><th>条码</th><th>品名</th><th>规格</th><th>单位</th><th>产地</th><th>进价</th><th>零售价</th><th>状态</th></tr></thead>
|
||||
@@ -196,6 +225,7 @@ async function poll(){
|
||||
document.getElementById('s-skipped').textContent = s.skipped;
|
||||
let pct = s.total>0 ? Math.floor(s.done*100/s.total) : 0;
|
||||
document.getElementById('prog').style.width = pct + '%';
|
||||
document.getElementById('history-badge').textContent = '历史已采集: ' + (s.history_count||0) + ' 个条码';
|
||||
document.getElementById('msg').textContent = (s.running? ('采集中… 当前 '+s.current) : (s.message||'空闲'));
|
||||
document.getElementById('btnStart').disabled = s.running;
|
||||
document.getElementById('btnStop').disabled = !s.running;
|
||||
@@ -206,6 +236,35 @@ async function poll(){
|
||||
}catch(e){}
|
||||
}
|
||||
setInterval(poll, 1000); poll();
|
||||
|
||||
async function doImport(){
|
||||
let url = document.getElementById('import-url').value.trim();
|
||||
let user = document.getElementById('import-user').value.trim();
|
||||
let pass = document.getElementById('import-pass').value;
|
||||
if(!url || !user || !pass){ alert('请填写完整的 Goods 系统地址、用户名和密码'); return; }
|
||||
let btn = document.getElementById('btnImport');
|
||||
let res = document.getElementById('import-result');
|
||||
btn.disabled = true;
|
||||
btn.textContent = '导入中...';
|
||||
res.innerHTML = '';
|
||||
try {
|
||||
let r = await fetch('/api/import', {
|
||||
method:'POST',
|
||||
headers:{'Content-Type':'application/json'},
|
||||
body:JSON.stringify({api_url:url, username:user, password:pass})
|
||||
});
|
||||
let j = await r.json();
|
||||
if(j.error){
|
||||
res.innerHTML = '<div class="import-result fail">导入失败: '+esc(j.error.message||j.error)+'</div>';
|
||||
} else {
|
||||
res.innerHTML = '<div class="import-result ok">导入完成: 成功 '+j.loaded+' 条, 跳过 '+j.skipped+' 条, 失败 '+j.errored+' 条</div>';
|
||||
}
|
||||
} catch(e){
|
||||
res.innerHTML = '<div class="import-result fail">导入失败: '+esc(e.message)+'</div>';
|
||||
}
|
||||
btn.disabled = false;
|
||||
btn.textContent = '导入到 Goods';
|
||||
}
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
Reference in New Issue
Block a user