前端
- LocalServiceGate 新增 probe 属性(ws / http):/local 查件页用 HTTP 17300 根路径探活,
兼容没有 WebSocket 的老版本软件;ws 用于预览/拉通道/大屏
- LocalServiceView:offline 状态改为弹该组件(启动 / 下载),卡片内只留简短提示 +
「启动 / 下载本机软件」「重新连接」,删除自带的 DOWNLOAD_URL / launch() / launchFailed /
APP_PROTOCOL 文案与 launchApp 依赖
后端
- 团购工作台(ws_type = 2)的 record_max_sec 不再写 before + after 的派生值,统一存 0(不限制)
· web 本来就没有「最大时长」配置项(只有散单有),库里出现 20 + 10 = 30 会被误读成
「被多加 30 秒限制、实际只录 30 秒」
· 团购的录制区间一直是 扫码时间 - before ~ 扫码时间 + after(buildPlan 团购分支不使用 max)
- 迁移 20261020010000-group-workstation-max-zero:把现有团购行 record_max_sec 改为 0,
down 时恢复为 before + after;scan_records.workstation_snapshot 属于历史快照,不动
验证
- 库:1号工作台(团购)20 / 20 / max=0;团购计划区间 = 扫码时间 ±20 = 40 秒
- 单测:pack.test.js 7 passing(含「团购:以扫码时间为基准,前后各留配置的秒数」)
- 前端 vue-tsc 通过
43 lines
2.4 KiB
JavaScript
43 lines
2.4 KiB
JavaScript
'use strict';
|
||
|
||
/**
|
||
* 工作台表模型(workstations)
|
||
*
|
||
* 一个工作台:绑定若干摄像头(workstation_cameras)+ 若干扫码通道(workstation_scan_channels)。
|
||
* `code` 是业务编号(如「1号工作台」),同一用户下唯一。
|
||
*/
|
||
module.exports = (app) => {
|
||
const { BIGINT, STRING, TINYINT, INTEGER } = app.Sequelize;
|
||
|
||
const Workstation = app.model.define('workstation', {
|
||
id: { type: BIGINT.UNSIGNED, primaryKey: true, autoIncrement: true, comment: '主键' },
|
||
subjectId: { type: BIGINT.UNSIGNED, comment: '所属主体 subjects.id' },
|
||
userId: { type: BIGINT.UNSIGNED, comment: '创建人 users.id' },
|
||
code: { type: STRING(64), allowNull: false, comment: '工作台编号' },
|
||
name: { type: STRING(64), allowNull: false, defaultValue: '', comment: '工作台名称' }, /** 1 散单工作台 2 团购工作台 */
|
||
wsType: { type: TINYINT.UNSIGNED, allowNull: false, defaultValue: 1, comment: '工作台类型' },
|
||
|
||
/** 录制范围(团购以扫码时间为基准,散单以任务结束时间为基准) */
|
||
recordBeforeSec: { type: INTEGER.UNSIGNED, allowNull: false, defaultValue: 60, comment: '录制范围:触发点之前秒数' },
|
||
recordAfterSec: { type: INTEGER.UNSIGNED, allowNull: false, defaultValue: 60, comment: '录制范围:触发点之后秒数' },
|
||
recordMaxSec: { type: INTEGER.UNSIGNED, allowNull: false, defaultValue: 240, comment: '最大录制时长(秒);团购无此限制,固定存 0' }, status: { type: TINYINT.UNSIGNED, allowNull: false, defaultValue: 1, comment: '状态:1启用 0停用' },
|
||
remark: { type: STRING(255), comment: '备注' },
|
||
|
||
// ↓ 合成画面画布(默认 1920×1080)
|
||
canvasWidth: { type: INTEGER.UNSIGNED, allowNull: false, defaultValue: 1920, comment: '合成画布宽' },
|
||
canvasHeight: { type: INTEGER.UNSIGNED, allowNull: false, defaultValue: 1080, comment: '合成画布高' },
|
||
}, {
|
||
tableName: 'workstations',
|
||
paranoid: true,
|
||
comment: '工作台表',
|
||
});
|
||
|
||
Workstation.associate = function() {
|
||
app.model.Workstation.belongsTo(app.model.User, { foreignKey: 'user_id', as: 'user' });
|
||
app.model.Workstation.hasMany(app.model.WorkstationCamera, { foreignKey: 'workstation_id', as: 'cameraLinks' });
|
||
app.model.Workstation.hasMany(app.model.WorkstationScanChannel, { foreignKey: 'workstation_id', as: 'scanChannelLinks' });
|
||
};
|
||
|
||
return Workstation;
|
||
};
|