add notice after config
This commit is contained in:
@@ -0,0 +1,9 @@
|
|||||||
|
# 默认所有文本文件使用 Windows 换行符
|
||||||
|
* text=auto eol=crlf
|
||||||
|
|
||||||
|
# server 文件夹下所有文件使用 Linux 换行符
|
||||||
|
server/** text eol=lf
|
||||||
|
|
||||||
|
# 特定文件类型明确指定
|
||||||
|
*.sh text eol=lf
|
||||||
|
*.bash text eol=lf
|
||||||
+10
-1
@@ -140,7 +140,16 @@ async function getConfig(configType, options = {}) {
|
|||||||
repeat: Number(values.repeat)
|
repeat: Number(values.repeat)
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
return callServer({ type: "getFunctionConfig", configType }, options);
|
const result = await callServer({
|
||||||
|
type: "getVolumeConfigFile",
|
||||||
|
deviceId: getDeviceId(options)
|
||||||
|
}, options);
|
||||||
|
if (result.found === false || !result.url) {
|
||||||
|
throw new Error("当前产线尚无已成功提交的容积配置");
|
||||||
|
}
|
||||||
|
const response = await fetch(result.url);
|
||||||
|
if (!response.ok) throw new Error(`配置文件下载失败: HTTP ${response.status}`);
|
||||||
|
return JSON.parse(await response.text());
|
||||||
}
|
}
|
||||||
|
|
||||||
async function main() {
|
async function main() {
|
||||||
|
|||||||
@@ -10,6 +10,9 @@ const { plotJson } = require("./plot-json");
|
|||||||
const VOLUME_FIELDS = [
|
const VOLUME_FIELDS = [
|
||||||
"q_in_val", "dt", "p_max", "fit_low", "fit_high", "T_delta", "xa_full", "num_runs"
|
"q_in_val", "dt", "p_max", "fit_low", "fit_high", "T_delta", "xa_full", "num_runs"
|
||||||
];
|
];
|
||||||
|
const IDENTIFICATION_FIELDS = [
|
||||||
|
"q_in_val", "dt", "n_order", "t_c", "levels", "dead_area", "xa_full", "V_val", "repeat"
|
||||||
|
];
|
||||||
const DEFAULT_API_URL = "https://ReinLoop.dominatedconvergence.com";
|
const DEFAULT_API_URL = "https://ReinLoop.dominatedconvergence.com";
|
||||||
const API_URL = process.env.REINLOOP_API_URL || DEFAULT_API_URL;
|
const API_URL = process.env.REINLOOP_API_URL || DEFAULT_API_URL;
|
||||||
const INBOX_POLL_INTERVAL_MS = Number(process.env.POLL_INTERVAL_MS || 1000);
|
const INBOX_POLL_INTERVAL_MS = Number(process.env.POLL_INTERVAL_MS || 1000);
|
||||||
@@ -35,13 +38,42 @@ function startPanelInboxPoller(window) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
let polling = false;
|
let polling = false;
|
||||||
|
let notificationDeviceId = null;
|
||||||
|
const deliveredNotificationIds = new Set();
|
||||||
|
let notificationFailureReported = false;
|
||||||
|
|
||||||
|
async function pollNotifications(requestContext) {
|
||||||
|
if (notificationDeviceId !== requestContext.deviceId) {
|
||||||
|
notificationDeviceId = requestContext.deviceId;
|
||||||
|
deliveredNotificationIds.clear();
|
||||||
|
}
|
||||||
|
const pending = await callServer(
|
||||||
|
{ type: "getPendingPanelNotification", deviceId: requestContext.deviceId },
|
||||||
|
requestContext
|
||||||
|
);
|
||||||
|
notificationFailureReported = false;
|
||||||
|
const notification = pending.notification;
|
||||||
|
if (!pending.pending || !notification?.notificationId) return;
|
||||||
|
if (deliveredNotificationIds.has(notification.notificationId)) return;
|
||||||
|
deliveredNotificationIds.add(notification.notificationId);
|
||||||
|
window.webContents.send("panel:notification", notification);
|
||||||
|
}
|
||||||
|
|
||||||
const poll = async () => {
|
const poll = async () => {
|
||||||
if (polling || window.isDestroyed()) return;
|
if (polling || window.isDestroyed()) return;
|
||||||
if (!connectionState.deviceId || !connectionState.adminToken) return;
|
if (!connectionState.deviceId || !connectionState.adminToken) return;
|
||||||
if (pendingReview) return;
|
|
||||||
const requestContext = { ...connectionState };
|
const requestContext = { ...connectionState };
|
||||||
polling = true;
|
polling = true;
|
||||||
try {
|
try {
|
||||||
|
try {
|
||||||
|
await pollNotifications(requestContext);
|
||||||
|
} catch (error) {
|
||||||
|
if (!notificationFailureReported) {
|
||||||
|
console.warn(`[${new Date().toISOString()}] Panel 通知轮询不可用: ${error.message}`);
|
||||||
|
notificationFailureReported = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (pendingReview) return;
|
||||||
const pending = await callServer(
|
const pending = await callServer(
|
||||||
{ type: "getPendingPanelFile", deviceId: requestContext.deviceId },
|
{ type: "getPendingPanelFile", deviceId: requestContext.deviceId },
|
||||||
requestContext
|
requestContext
|
||||||
@@ -128,7 +160,35 @@ function validateParameters(configType, parameters) {
|
|||||||
if (!Number.isInteger(parameters.num_runs)) {
|
if (!Number.isInteger(parameters.num_runs)) {
|
||||||
throw new Error("num_runs 必须是整数");
|
throw new Error("num_runs 必须是整数");
|
||||||
}
|
}
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (configType === "identification") {
|
||||||
|
const fields = Object.keys(parameters);
|
||||||
|
const missing = IDENTIFICATION_FIELDS.filter((field) => !(field in parameters));
|
||||||
|
const extra = fields.filter((field) => !IDENTIFICATION_FIELDS.includes(field));
|
||||||
|
if (missing.length || extra.length) {
|
||||||
|
throw new Error(`系统辨识配置字段不匹配。缺少: ${missing.join(", ") || "无"};多余: ${extra.join(", ") || "无"}`);
|
||||||
|
}
|
||||||
|
for (const field of IDENTIFICATION_FIELDS) {
|
||||||
|
if (field === "levels") continue;
|
||||||
|
if (typeof parameters[field] !== "number" || !Number.isFinite(parameters[field])) {
|
||||||
|
throw new Error(`${field} 必须是有效数字`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!Array.isArray(parameters.levels) || parameters.levels.some((value) => typeof value !== "number" || !Number.isFinite(value))) {
|
||||||
|
throw new Error("levels 必须是有效数字数组");
|
||||||
|
}
|
||||||
|
if (parameters.levels.length < 2 || (parameters.levels.length & (parameters.levels.length - 1)) !== 0) {
|
||||||
|
throw new Error("levels 元素个数必须是不小于 2 的 2 的整数次幂");
|
||||||
|
}
|
||||||
|
if (!Number.isInteger(parameters.n_order) || !Number.isInteger(parameters.repeat)) {
|
||||||
|
throw new Error("n_order 和 repeat 必须是整数");
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
throw new Error(`不支持的配置类型: ${configType}`);
|
||||||
}
|
}
|
||||||
|
|
||||||
function toDataUrl(filePath) {
|
function toDataUrl(filePath) {
|
||||||
@@ -155,6 +215,21 @@ function registerHandlers() {
|
|||||||
return { success: true };
|
return { success: true };
|
||||||
});
|
});
|
||||||
|
|
||||||
|
ipcMain.handle("panel:ack-notification", (_event, request) =>
|
||||||
|
callServer({
|
||||||
|
type: "ackPanelNotification",
|
||||||
|
deviceId: request.deviceId,
|
||||||
|
notificationId: request.notificationId
|
||||||
|
}, request.credentials));
|
||||||
|
ipcMain.handle("panel:open-notification-file", async (_event, request) => {
|
||||||
|
if (!request.fileID) throw new Error("该提醒未关联结果文件");
|
||||||
|
const download = await callServer({ type: "downloadModel", fileID: request.fileID }, request.credentials);
|
||||||
|
const sourcePath = await downloadFromUrl(download.url, download.fileName || "volume_result.json", request.credentials);
|
||||||
|
const error = await shell.openPath(sourcePath);
|
||||||
|
if (error) throw new Error(`无法打开结果文件: ${error}`);
|
||||||
|
return { filePath: sourcePath };
|
||||||
|
});
|
||||||
|
|
||||||
ipcMain.handle("connection:test", async (_event, request) => {
|
ipcMain.handle("connection:test", async (_event, request) => {
|
||||||
const result = await callServer({ type: "listOrganizations" }, request);
|
const result = await callServer({ type: "listOrganizations" }, request);
|
||||||
connectionState.apiUrl = String(request.apiUrl || API_URL).trim();
|
connectionState.apiUrl = String(request.apiUrl || API_URL).trim();
|
||||||
|
|||||||
@@ -30,6 +30,9 @@ contextBridge.exposeInMainWorld("reinloop", {
|
|||||||
previewControlFile: (request) => ipcRenderer.invoke("control-data:preview", request),
|
previewControlFile: (request) => ipcRenderer.invoke("control-data:preview", request),
|
||||||
downloadControlFile: (request) => ipcRenderer.invoke("control-data:download", request),
|
downloadControlFile: (request) => ipcRenderer.invoke("control-data:download", request),
|
||||||
deleteControlFile: (request) => ipcRenderer.invoke("control-data:delete", request),
|
deleteControlFile: (request) => ipcRenderer.invoke("control-data:delete", request),
|
||||||
|
acknowledgeNotification: (request) => ipcRenderer.invoke("panel:ack-notification", request),
|
||||||
|
openNotificationFile: (request) => ipcRenderer.invoke("panel:open-notification-file", request),
|
||||||
onCsvUpdated: (callback) => ipcRenderer.on("csv:updated", (_event, result) => callback(result)),
|
onCsvUpdated: (callback) => ipcRenderer.on("csv:updated", (_event, result) => callback(result)),
|
||||||
onCsvWatchError: (callback) => ipcRenderer.on("csv:watch-error", (_event, message) => callback(message))
|
onCsvWatchError: (callback) => ipcRenderer.on("csv:watch-error", (_event, message) => callback(message)),
|
||||||
|
onPanelNotification: (callback) => ipcRenderer.on("panel:notification", (_event, notification) => callback(notification))
|
||||||
});
|
});
|
||||||
@@ -43,7 +43,7 @@
|
|||||||
<button class="tab active" data-target="plot-panel">绘图预览</button>
|
<button class="tab active" data-target="plot-panel">绘图预览</button>
|
||||||
<button class="tab" data-target="identification-data-panel">辨识数据</button>
|
<button class="tab" data-target="identification-data-panel">辨识数据</button>
|
||||||
<button class="tab" data-target="control-data-panel">控制数据</button>
|
<button class="tab" data-target="control-data-panel">控制数据</button>
|
||||||
<button class="tab" data-target="config-panel">配置发布</button>
|
<button class="tab" data-target="config-panel">配置发布 <span id="config-notification-badge" class="tab-badge" hidden>0</span></button>
|
||||||
<button class="tab" data-target="model-panel">模型管理</button>
|
<button class="tab" data-target="model-panel">模型管理</button>
|
||||||
<button class="tab" data-target="license-panel">许可证</button>
|
<button class="tab" data-target="license-panel">许可证</button>
|
||||||
<button class="tab" data-target="organization-panel">组织管理</button>
|
<button class="tab" data-target="organization-panel">组织管理</button>
|
||||||
@@ -139,14 +139,15 @@
|
|||||||
<button class="segment" data-type="identification">系统辨识</button>
|
<button class="segment" data-type="identification">系统辨识</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div id="config-notifications" class="notification-stack" aria-live="polite"></div>
|
||||||
<div class="editor-layout">
|
<div class="editor-layout">
|
||||||
<div class="editor-column">
|
<div class="editor-column">
|
||||||
<div class="editor-toolbar">
|
<div class="editor-toolbar">
|
||||||
<span id="config-label">容积测量配置</span>
|
<span id="config-label">容积测量配置</span>
|
||||||
<button id="import-config" class="text-button">导入 JSON</button>
|
<button id="import-config" class="text-button">导入 JSON</button>
|
||||||
</div>
|
</div>
|
||||||
<textarea id="config-editor" spellcheck="false" aria-label="JSON 配置编辑器"></textarea>
|
<form id="config-form" class="config-form" aria-label="配置字段"></form>
|
||||||
<p id="config-path" class="file-path">可直接编辑,或从本地 JSON 导入</p>
|
<p id="config-path" class="file-path">字段名称固定;可填写右侧数据或从本地 JSON 导入</p>
|
||||||
</div>
|
</div>
|
||||||
<aside class="publish-aside">
|
<aside class="publish-aside">
|
||||||
<h3>发布检查</h3>
|
<h3>发布检查</h3>
|
||||||
|
|||||||
@@ -21,6 +21,11 @@ const identificationExample = {
|
|||||||
repeat: 2
|
repeat: 2
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const configFields = {
|
||||||
|
volume: Object.keys(volumeExample),
|
||||||
|
identification: Object.keys(identificationExample)
|
||||||
|
};
|
||||||
|
|
||||||
const state = {
|
const state = {
|
||||||
configType: "volume",
|
configType: "volume",
|
||||||
imagePaths: { csv: null, json: null },
|
imagePaths: { csv: null, json: null },
|
||||||
@@ -33,7 +38,9 @@ const state = {
|
|||||||
defaultDeviceId: "",
|
defaultDeviceId: "",
|
||||||
review: null,
|
review: null,
|
||||||
retryDeviceId: null,
|
retryDeviceId: null,
|
||||||
|
notificationDeviceId: null,
|
||||||
lightbox: { mediaType: null, scale: 1, fit: true, previousFocus: null },
|
lightbox: { mediaType: null, scale: 1, fit: true, previousFocus: null },
|
||||||
|
notifications: [],
|
||||||
connected: false
|
connected: false
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -66,12 +73,14 @@ const elements = {
|
|||||||
openImage: document.querySelector('[data-open-plot="json"]')
|
openImage: document.querySelector('[data-open-plot="json"]')
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
configEditor: document.querySelector("#config-editor"),
|
configForm: document.querySelector("#config-form"),
|
||||||
configLabel: document.querySelector("#config-label"),
|
configLabel: document.querySelector("#config-label"),
|
||||||
configPath: document.querySelector("#config-path"),
|
configPath: document.querySelector("#config-path"),
|
||||||
publishTarget: document.querySelector("#publish-target"),
|
publishTarget: document.querySelector("#publish-target"),
|
||||||
publishButton: document.querySelector("#publish-config"),
|
publishButton: document.querySelector("#publish-config"),
|
||||||
publishResult: document.querySelector("#publish-result"),
|
publishResult: document.querySelector("#publish-result"),
|
||||||
|
configNotifications: document.querySelector("#config-notifications"),
|
||||||
|
configNotificationBadge: document.querySelector("#config-notification-badge"),
|
||||||
lineCompany: document.querySelector("#line-company"),
|
lineCompany: document.querySelector("#line-company"),
|
||||||
licenseTarget: document.querySelector("#license-target"),
|
licenseTarget: document.querySelector("#license-target"),
|
||||||
licenseList: document.querySelector("#license-list"),
|
licenseList: document.querySelector("#license-list"),
|
||||||
@@ -225,6 +234,11 @@ function renderLineOptions() {
|
|||||||
function updateSelectedTarget() {
|
function updateSelectedTarget() {
|
||||||
const company = selectedCompany();
|
const company = selectedCompany();
|
||||||
const line = selectedLine();
|
const line = selectedLine();
|
||||||
|
if (state.notificationDeviceId !== elements.deviceId.value) {
|
||||||
|
state.notificationDeviceId = elements.deviceId.value;
|
||||||
|
state.notifications = [];
|
||||||
|
renderNotifications();
|
||||||
|
}
|
||||||
elements.licenseTarget.value = company && line ? `${company.name} / ${line.name}` : "";
|
elements.licenseTarget.value = company && line ? `${company.name} / ${line.name}` : "";
|
||||||
void syncConnection();
|
void syncConnection();
|
||||||
}
|
}
|
||||||
@@ -413,16 +427,91 @@ function activateTab(target) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function activateConfigType(configType) {
|
function activateConfigType(configType) {
|
||||||
try {
|
syncCurrentConfig();
|
||||||
state.configs[state.configType] = JSON.parse(elements.configEditor.value);
|
|
||||||
} catch (_error) {
|
|
||||||
// Keep the last valid configuration when changing views.
|
|
||||||
}
|
|
||||||
state.configType = configType;
|
state.configType = configType;
|
||||||
document.querySelectorAll(".segment").forEach((item) => item.classList.toggle("active", item.dataset.type === configType));
|
document.querySelectorAll(".segment").forEach((item) => item.classList.toggle("active", item.dataset.type === configType));
|
||||||
renderConfig();
|
renderConfig();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function isPowerOfTwo(value) {
|
||||||
|
return Number.isInteger(value) && value >= 2 && (value & (value - 1)) === 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
function clearConfigErrors() {
|
||||||
|
elements.configForm.querySelectorAll("[aria-invalid]").forEach((input) => input.removeAttribute("aria-invalid"));
|
||||||
|
elements.configForm.querySelectorAll(".config-field-error").forEach((item) => item.remove());
|
||||||
|
}
|
||||||
|
|
||||||
|
function showConfigFieldError(field, message) {
|
||||||
|
const input = elements.configForm.querySelector(`[data-config-field="${field}"]`);
|
||||||
|
if (!input) return;
|
||||||
|
input.setAttribute("aria-invalid", "true");
|
||||||
|
const error = document.createElement("p");
|
||||||
|
error.className = "config-field-error";
|
||||||
|
error.textContent = message;
|
||||||
|
input.closest(".config-field").append(error);
|
||||||
|
}
|
||||||
|
|
||||||
|
function readConfigForm({ showErrors = false } = {}) {
|
||||||
|
const type = state.configType;
|
||||||
|
const parameters = {};
|
||||||
|
let invalidField = null;
|
||||||
|
let invalidMessage = null;
|
||||||
|
clearConfigErrors();
|
||||||
|
for (const field of configFields[type]) {
|
||||||
|
const input = elements.configForm.querySelector(`[data-config-field="${field}"]`);
|
||||||
|
const text = input?.value.trim() || "";
|
||||||
|
if (field === "levels") {
|
||||||
|
const values = text.split(",").map((value) => value.trim()).filter(Boolean);
|
||||||
|
parameters[field] = values.map(Number);
|
||||||
|
if (!values.length || parameters[field].some((value) => !Number.isFinite(value))) {
|
||||||
|
invalidField = field;
|
||||||
|
invalidMessage = "请输入以逗号分隔的有效数字。";
|
||||||
|
} else if (!isPowerOfTwo(parameters[field].length)) {
|
||||||
|
invalidField = field;
|
||||||
|
invalidMessage = "元素个数必须是不小于 2 的 2 的整数次幂。";
|
||||||
|
}
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
const value = Number(text);
|
||||||
|
parameters[field] = value;
|
||||||
|
if (!text || !Number.isFinite(value)) {
|
||||||
|
invalidField = field;
|
||||||
|
invalidMessage = "请输入有效数字。";
|
||||||
|
} else if (["num_runs", "n_order", "repeat"].includes(field) && !Number.isInteger(value)) {
|
||||||
|
invalidField = field;
|
||||||
|
invalidMessage = "请输入整数。";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (invalidField) {
|
||||||
|
if (showErrors) showConfigFieldError(invalidField, invalidMessage);
|
||||||
|
throw new Error(`${invalidField}:${invalidMessage}`);
|
||||||
|
}
|
||||||
|
return parameters;
|
||||||
|
}
|
||||||
|
|
||||||
|
function syncCurrentConfig() {
|
||||||
|
try {
|
||||||
|
state.configs[state.configType] = readConfigForm();
|
||||||
|
} catch (_error) {
|
||||||
|
// Preserve the last valid values until the user corrects the visible form.
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function normalizeImportedConfig(parameters) {
|
||||||
|
if (!parameters || typeof parameters !== "object" || Array.isArray(parameters)) {
|
||||||
|
throw new Error("导入配置必须是 JSON 对象");
|
||||||
|
}
|
||||||
|
const fields = configFields[state.configType];
|
||||||
|
const unknown = Object.keys(parameters).filter((field) => !fields.includes(field));
|
||||||
|
if (unknown.length) throw new Error(`导入配置包含未知字段:${unknown.join(", ")}`);
|
||||||
|
const normalized = { ...state.configs[state.configType] };
|
||||||
|
for (const field of fields) {
|
||||||
|
if (parameters[field] !== undefined) normalized[field] = parameters[field];
|
||||||
|
}
|
||||||
|
return normalized;
|
||||||
|
}
|
||||||
|
|
||||||
function switchToIdentificationConfigForRetry() {
|
function switchToIdentificationConfigForRetry() {
|
||||||
if (!state.review) return;
|
if (!state.review) return;
|
||||||
state.retryDeviceId = state.review.deviceId;
|
state.retryDeviceId = state.review.deviceId;
|
||||||
@@ -464,11 +553,16 @@ async function submitRetryReview() {
|
|||||||
|
|
||||||
function renderConfig() {
|
function renderConfig() {
|
||||||
const isVolume = state.configType === "volume";
|
const isVolume = state.configType === "volume";
|
||||||
elements.configEditor.value = JSON.stringify(state.configs[state.configType], null, 2);
|
const config = state.configs[state.configType];
|
||||||
|
elements.configForm.innerHTML = configFields[state.configType].map((field) => {
|
||||||
|
const value = field === "levels" ? config[field].join(", ") : config[field];
|
||||||
|
const integer = ["num_runs", "n_order", "repeat"].includes(field);
|
||||||
|
return `<div class="config-field"><label for="config-${field}">${field}</label><input id="config-${field}" data-config-field="${field}" type="${field === "levels" ? "text" : "number"}"${field === "levels" ? "" : ` step="${integer ? "1" : "any"}"` } value="${escapeHtml(value)}" required></div>`;
|
||||||
|
}).join("");
|
||||||
elements.configLabel.textContent = isVolume ? "容积测量配置" : "系统辨识配置";
|
elements.configLabel.textContent = isVolume ? "容积测量配置" : "系统辨识配置";
|
||||||
elements.publishTarget.textContent = isVolume ? "Server 配置文件" : "设备辨识配置";
|
elements.publishTarget.textContent = isVolume ? "Server 配置文件" : "设备辨识配置";
|
||||||
elements.publishButton.textContent = isVolume ? "上传容积配置" : "发布辨识配置";
|
elements.publishButton.textContent = isVolume ? "上传容积配置" : "发布辨识配置";
|
||||||
elements.configPath.textContent = "可直接编辑,或从本地 JSON 导入";
|
elements.configPath.textContent = "字段名称固定;可填写右侧数据或从本地 JSON 导入";
|
||||||
elements.publishResult.textContent = "等待操作";
|
elements.publishResult.textContent = "等待操作";
|
||||||
delete elements.publishResult.dataset.tone;
|
delete elements.publishResult.dataset.tone;
|
||||||
}
|
}
|
||||||
@@ -688,8 +782,13 @@ elements.identificationFileList.addEventListener("click", async (event) => {
|
|||||||
document.querySelector("#import-config").addEventListener("click", async () => {
|
document.querySelector("#import-config").addEventListener("click", async () => {
|
||||||
const result = await runBusy("正在导入配置", () => window.reinloop.chooseConfig());
|
const result = await runBusy("正在导入配置", () => window.reinloop.chooseConfig());
|
||||||
if (!result) return;
|
if (!result) return;
|
||||||
state.configs[state.configType] = result.parameters;
|
try {
|
||||||
elements.configEditor.value = JSON.stringify(result.parameters, null, 2);
|
state.configs[state.configType] = normalizeImportedConfig(result.parameters);
|
||||||
|
renderConfig();
|
||||||
|
} catch (error) {
|
||||||
|
showError(error);
|
||||||
|
return;
|
||||||
|
}
|
||||||
elements.configPath.textContent = result.filePath;
|
elements.configPath.textContent = result.filePath;
|
||||||
setStatus("配置已导入", "success");
|
setStatus("配置已导入", "success");
|
||||||
});
|
});
|
||||||
@@ -700,8 +799,13 @@ document.querySelector("#load-server").addEventListener("click", async () => {
|
|||||||
credentials: credentials()
|
credentials: credentials()
|
||||||
}));
|
}));
|
||||||
if (!parameters) return;
|
if (!parameters) return;
|
||||||
state.configs[state.configType] = parameters;
|
try {
|
||||||
elements.configEditor.value = JSON.stringify(parameters, null, 2);
|
state.configs[state.configType] = normalizeImportedConfig(parameters);
|
||||||
|
renderConfig();
|
||||||
|
} catch (error) {
|
||||||
|
showError(new Error(`Server 配置无效:${error.message}`));
|
||||||
|
return;
|
||||||
|
}
|
||||||
elements.publishResult.textContent = "已读取当前 Server 配置";
|
elements.publishResult.textContent = "已读取当前 Server 配置";
|
||||||
elements.publishResult.dataset.tone = "success";
|
elements.publishResult.dataset.tone = "success";
|
||||||
setStatus("读取完成", "success");
|
setStatus("读取完成", "success");
|
||||||
@@ -710,9 +814,9 @@ document.querySelector("#load-server").addEventListener("click", async () => {
|
|||||||
elements.publishButton.addEventListener("click", async () => {
|
elements.publishButton.addEventListener("click", async () => {
|
||||||
let parameters;
|
let parameters;
|
||||||
try {
|
try {
|
||||||
parameters = JSON.parse(elements.configEditor.value);
|
parameters = readConfigForm({ showErrors: true });
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
showError(new Error(`JSON 格式错误: ${error.message}`));
|
showError(error);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -732,6 +836,10 @@ elements.publishButton.addEventListener("click", async () => {
|
|||||||
? `${result.message}: ${result.storagePath}`
|
? `${result.message}: ${result.storagePath}`
|
||||||
: result.message;
|
: result.message;
|
||||||
elements.publishResult.dataset.tone = "success";
|
elements.publishResult.dataset.tone = "success";
|
||||||
|
if (state.configType === "volume") {
|
||||||
|
const notification = state.notifications.find((item) => item.type === "volume_request_started");
|
||||||
|
if (notification) void acknowledgeNotification(notification);
|
||||||
|
}
|
||||||
if (state.configType === "identification" && state.retryDeviceId) {
|
if (state.configType === "identification" && state.retryDeviceId) {
|
||||||
await submitRetryReview();
|
await submitRetryReview();
|
||||||
} else {
|
} else {
|
||||||
@@ -831,3 +939,71 @@ elements.controlFileList.addEventListener("click", async (event) => {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
function renderNotifications() {
|
||||||
|
elements.configNotificationBadge.hidden = state.notifications.length === 0;
|
||||||
|
elements.configNotificationBadge.textContent = String(state.notifications.length);
|
||||||
|
elements.configNotifications.innerHTML = state.notifications.map((notification) => {
|
||||||
|
const action = notification.type === "volume_request_started"
|
||||||
|
? "处理配置"
|
||||||
|
: notification.type === "volume_result_ready"
|
||||||
|
? "查看结果"
|
||||||
|
: "查看绘图";
|
||||||
|
const secondaryAction = notification.type === "identification_result_ready" ? "查看辨识数据" : "";
|
||||||
|
return `<article class="panel-notification" data-notification-id="${escapeHtml(notification.notificationId)}" data-type="${escapeHtml(notification.type)}"><div class="notification-copy"><strong>${escapeHtml(notification.title)}</strong><span>${escapeHtml(notification.message)}</span></div><div class="notification-actions"><button class="button secondary" data-notification-action="primary" data-notification-id="${escapeHtml(notification.notificationId)}">${action}</button>${secondaryAction ? `<button class="button secondary" data-notification-action="secondary" data-notification-id="${escapeHtml(notification.notificationId)}">${secondaryAction}</button>` : ""}<button class="button icon" title="关闭提醒" aria-label="关闭提醒" data-notification-action="close" data-notification-id="${escapeHtml(notification.notificationId)}">x</button></div></article>`;
|
||||||
|
}).join("");
|
||||||
|
}
|
||||||
|
|
||||||
|
async function acknowledgeNotification(notification) {
|
||||||
|
const result = await runBusy("正在确认提醒", () => window.reinloop.acknowledgeNotification({
|
||||||
|
deviceId: notification.deviceId,
|
||||||
|
notificationId: notification.notificationId,
|
||||||
|
credentials: credentials()
|
||||||
|
}));
|
||||||
|
if (!result) return false;
|
||||||
|
state.notifications = state.notifications.filter((item) => item.notificationId !== notification.notificationId);
|
||||||
|
renderNotifications();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
async function handleNotificationAction(notification, action) {
|
||||||
|
if (action === "close") {
|
||||||
|
await acknowledgeNotification(notification);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (notification.type === "volume_request_started") {
|
||||||
|
activateTab("config-panel");
|
||||||
|
activateConfigType("volume");
|
||||||
|
elements.configForm.querySelector("input")?.focus();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (notification.type === "volume_result_ready") {
|
||||||
|
const result = await runBusy("正在打开容积测试结果", () => window.reinloop.openNotificationFile({
|
||||||
|
fileID: notification.fileID,
|
||||||
|
credentials: credentials()
|
||||||
|
}));
|
||||||
|
if (result) setStatus(`已打开结果文件:${result.filePath}`, "success");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (action === "primary") {
|
||||||
|
activateTab("plot-panel");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
activateTab("identification-data-panel");
|
||||||
|
await refreshIdentificationFiles();
|
||||||
|
}
|
||||||
|
|
||||||
|
elements.configNotifications.addEventListener("click", (event) => {
|
||||||
|
const button = event.target.closest("button[data-notification-id]");
|
||||||
|
if (!button) return;
|
||||||
|
const notification = state.notifications.find((item) => item.notificationId === button.dataset.notificationId);
|
||||||
|
if (notification) void handleNotificationAction(notification, button.dataset.notificationAction);
|
||||||
|
});
|
||||||
|
|
||||||
|
window.reinloop.onPanelNotification((notification) => {
|
||||||
|
if (!notification?.notificationId || notification.deviceId !== elements.deviceId.value) return;
|
||||||
|
state.notificationDeviceId = notification.deviceId;
|
||||||
|
if (state.notifications.some((item) => item.notificationId === notification.notificationId)) return;
|
||||||
|
state.notifications.push(notification);
|
||||||
|
renderNotifications();
|
||||||
|
});
|
||||||
@@ -124,6 +124,7 @@ input:focus, select:focus, textarea:focus { border-color: var(--green); box-shad
|
|||||||
font-weight: 700;
|
font-weight: 700;
|
||||||
}
|
}
|
||||||
.tab.active { color: var(--green-dark); border-bottom-color: var(--green); }
|
.tab.active { color: var(--green-dark); border-bottom-color: var(--green); }
|
||||||
|
.tab-badge { display: inline-grid; min-width: 18px; height: 18px; place-items: center; margin-left: 5px; padding: 0 5px; border-radius: 9px; color: white; background: var(--red); font-size: 11px; }
|
||||||
|
|
||||||
.panel { display: none; padding-top: 22px; }
|
.panel { display: none; padding-top: 22px; }
|
||||||
.panel.active { display: block; animation: reveal 180ms ease-out; }
|
.panel.active { display: block; animation: reveal 180ms ease-out; }
|
||||||
@@ -189,26 +190,24 @@ input:focus, select:focus, textarea:focus { border-color: var(--green); box-shad
|
|||||||
.segmented { display: flex; padding: 3px; background: #dfe5e1; border: 1px solid #c6d0ca; border-radius: 4px; }
|
.segmented { display: flex; padding: 3px; background: #dfe5e1; border: 1px solid #c6d0ca; border-radius: 4px; }
|
||||||
.segment { height: 34px; padding: 0 16px; border: 0; border-radius: 3px; background: transparent; color: var(--muted); font-weight: 700; }
|
.segment { height: 34px; padding: 0 16px; border: 0; border-radius: 3px; background: transparent; color: var(--muted); font-weight: 700; }
|
||||||
.segment.active { background: white; color: var(--green-dark); box-shadow: 0 1px 3px rgba(21, 37, 31, 0.14); }
|
.segment.active { background: white; color: var(--green-dark); box-shadow: 0 1px 3px rgba(21, 37, 31, 0.14); }
|
||||||
|
.notification-stack { display: grid; gap: 8px; margin: 0 0 16px; }
|
||||||
|
.panel-notification { display: grid; grid-template-columns: minmax(0, 1fr) auto; gap: 16px; align-items: center; padding: 12px 14px; border: 1px solid #d6b362; border-left: 4px solid var(--amber); background: #fff8e6; }
|
||||||
|
.panel-notification[data-type="volume_result_ready"] { border-color: #8ebba5; border-left-color: var(--green); background: #edf8f1; }
|
||||||
|
.panel-notification[data-type="identification_result_ready"] { border-color: #9db6c8; border-left-color: #367294; background: #edf5fa; }
|
||||||
|
.notification-copy { display: grid; gap: 3px; min-width: 0; }
|
||||||
|
.notification-copy strong { font-size: 13px; }
|
||||||
|
.notification-copy span { color: var(--muted); font-size: 12px; overflow-wrap: anywhere; }
|
||||||
|
.notification-actions { display: flex; gap: 8px; }
|
||||||
.editor-layout { display: grid; grid-template-columns: minmax(0, 1fr) 270px; gap: 18px; }
|
.editor-layout { display: grid; grid-template-columns: minmax(0, 1fr) 270px; gap: 18px; }
|
||||||
.editor-column, .publish-aside { background: var(--surface); border: 1px solid var(--line); }
|
.editor-column, .publish-aside { background: var(--surface); border: 1px solid var(--line); }
|
||||||
.editor-toolbar { height: 46px; padding: 0 14px; display: flex; align-items: center; justify-content: space-between; border-bottom: 1px solid var(--line); font-size: 13px; font-weight: 700; }
|
.editor-toolbar { height: 46px; padding: 0 14px; display: flex; align-items: center; justify-content: space-between; border-bottom: 1px solid var(--line); font-size: 13px; font-weight: 700; }
|
||||||
.text-button { border: 0; background: transparent; color: var(--green); font-size: 13px; font-weight: 700; }
|
.text-button { border: 0; background: transparent; color: var(--green); font-size: 13px; font-weight: 700; }
|
||||||
textarea {
|
.config-form { display: grid; gap: 10px; padding: 14px; }
|
||||||
display: block;
|
.config-field { display: grid; grid-template-columns: minmax(160px, 0.42fr) minmax(0, 1fr); align-items: center; gap: 12px; }
|
||||||
width: calc(100% - 28px);
|
.config-field label { color: var(--muted); font: 13px Consolas, monospace; font-weight: 700; }
|
||||||
height: calc(100vh - 385px);
|
.config-field input { width: 100%; }
|
||||||
min-height: 330px;
|
.config-field-error { grid-column: 2; margin: -4px 0 0; color: var(--red); font-size: 12px; }
|
||||||
margin: 14px;
|
.config-field input[aria-invalid="true"] { border-color: var(--red); box-shadow: 0 0 0 2px rgba(173, 52, 45, 0.12); }
|
||||||
padding: 16px;
|
|
||||||
resize: vertical;
|
|
||||||
border: 1px solid #bec9c2;
|
|
||||||
border-radius: 3px;
|
|
||||||
background: #f8faf8;
|
|
||||||
color: #18392d;
|
|
||||||
font: 14px/1.65 Consolas, "Microsoft YaHei UI", monospace;
|
|
||||||
tab-size: 2;
|
|
||||||
outline: none;
|
|
||||||
}
|
|
||||||
.editor-column > .file-path { padding: 0 14px 12px; }
|
.editor-column > .file-path { padding: 0 14px 12px; }
|
||||||
.publish-aside { padding: 20px; align-self: start; }
|
.publish-aside { padding: 20px; align-self: start; }
|
||||||
.publish-aside h3 { padding-bottom: 14px; border-bottom: 1px solid var(--line); }
|
.publish-aside h3 { padding-bottom: 14px; border-bottom: 1px solid var(--line); }
|
||||||
|
|||||||
@@ -98,8 +98,28 @@ CREATE TABLE IF NOT EXISTS volume_config_requests (
|
|||||||
PRIMARY KEY (device_id, request_id)
|
PRIMARY KEY (device_id, request_id)
|
||||||
);
|
);
|
||||||
|
|
||||||
|
CREATE TABLE IF NOT EXISTS volume_configs (
|
||||||
|
device_id TEXT PRIMARY KEY,
|
||||||
|
file_id TEXT NOT NULL,
|
||||||
|
file_name TEXT NOT NULL,
|
||||||
|
request_id TEXT NOT NULL,
|
||||||
|
updated_at_ms BIGINT NOT NULL
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE TABLE IF NOT EXISTS panel_notifications (
|
||||||
|
notification_id TEXT PRIMARY KEY,
|
||||||
|
device_id TEXT NOT NULL,
|
||||||
|
type TEXT NOT NULL,
|
||||||
|
title TEXT NOT NULL,
|
||||||
|
message TEXT NOT NULL,
|
||||||
|
request_id TEXT,
|
||||||
|
file_id TEXT,
|
||||||
|
created_at_ms BIGINT NOT NULL
|
||||||
|
);
|
||||||
|
|
||||||
CREATE INDEX IF NOT EXISTS licenses_status_device_expiry_idx ON licenses (status, device_id, expiry_at);
|
CREATE INDEX IF NOT EXISTS licenses_status_device_expiry_idx ON licenses (status, device_id, expiry_at);
|
||||||
CREATE INDEX IF NOT EXISTS file_records_folder_idx ON file_records (folder);
|
CREATE INDEX IF NOT EXISTS file_records_folder_idx ON file_records (folder);
|
||||||
CREATE INDEX IF NOT EXISTS identification_files_device_upload_idx ON identification_files (device_id, upload_time DESC);
|
CREATE INDEX IF NOT EXISTS identification_files_device_upload_idx ON identification_files (device_id, upload_time DESC);
|
||||||
CREATE INDEX IF NOT EXISTS identification_files_expires_idx ON identification_files (expires_at) WHERE expires_at IS NOT NULL;
|
CREATE INDEX IF NOT EXISTS identification_files_expires_idx ON identification_files (expires_at) WHERE expires_at IS NOT NULL;
|
||||||
CREATE INDEX IF NOT EXISTS identification_feedback_device_idx ON identification_feedback (device_id);
|
CREATE INDEX IF NOT EXISTS identification_feedback_device_idx ON identification_feedback (device_id);
|
||||||
|
CREATE INDEX IF NOT EXISTS panel_notifications_device_created_idx ON panel_notifications (device_id, created_at_ms);
|
||||||
+92
-7
@@ -318,6 +318,8 @@ function createApp({
|
|||||||
database.fileRecords = database.fileRecords.filter((record) => record.fileID !== fileID);
|
database.fileRecords = database.fileRecords.filter((record) => record.fileID !== fileID);
|
||||||
database.panelInbox = database.panelInbox.filter((record) => record.fileID !== fileID);
|
database.panelInbox = database.panelInbox.filter((record) => record.fileID !== fileID);
|
||||||
database.identificationFiles = database.identificationFiles.filter((record) => record.fileID !== fileID);
|
database.identificationFiles = database.identificationFiles.filter((record) => record.fileID !== fileID);
|
||||||
|
database.volumeConfigs = database.volumeConfigs.filter((record) => record.fileID !== fileID);
|
||||||
|
database.panelNotifications = database.panelNotifications.filter((record) => record.fileID !== fileID);
|
||||||
return before - database.fileRecords.length;
|
return before - database.fileRecords.length;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -341,6 +343,21 @@ function createApp({
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function addPanelNotification(database, { deviceId, type, title, message, requestId = null, fileID = null }) {
|
||||||
|
const notification = {
|
||||||
|
notificationId: store.createId("pn"),
|
||||||
|
deviceId,
|
||||||
|
type,
|
||||||
|
title,
|
||||||
|
message,
|
||||||
|
requestId,
|
||||||
|
fileID,
|
||||||
|
createdAtMs: Date.now()
|
||||||
|
};
|
||||||
|
database.panelNotifications.push(notification);
|
||||||
|
return notification;
|
||||||
|
}
|
||||||
|
|
||||||
async function purgeExpiredIdentificationFiles() {
|
async function purgeExpiredIdentificationFiles() {
|
||||||
return store.update(async (database) => {
|
return store.update(async (database) => {
|
||||||
backfillIdentificationFiles(database);
|
backfillIdentificationFiles(database);
|
||||||
@@ -623,13 +640,19 @@ function createApp({
|
|||||||
return { ...result, parameters: event.parameters };
|
return { ...result, parameters: event.parameters };
|
||||||
}
|
}
|
||||||
case "getVolumeConfigFile": {
|
case "getVolumeConfigFile": {
|
||||||
const folder = process.env.VOLUME_CONFIG_FOLDER || "volume_config";
|
const authError = requireAdmin(event);
|
||||||
const fileID = `local://${BASE_FOLDER}/${folder}/volume_config.json`;
|
if (authError) return { success: false, errMsg: authError };
|
||||||
|
const deviceId = normalizeDeviceId(event.deviceId);
|
||||||
const database = await store.read();
|
const database = await store.read();
|
||||||
if (!database.fileRecords.some((record) => record.fileID === fileID)) {
|
const config = database.volumeConfigs.find((item) => item.deviceId === deviceId);
|
||||||
return { success: false, notFound: true, errMsg: "容积配置文件尚未发布" };
|
if (!config) return { success: true, found: false, deviceId };
|
||||||
}
|
const record = database.fileRecords.find((item) => item.fileID === config.fileID);
|
||||||
return { success: true, fileID, cloudPath: `${BASE_FOLDER}/${folder}/volume_config.json`, url: downloadUrl(req, fileID) };
|
if (!record) return { success: true, found: false, deviceId };
|
||||||
|
return {
|
||||||
|
success: true, found: true, deviceId, fileID: record.fileID,
|
||||||
|
fileName: record.fileName, url: downloadUrl(req, record.fileID),
|
||||||
|
updatedAtMs: config.updatedAtMs, requestId: config.requestId
|
||||||
|
};
|
||||||
}
|
}
|
||||||
case "getFunctionConfig": {
|
case "getFunctionConfig": {
|
||||||
if (event.configType !== "volume") return { success: false, errMsg: `未知 configType: ${event.configType}` };
|
if (event.configType !== "volume") return { success: false, errMsg: `未知 configType: ${event.configType}` };
|
||||||
@@ -668,6 +691,33 @@ function createApp({
|
|||||||
url: downloadUrl(req, message.fileID)
|
url: downloadUrl(req, message.fileID)
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
case "getPendingPanelNotification": {
|
||||||
|
const authError = requireAdmin(event);
|
||||||
|
if (authError) return { success: false, errMsg: authError };
|
||||||
|
const deviceId = normalizeDeviceId(event.deviceId);
|
||||||
|
const database = await store.read();
|
||||||
|
const notification = database.panelNotifications.find((item) => item.deviceId === deviceId);
|
||||||
|
return notification
|
||||||
|
? { success: true, pending: true, notification }
|
||||||
|
: { success: true, pending: false };
|
||||||
|
}
|
||||||
|
case "ackPanelNotification": {
|
||||||
|
const authError = requireAdmin(event);
|
||||||
|
if (authError) return { success: false, errMsg: authError };
|
||||||
|
const deviceId = normalizeDeviceId(event.deviceId);
|
||||||
|
const notificationId = String(event.notificationId || "");
|
||||||
|
if (!notificationId) return { success: false, errMsg: "缺少 notificationId" };
|
||||||
|
return store.update((database) => {
|
||||||
|
const exists = database.panelNotifications.some((item) =>
|
||||||
|
item.deviceId === deviceId && item.notificationId === notificationId
|
||||||
|
);
|
||||||
|
if (!exists) return { success: false, errMsg: "Panel 通知不存在" };
|
||||||
|
database.panelNotifications = database.panelNotifications.filter((item) =>
|
||||||
|
!(item.deviceId === deviceId && item.notificationId === notificationId)
|
||||||
|
);
|
||||||
|
return { success: true, notificationId };
|
||||||
|
});
|
||||||
|
}
|
||||||
case "ackPanelFile": {
|
case "ackPanelFile": {
|
||||||
const authError = requireAdmin(event);
|
const authError = requireAdmin(event);
|
||||||
if (authError) return { success: false, errMsg: authError };
|
if (authError) return { success: false, errMsg: authError };
|
||||||
@@ -859,6 +909,13 @@ function createApp({
|
|||||||
const createdAtMs = Date.now();
|
const createdAtMs = Date.now();
|
||||||
const record = { deviceId, requestId: `${createdAtMs}-${randomUUID().slice(0, 10)}`, status: "waiting_upload", createdAtMs, expiresAtMs: createdAtMs + VOLUME_REQUEST_TTL_MS, configFileID: null, configFileName: null, uploadedAtMs: null, updateTime: new Date().toISOString() };
|
const record = { deviceId, requestId: `${createdAtMs}-${randomUUID().slice(0, 10)}`, status: "waiting_upload", createdAtMs, expiresAtMs: createdAtMs + VOLUME_REQUEST_TTL_MS, configFileID: null, configFileName: null, uploadedAtMs: null, updateTime: new Date().toISOString() };
|
||||||
database.volumeConfigRequests.push(record);
|
database.volumeConfigRequests.push(record);
|
||||||
|
addPanelNotification(database, {
|
||||||
|
deviceId,
|
||||||
|
type: "volume_request_started",
|
||||||
|
title: "产线请求容积测试配置",
|
||||||
|
message: "请完成容积测试配置并提交。",
|
||||||
|
requestId: record.requestId
|
||||||
|
});
|
||||||
return { success: true, requestId: record.requestId, createdAtMs, expiresAtMs: record.expiresAtMs };
|
return { success: true, requestId: record.requestId, createdAtMs, expiresAtMs: record.expiresAtMs };
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -890,6 +947,14 @@ function createApp({
|
|||||||
record.configFileName = fileName;
|
record.configFileName = fileName;
|
||||||
record.uploadedAtMs = Date.now();
|
record.uploadedAtMs = Date.now();
|
||||||
record.updateTime = new Date().toISOString();
|
record.updateTime = new Date().toISOString();
|
||||||
|
database.volumeConfigs = database.volumeConfigs.filter((item) => item.deviceId !== deviceId);
|
||||||
|
database.volumeConfigs.push({
|
||||||
|
deviceId,
|
||||||
|
fileID: fileRecord.fileID,
|
||||||
|
fileName: fileRecord.fileName,
|
||||||
|
requestId: record.requestId,
|
||||||
|
updatedAtMs: record.uploadedAtMs
|
||||||
|
});
|
||||||
return { success: true, requestId: record.requestId, uploadedAtMs: record.uploadedAtMs };
|
return { success: true, requestId: record.requestId, uploadedAtMs: record.uploadedAtMs };
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -910,7 +975,10 @@ function createApp({
|
|||||||
if (!event.requestId) return { success: false, errMsg: "缺少 deviceId 或 requestId" };
|
if (!event.requestId) return { success: false, errMsg: "缺少 deviceId 或 requestId" };
|
||||||
return store.update(async (database) => {
|
return store.update(async (database) => {
|
||||||
const records = database.volumeConfigRequests.filter((item) => item.deviceId === deviceId && item.requestId === String(event.requestId));
|
const records = database.volumeConfigRequests.filter((item) => item.deviceId === deviceId && item.requestId === String(event.requestId));
|
||||||
for (const record of records) if (record.configFileID) await removeFile(database, record.configFileID);
|
for (const record of records) {
|
||||||
|
const isLatest = database.volumeConfigs.some((item) => item.fileID === record.configFileID);
|
||||||
|
if (record.configFileID && !isLatest) await removeFile(database, record.configFileID);
|
||||||
|
}
|
||||||
database.volumeConfigRequests = database.volumeConfigRequests.filter((item) => !records.includes(item));
|
database.volumeConfigRequests = database.volumeConfigRequests.filter((item) => !records.includes(item));
|
||||||
return { success: true, deleted: records.length };
|
return { success: true, deleted: records.length };
|
||||||
});
|
});
|
||||||
@@ -955,6 +1023,23 @@ function createApp({
|
|||||||
processedAt: null,
|
processedAt: null,
|
||||||
expiresAt: null
|
expiresAt: null
|
||||||
});
|
});
|
||||||
|
addPanelNotification(database, {
|
||||||
|
deviceId,
|
||||||
|
type: "identification_result_ready",
|
||||||
|
title: "系统辨识结果已返回",
|
||||||
|
message: "新的系统辨识 CSV 或 JSON 数据已进入暂存。",
|
||||||
|
fileID: pending.fileID
|
||||||
|
});
|
||||||
|
}
|
||||||
|
if (folderParts.at(-1) === "V_config" && extension === ".json") {
|
||||||
|
const deviceId = normalizeDeviceId(folderParts.slice(0, -1).join("/"));
|
||||||
|
addPanelNotification(database, {
|
||||||
|
deviceId,
|
||||||
|
type: "volume_result_ready",
|
||||||
|
title: "容积测试结果已返回",
|
||||||
|
message: "容积测试结果 JSON 已上传,可打开查看。",
|
||||||
|
fileID: pending.fileID
|
||||||
|
});
|
||||||
}
|
}
|
||||||
if (pending.configType && pending.parameters) {
|
if (pending.configType && pending.parameters) {
|
||||||
const config = {
|
const config = {
|
||||||
|
|||||||
@@ -41,6 +41,8 @@ class PostgresStore {
|
|||||||
const identificationFiles = await queryable.query("SELECT file_id, device_id, file_name, media_type, upload_time, size_bytes, status, processed_at, expires_at FROM identification_files");
|
const identificationFiles = await queryable.query("SELECT file_id, device_id, file_name, media_type, upload_time, size_bytes, status, processed_at, expires_at FROM identification_files");
|
||||||
const feedback = await queryable.query("SELECT device_id, run_id, file_name, status, result, update_time FROM identification_feedback");
|
const feedback = await queryable.query("SELECT device_id, run_id, file_name, status, result, update_time FROM identification_feedback");
|
||||||
const requests = await queryable.query("SELECT device_id, request_id, status, created_at_ms, expires_at_ms, config_file_id, config_file_name, uploaded_at_ms, update_time FROM volume_config_requests");
|
const requests = await queryable.query("SELECT device_id, request_id, status, created_at_ms, expires_at_ms, config_file_id, config_file_name, uploaded_at_ms, update_time FROM volume_config_requests");
|
||||||
|
const volumeConfigs = await queryable.query("SELECT device_id, file_id, file_name, request_id, updated_at_ms FROM volume_configs");
|
||||||
|
const panelNotifications = await queryable.query("SELECT notification_id, device_id, type, title, message, request_id, file_id, created_at_ms FROM panel_notifications");
|
||||||
return {
|
return {
|
||||||
...structuredClone(EMPTY_DATABASE),
|
...structuredClone(EMPTY_DATABASE),
|
||||||
companies: companies.rows.map((row) => ({ id: row.id, name: row.name, code: row.code, createdAt: asIso(row.created_at) })),
|
companies: companies.rows.map((row) => ({ id: row.id, name: row.name, code: row.code, createdAt: asIso(row.created_at) })),
|
||||||
@@ -51,7 +53,9 @@ class PostgresStore {
|
|||||||
panelInbox: panelInbox.rows.map((row) => ({ fileID: row.file_id, deviceId: row.device_id, fileName: row.file_name, mediaType: row.media_type, uploadTime: asIso(row.upload_time) })),
|
panelInbox: panelInbox.rows.map((row) => ({ fileID: row.file_id, deviceId: row.device_id, fileName: row.file_name, mediaType: row.media_type, uploadTime: asIso(row.upload_time) })),
|
||||||
identificationFiles: identificationFiles.rows.map((row) => ({ fileID: row.file_id, deviceId: row.device_id, fileName: row.file_name, mediaType: row.media_type, uploadTime: asIso(row.upload_time), size: Number(row.size_bytes), status: row.status, processedAt: row.processed_at && asIso(row.processed_at), expiresAt: row.expires_at && asIso(row.expires_at) })),
|
identificationFiles: identificationFiles.rows.map((row) => ({ fileID: row.file_id, deviceId: row.device_id, fileName: row.file_name, mediaType: row.media_type, uploadTime: asIso(row.upload_time), size: Number(row.size_bytes), status: row.status, processedAt: row.processed_at && asIso(row.processed_at), expiresAt: row.expires_at && asIso(row.expires_at) })),
|
||||||
identificationFeedback: feedback.rows.map((row) => ({ deviceId: row.device_id, runId: row.run_id, fileName: row.file_name, status: row.status, result: row.result, updateTime: asIso(row.update_time) })),
|
identificationFeedback: feedback.rows.map((row) => ({ deviceId: row.device_id, runId: row.run_id, fileName: row.file_name, status: row.status, result: row.result, updateTime: asIso(row.update_time) })),
|
||||||
volumeConfigRequests: requests.rows.map((row) => ({ deviceId: row.device_id, requestId: row.request_id, status: row.status, createdAtMs: Number(row.created_at_ms), expiresAtMs: Number(row.expires_at_ms), configFileID: row.config_file_id, configFileName: row.config_file_name, uploadedAtMs: row.uploaded_at_ms && Number(row.uploaded_at_ms), updateTime: asIso(row.update_time) }))
|
volumeConfigRequests: requests.rows.map((row) => ({ deviceId: row.device_id, requestId: row.request_id, status: row.status, createdAtMs: Number(row.created_at_ms), expiresAtMs: Number(row.expires_at_ms), configFileID: row.config_file_id, configFileName: row.config_file_name, uploadedAtMs: row.uploaded_at_ms && Number(row.uploaded_at_ms), updateTime: asIso(row.update_time) })),
|
||||||
|
volumeConfigs: volumeConfigs.rows.map((row) => ({ deviceId: row.device_id, fileID: row.file_id, fileName: row.file_name, requestId: row.request_id, updatedAtMs: Number(row.updated_at_ms) })),
|
||||||
|
panelNotifications: panelNotifications.rows.map((row) => ({ notificationId: row.notification_id, deviceId: row.device_id, type: row.type, title: row.title, message: row.message, requestId: row.request_id, fileID: row.file_id, createdAtMs: Number(row.created_at_ms) }))
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -74,7 +78,7 @@ class PostgresStore {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async writeDatabase(client, database) {
|
async writeDatabase(client, database) {
|
||||||
await client.query("DELETE FROM volume_config_requests; DELETE FROM identification_feedback; DELETE FROM panel_inbox; DELETE FROM identification_files; DELETE FROM function_configs; DELETE FROM file_records; DELETE FROM licenses; DELETE FROM production_lines; DELETE FROM companies;");
|
await client.query("DELETE FROM panel_notifications; DELETE FROM volume_configs; DELETE FROM volume_config_requests; DELETE FROM identification_feedback; DELETE FROM panel_inbox; DELETE FROM identification_files; DELETE FROM function_configs; DELETE FROM file_records; DELETE FROM licenses; DELETE FROM production_lines; DELETE FROM companies;");
|
||||||
for (const item of database.companies) await client.query("INSERT INTO companies (id, name, code, created_at) VALUES ($1, $2, $3, $4)", [item.id, item.name, item.code, item.createdAt]);
|
for (const item of database.companies) await client.query("INSERT INTO companies (id, name, code, created_at) VALUES ($1, $2, $3, $4)", [item.id, item.name, item.code, item.createdAt]);
|
||||||
for (const item of database.productionLines) await client.query("INSERT INTO production_lines (id, company_id, name, code, device_id, created_at, last_seen_at) VALUES ($1, $2, $3, $4, $5, $6, $7)", [item.id, item.companyId, item.name, item.code, item.deviceId, item.createdAt, item.lastSeenAt]);
|
for (const item of database.productionLines) await client.query("INSERT INTO production_lines (id, company_id, name, code, device_id, created_at, last_seen_at) VALUES ($1, $2, $3, $4, $5, $6, $7)", [item.id, item.companyId, item.name, item.code, item.deviceId, item.createdAt, item.lastSeenAt]);
|
||||||
for (const item of database.licenses) await client.query("INSERT INTO licenses (license_id, company_id, production_line_id, device_id, customer, issued_at, expiry_at, features, license, status, created_at, revoked_at, revocation_reason) VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13)", [item.licenseId, item.companyId, item.productionLineId, item.deviceId, item.customer, item.issuedAt, item.expiryAt, item.features, item.license, item.status, item.createdAt, item.revokedAt, item.revocationReason]);
|
for (const item of database.licenses) await client.query("INSERT INTO licenses (license_id, company_id, production_line_id, device_id, customer, issued_at, expiry_at, features, license, status, created_at, revoked_at, revocation_reason) VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13)", [item.licenseId, item.companyId, item.productionLineId, item.deviceId, item.customer, item.issuedAt, item.expiryAt, item.features, item.license, item.status, item.createdAt, item.revokedAt, item.revocationReason]);
|
||||||
@@ -84,6 +88,8 @@ class PostgresStore {
|
|||||||
for (const item of database.identificationFiles) await client.query("INSERT INTO identification_files (file_id, device_id, file_name, media_type, upload_time, size_bytes, status, processed_at, expires_at) VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9)", [item.fileID, item.deviceId, item.fileName, item.mediaType, item.uploadTime, item.size, item.status, item.processedAt, item.expiresAt]);
|
for (const item of database.identificationFiles) await client.query("INSERT INTO identification_files (file_id, device_id, file_name, media_type, upload_time, size_bytes, status, processed_at, expires_at) VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9)", [item.fileID, item.deviceId, item.fileName, item.mediaType, item.uploadTime, item.size, item.status, item.processedAt, item.expiresAt]);
|
||||||
for (const item of database.identificationFeedback) await client.query("INSERT INTO identification_feedback (device_id, run_id, file_name, status, result, update_time) VALUES ($1,$2,$3,$4,$5,$6)", [item.deviceId, item.runId, item.fileName, item.status, item.result, item.updateTime]);
|
for (const item of database.identificationFeedback) await client.query("INSERT INTO identification_feedback (device_id, run_id, file_name, status, result, update_time) VALUES ($1,$2,$3,$4,$5,$6)", [item.deviceId, item.runId, item.fileName, item.status, item.result, item.updateTime]);
|
||||||
for (const item of database.volumeConfigRequests) await client.query("INSERT INTO volume_config_requests (device_id, request_id, status, created_at_ms, expires_at_ms, config_file_id, config_file_name, uploaded_at_ms, update_time) VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9)", [item.deviceId, item.requestId, item.status, item.createdAtMs, item.expiresAtMs, item.configFileID, item.configFileName, item.uploadedAtMs, item.updateTime]);
|
for (const item of database.volumeConfigRequests) await client.query("INSERT INTO volume_config_requests (device_id, request_id, status, created_at_ms, expires_at_ms, config_file_id, config_file_name, uploaded_at_ms, update_time) VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9)", [item.deviceId, item.requestId, item.status, item.createdAtMs, item.expiresAtMs, item.configFileID, item.configFileName, item.uploadedAtMs, item.updateTime]);
|
||||||
|
for (const item of database.volumeConfigs) await client.query("INSERT INTO volume_configs (device_id, file_id, file_name, request_id, updated_at_ms) VALUES ($1,$2,$3,$4,$5)", [item.deviceId, item.fileID, item.fileName, item.requestId, item.updatedAtMs]);
|
||||||
|
for (const item of database.panelNotifications) await client.query("INSERT INTO panel_notifications (notification_id, device_id, type, title, message, request_id, file_id, created_at_ms) VALUES ($1,$2,$3,$4,$5,$6,$7,$8)", [item.notificationId, item.deviceId, item.type, item.title, item.message, item.requestId, item.fileID, item.createdAtMs]);
|
||||||
}
|
}
|
||||||
|
|
||||||
createId(prefix) {
|
createId(prefix) {
|
||||||
|
|||||||
@@ -9,6 +9,8 @@ const EMPTY_DATABASE = {
|
|||||||
identificationFiles: [],
|
identificationFiles: [],
|
||||||
identificationFeedback: [],
|
identificationFeedback: [],
|
||||||
volumeConfigRequests: [],
|
volumeConfigRequests: [],
|
||||||
|
volumeConfigs: [],
|
||||||
|
panelNotifications: [],
|
||||||
userInfo: [],
|
userInfo: [],
|
||||||
companies: [],
|
companies: [],
|
||||||
productionLines: [],
|
productionLines: [],
|
||||||
|
|||||||
@@ -488,6 +488,65 @@ test("volume request accepts only the file uploaded for that request", async ()
|
|||||||
assert.deepEqual(await (await fetch(ready.url)).json(), { num_runs: 2 });
|
assert.deepEqual(await (await fetch(ready.url)).json(), { num_runs: 2 });
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test("panel notifications and volume configuration stay isolated by device", async () => {
|
||||||
|
const deviceId = "notify-co/line-1";
|
||||||
|
const otherDeviceId = "notify-co/line-2";
|
||||||
|
const request = await post({ type: "createVolumeConfigRequest", deviceId });
|
||||||
|
const notification = await post({
|
||||||
|
type: "getPendingPanelNotification", deviceId, adminToken: "test-token"
|
||||||
|
});
|
||||||
|
assert.equal(notification.pending, true);
|
||||||
|
assert.equal(notification.notification.type, "volume_request_started");
|
||||||
|
assert.equal(notification.notification.requestId, request.requestId);
|
||||||
|
assert.equal((await post({
|
||||||
|
type: "getPendingPanelNotification", deviceId: otherDeviceId, adminToken: "test-token"
|
||||||
|
})).pending, false);
|
||||||
|
|
||||||
|
const folder = `${deviceId}/volume_config_requests/${request.requestId}`;
|
||||||
|
const issued = await post({ type: "uploadDataFile", fileName: "volume_measurement.json", folder });
|
||||||
|
const form = new FormData();
|
||||||
|
form.append("file", new Blob(['{"num_runs":2}'], { type: "application/json" }), "volume_measurement.json");
|
||||||
|
assert.equal((await fetch(issued.uploadMetadata.url, { method: "POST", body: form })).status, 204);
|
||||||
|
assert.equal((await post({
|
||||||
|
type: "submitVolumeConfigFile", deviceId, requestId: request.requestId,
|
||||||
|
fileID: issued.fileID, fileName: "volume_measurement.json"
|
||||||
|
})).success, true);
|
||||||
|
|
||||||
|
const config = await post({ type: "getVolumeConfigFile", deviceId, adminToken: "test-token" });
|
||||||
|
assert.equal(config.found, true);
|
||||||
|
assert.equal(config.fileID, issued.fileID);
|
||||||
|
assert.equal((await post({
|
||||||
|
type: "getVolumeConfigFile", deviceId: otherDeviceId, adminToken: "test-token"
|
||||||
|
})).found, false);
|
||||||
|
assert.equal((await post({
|
||||||
|
type: "ackPanelNotification", deviceId, notificationId: notification.notification.notificationId,
|
||||||
|
adminToken: "test-token"
|
||||||
|
})).success, true);
|
||||||
|
|
||||||
|
async function uploadResult(folderName, fileName, content) {
|
||||||
|
const result = await post({ type: "uploadDataFile", fileName, folder: `${deviceId}/${folderName}` });
|
||||||
|
const uploadForm = new FormData();
|
||||||
|
uploadForm.append("file", new Blob([content]), fileName);
|
||||||
|
assert.equal((await fetch(result.uploadMetadata.url, { method: "POST", body: uploadForm })).status, 204);
|
||||||
|
}
|
||||||
|
await uploadResult("V_config", "volume_result.json", '{"volume_L":1.2}');
|
||||||
|
const volumeResult = await post({
|
||||||
|
type: "getPendingPanelNotification", deviceId, adminToken: "test-token"
|
||||||
|
});
|
||||||
|
assert.equal(volumeResult.notification.type, "volume_result_ready");
|
||||||
|
assert.ok(volumeResult.notification.fileID);
|
||||||
|
await post({
|
||||||
|
type: "ackPanelNotification", deviceId, notificationId: volumeResult.notification.notificationId,
|
||||||
|
adminToken: "test-token"
|
||||||
|
});
|
||||||
|
|
||||||
|
await uploadResult("ind_data", "identification_result.json", '{"stable_pressures":[]}');
|
||||||
|
const identificationResult = await post({
|
||||||
|
type: "getPendingPanelNotification", deviceId, adminToken: "test-token"
|
||||||
|
});
|
||||||
|
assert.equal(identificationResult.notification.type, "identification_result_ready");
|
||||||
|
});
|
||||||
|
|
||||||
test("admin manages companies and production lines with a stable device id", async () => {
|
test("admin manages companies and production lines with a stable device id", async () => {
|
||||||
const unauthorized = await post({
|
const unauthorized = await post({
|
||||||
type: "createCompany", name: "未授权公司", code: "blocked"
|
type: "createCompany", name: "未授权公司", code: "blocked"
|
||||||
|
|||||||
Reference in New Issue
Block a user