diff --git a/src/Hc900Crawler/wwwroot/index.html b/src/Hc900Crawler/wwwroot/index.html index cac5265..30dae1d 100644 --- a/src/Hc900Crawler/wwwroot/index.html +++ b/src/Hc900Crawler/wwwroot/index.html @@ -137,7 +137,7 @@
-
+
@@ -237,6 +237,6 @@ - + diff --git a/src/Hc900Crawler/wwwroot/js/reports.js b/src/Hc900Crawler/wwwroot/js/reports.js index 140095f..229ab1d 100644 --- a/src/Hc900Crawler/wwwroot/js/reports.js +++ b/src/Hc900Crawler/wwwroot/js/reports.js @@ -8,6 +8,9 @@ paneInit['reports'] = function () { const tog = (sel, wrap) => { const s = $(sel), w = $(wrap); if (s && w) { s.onchange = () => w.style.display = s.value === 'fast_record' ? '' : 'none'; s.onchange(); } }; tog('rvSource', 'rvSessWrap'); tog('rpSource', 'rpSessionWrap'); + // ① 라이브 모니터 — 자동갱신 폴러 + rmStart(); + // ── ① 웹에서 바로 보기 ── const col = $('rvCol'), date = $('rvDate'), go = $('rvGo'), out = $('rvOut'); if (date && !date.value) date.value = yKst(); @@ -118,3 +121,115 @@ function renderSummary(d) { html += ``; return html; } + +/* ── ① 라이브 모니터 (상태 카드 그리드) ─────────────────────── */ +const RM_COLOR = { normal:'#2ea043', idle:'#8b949e', error:'#e5534b', cleaning:'#3a6ea5', drawdown:'#d29922' }; +const RM_LABEL = { normal:'정상', idle:'미가동', error:'오류', cleaning:'세정', drawdown:'drawdown' }; + +function rmStart() { + const auto = document.getElementById('rmAuto'); + if (window._rmTimer) { clearInterval(window._rmTimer); window._rmTimer = null; } + rmRefresh(); + window._rmTimer = setInterval(() => { + if (!document.getElementById('pane-reports')?.classList.contains('active')) return; + if (!auto || auto.checked) rmRefresh(); + }, 15000); +} + +async function rmRefresh() { + const grid = document.getElementById('rmGrid'); if (!grid) return; + try { + const [live, alerts] = await Promise.all([ + fetch('/api/report/live').then(r => r.json()), + fetch('/api/report/alerts').then(r => r.json()) + ]); + // group + const byCol = {}, alByCol = {}; + for (const it of (live.Items || [])) (byCol[it.Column] = byCol[it.Column] || {})[it.Kpi] = it; + for (const a of (alerts.Items || [])) (alByCol[a.Column] = alByCol[a.Column] || []).push(a); + + // 알람 배너 + const banner = document.getElementById('rmAlerts'); + const al = alerts.Items || []; + banner.innerHTML = al.length === 0 ? '' + : `
+ 알람 ${al.length}  ` + + al.map(a => `${a.Severity === 'warning' ? '🟠' : '🟡'} ${a.Column} ${a.Rule} — ${esc2(a.Message || '')}`).join('') + `
`; + + // 카드 그리드 (컬럼 정렬) + const cols = Object.keys(byCol).sort(); + grid.innerHTML = cols.map(c => rmCard(c, byCol[c], alByCol[c] || [])).join(''); + cols.forEach(c => { const el = document.getElementById('rmcard-' + cssId(c)); if (el) el.onclick = () => rmExpand(c); }); + + document.getElementById('rmStatus').textContent = '⟳ 갱신 ' + new Date().toLocaleTimeString(); + } catch (e) { + document.getElementById('rmStatus').textContent = '⚠ ' + (e.message || e); + } +} + +function rmCard(col, k, alerts) { + const st = (k.mass_balance_closure || k.production_total || {}).State || 'idle'; + // 알람 모드 우선 표시 + const modeAlert = alerts.find(a => a.Rule === 'cleaning' || a.Rule === 'drawdown'); + const cardState = modeAlert ? modeAlert.Rule : st; + const color = RM_COLOR[cardState] || '#8b949e'; + const label = RM_LABEL[cardState] || cardState; + + const clo = k.mass_balance_closure; + const cv = clo && clo.Status === 'ok' && clo.Value != null ? clo.Value : null; + const cloColor = cv == null ? '#8b949e' : (cv >= 98 && cv <= 102 ? '#2ea043' : '#e5534b'); + const num = (kpi, kind) => { const m = k[kpi]; return m && m.Status === 'ok' && m.Value != null ? rpFmt(m.Value, kind) : '—'; }; + + const chips = alerts.map(a => `${a.Rule}`).join(' '); + + return `
+
+ ${col} + ● ${label} +
+
+ ${cv == null ? '—' : rpFmt(cv,'pct') + '%'} +
물질수지 폐합
+
+
+ IN${num('feed_qv','kg')} + OUT${num('out_total','kg')} + 생산${num('production_total','kg')} kg + 수율${num('yield_qv','ratio')} +
+ ${chips ? `
${chips}
` : ''} +
`; +} + +async function rmExpand(col) { + const box = document.getElementById('rmDetail'); + box.innerHTML = `
⏳ ${col} 상세...
`; + try { + const today = new Date(Date.now() + 9*3600e3).toISOString().slice(0,10); + const sum = await fetch(`/api/report/summary?column=${encodeURIComponent(col)}&date=${today}&source=history_1s`).then(r=>r.json()); + const dyn = await fetch('/api/report/metric', {method:'POST', headers:{'Content-Type':'application/json'}, + body: JSON.stringify({Column:col, Metric:'dynamics', PeriodDateKst:today, SourceTable:'history_1s'})}).then(r=>r.json()); + const clo = (sum.Metrics||[]).find(m=>m.Metric==='mass_balance_closure') || {}; + const e = clo.Extra || {}; + const res = (sum.Metrics||[]).find(m=>m.Metric==='control_residual') || {Extra:{}}; + box.innerHTML = ` +
+
${col} 상세 + src=history_1s · ${today}
+
+
물질수지
+ IN ${rpFmt(e.feed_qv,'kg')} → OUT ${rpFmt(e.out_total,'kg')} kg
+ 제품 ${rpFmt(e.out0_qv,'kg')} · 경비 ${rpFmt(e.out1_qv,'kg')} · 중비 ${rpFmt(e.out2_qv,'kg')}
+ 폐합 ${clo.Status==='ok'?rpFmt(clo.Value,'pct')+'%':'N/A'}
+
제어품질 (하부온도)
+ 평균잔차 ${res.Status==='ok'?rpFmt(res.Value,'degC'):'N/A'}℃
+ sd ${rpFmt(res.Extra.sd,'degC')} · |잔차|>0.5℃ ${rpFmt(res.Extra.out_pct_0_5,'pct')}%
+
동특성 (밸브, history_1s)
+ ${dyn.Status==='ok'?`OP travel ${rpFmt(dyn.Value,'')} /h
헌팅주기 ${rpFmt(dyn.Extra.osc_period_s,'')}s · PV sd ${rpFmt(dyn.Extra.pv_sd,'degC')}`:`N/A (${esc2(dyn.Error||'')})`}
+
+
`; + } catch (e) { box.innerHTML = `❌ ${e.message||e}`; } +} + +function cssId(s) { return s.replace(/[^a-zA-Z0-9]/g, '_'); } +function esc2(s) { return typeof esc === 'function' ? esc(s) : String(s).replace(/[<>&]/g, c => ({'<':'<','>':'>','&':'&'}[c])); } diff --git a/src/Hc900Crawler/wwwroot/panes/reports.html b/src/Hc900Crawler/wwwroot/panes/reports.html index b7ede29..623abc5 100644 --- a/src/Hc900Crawler/wwwroot/panes/reports.html +++ b/src/Hc900Crawler/wwwroot/panes/reports.html @@ -1,9 +1,22 @@ -
-

리포트 (P0)

+
+

리포트

- +
-

① 웹에서 바로 보기

+
+

① 라이브 모니터

+ + +
+
+
+
+
+ + +
+

② 웹에서 바로 보기 (기간 선택)

@@ -21,7 +34,7 @@
-

② 엑셀 폼으로 내보내기

+

③ 엑셀 폼으로 내보내기

엑셀 템플릿 셀에 {{ metric=mass_balance_closure; column=C-6111 }} 형태 토큰을 박아두면 선택 날짜 값으로 채워 다운로드합니다.

diff --git a/src/Infrastructure/Hc900/Hc900LiveKpiService.cs b/src/Infrastructure/Hc900/Hc900LiveKpiService.cs index 6693a88..d7776c5 100644 --- a/src/Infrastructure/Hc900/Hc900LiveKpiService.cs +++ b/src/Infrastructure/Hc900/Hc900LiveKpiService.cs @@ -78,8 +78,17 @@ public class Hc900LiveKpiService : BackgroundService written++; } - // P1d: 실시간 알람 (운전모드 + 폐합 이탈) + // 카드 표시용 폐합 성분(IN/OUT) 저장 var closure = results.First(r => r.Metric == "mass_balance_closure"); + if (closure.Status == "ok") + { + if (closure.Extra.TryGetValue("feed_qv", out var fq) && fq is double fqv) + await UpsertAsync(conn, col, "feed_qv", todayKst, fqv, "kg", state, null, "ok", stoppingToken); + if (closure.Extra.TryGetValue("out_total", out var ot) && ot is double otv) + await UpsertAsync(conn, col, "out_total", todayKst, otv, "kg", state, null, "ok", stoppingToken); + } + + // P1d: 실시간 알람 (운전모드 + 폐합 이탈) await EvaluateAlertsAsync(conn, col, closure, stoppingToken); } _logger.LogDebug("[LiveKpi] {N}개 KPI 갱신 @ {Day}", written, todayKst);