Merge remote-tracking branch 'origin/master'
This commit is contained in:
zjf committed
commit
da549b19aa
243 files changed
+14930
-297
No files matched your search
@@ -61,3 +61,10 @@ gen_code
|
||||
|
||||
### node ###
|
||||
node_modules
|
||||
|
||||
### AI 辅助工具目录 ###
|
||||
.v2c/
|
||||
.video_agent/
|
||||
.mimosa/
|
||||
.cloudbase/
|
||||
.zcode/
|
||||
@@ -0,0 +1,44 @@
|
||||
-- 订单识别证据图片表（迁移自 hq-platform 20260823_add_hard_order_evidence_image.sql）。
|
||||
-- 本表独立于 hard_order，退款、撤销和订单逻辑删除均不自动清理证据文件或证据记录。
|
||||
CREATE TABLE IF NOT EXISTS `pjcloudx_hardware`.`hard_order_evidence_image`
|
||||
(
|
||||
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '证据记录自增主键',
|
||||
`order_id` bigint(20) NOT NULL COMMENT '订单主键，来源hard_order.id',
|
||||
`android_order_code` varchar(128) NOT NULL COMMENT '终端本地稳定订单号快照',
|
||||
`evidence_type` varchar(32) NOT NULL COMMENT '证据类型，FACE_RECOGNITION或MENU_RECOGNITION',
|
||||
`evidence_role` varchar(32) NOT NULL COMMENT '图片角色，FACE_REFERENCE、FACE_LIVE或MENU_LIVE',
|
||||
`sequence_no` int(11) NOT NULL DEFAULT 0 COMMENT '同类型同角色图片序号，从0开始',
|
||||
`user_id` bigint(20) DEFAULT NULL COMMENT '识别用户主键快照',
|
||||
`face_sample_id` varchar(64) DEFAULT NULL COMMENT '虹软人脸样本编号快照',
|
||||
`reference_image_url` varchar(512) DEFAULT NULL COMMENT '识别时后台参考人脸来源地址快照，不作为展示地址',
|
||||
`similarity` decimal(8, 6) DEFAULT NULL COMMENT '识别相似度快照，取值0至1',
|
||||
`similarity_threshold` decimal(8, 6) DEFAULT NULL COMMENT '终端生效的相似度阈值快照，取值0至1',
|
||||
`hard_id` bigint(20) NOT NULL COMMENT '产生证据的设备主键',
|
||||
`captured_at` datetime DEFAULT NULL COMMENT '终端实际采集时间',
|
||||
`sys_file_id` bigint(20) DEFAULT NULL COMMENT '文件中心sys_file记录主键',
|
||||
`storage_file_name` varchar(255) DEFAULT NULL COMMENT '文件中心对象名',
|
||||
`image_url` varchar(512) DEFAULT NULL COMMENT '订单证据图片访问地址',
|
||||
`image_hash` char(64) DEFAULT NULL COMMENT '实际文件SHA-256哈希',
|
||||
`image_size` bigint(20) DEFAULT NULL COMMENT '实际文件大小，单位字节',
|
||||
`image_width` int(11) DEFAULT NULL COMMENT '实际图片宽度，单位像素',
|
||||
`image_height` int(11) DEFAULT NULL COMMENT '实际图片高度，单位像素',
|
||||
`status` varchar(32) NOT NULL COMMENT '证据状态，PENDING、AVAILABLE或UNAVAILABLE',
|
||||
`failure_reason` varchar(500) DEFAULT NULL COMMENT '永久缺失或复制失败摘要，不保存终端完整路径',
|
||||
`app_version` varchar(64) DEFAULT NULL COMMENT '产生证据的终端应用版本',
|
||||
`create_by` varchar(64) DEFAULT NULL COMMENT '创建人',
|
||||
`create_time` datetime DEFAULT NULL COMMENT '创建时间',
|
||||
`update_by` varchar(64) DEFAULT NULL COMMENT '修改人',
|
||||
`update_time` datetime DEFAULT NULL COMMENT '修改时间',
|
||||
`del_flag` char(1) DEFAULT '0' COMMENT '逻辑删除标记，0有效，1删除',
|
||||
`tenant_id` bigint(20) NOT NULL COMMENT '租户主键',
|
||||
PRIMARY KEY (`id`),
|
||||
UNIQUE KEY `uk_hard_order_evidence_position`
|
||||
(`tenant_id`, `order_id`, `evidence_type`, `evidence_role`, `sequence_no`, `del_flag`),
|
||||
KEY `idx_hard_order_evidence_android_order`
|
||||
(`tenant_id`, `hard_id`, `android_order_code`, `del_flag`),
|
||||
KEY `idx_hard_order_evidence_status`
|
||||
(`tenant_id`, `status`, `update_time`, `del_flag`)
|
||||
) ENGINE = InnoDB
|
||||
DEFAULT CHARSET = utf8mb4
|
||||
COLLATE = utf8mb4_general_ci
|
||||
COMMENT = '硬件订单识别证据图片';
|
||||
@@ -0,0 +1,23 @@
|
||||
-- 硬件订单新增独立核销时间（迁移自 hq-platform 20260823_add_hard_order_verification_time.sql）。
|
||||
-- 历史二维码核销订单只能使用最后更新时间近似回填；外卖等非核销完成状态不参与回填。
|
||||
-- 新核销订单由业务事务写入准确时间，后续订单更新不再改变该值。
|
||||
|
||||
SET @verification_time_ddl = IF(
|
||||
(SELECT COUNT(*) FROM `information_schema`.`columns`
|
||||
WHERE `table_schema` = 'pjcloudx_hardware' AND `table_name` = 'hard_order'
|
||||
AND `column_name` = 'verification_time') = 0,
|
||||
'ALTER TABLE `pjcloudx_hardware`.`hard_order` ADD COLUMN `verification_time` datetime DEFAULT NULL COMMENT ''订单实际核销完成时间，后续订单更新不得覆盖'' AFTER `refund_status`, ADD KEY `idx_hard_order_verification_time` (`tenant_id`, `verification_time`, `del_flag`)',
|
||||
'SELECT 1'
|
||||
);
|
||||
PREPARE verification_time_stmt FROM @verification_time_ddl;
|
||||
EXECUTE verification_time_stmt;
|
||||
DEALLOCATE PREPARE verification_time_stmt;
|
||||
|
||||
UPDATE `pjcloudx_hardware`.`hard_order`
|
||||
SET `verification_time` = `update_time`
|
||||
WHERE ((`order_status` = '20' AND `order_type` IN ('1', '2', '3', '4'))
|
||||
OR `pay_type` IN ('5', '6', '50'))
|
||||
AND `verification_time` IS NULL
|
||||
AND `update_time` IS NOT NULL;
|
||||
|
||||
SET @verification_time_ddl = NULL;
|
||||
@@ -0,0 +1,206 @@
|
||||
-- 尔印独立打印终端、终端一对一绑定及持久化打印任务（迁移自 hq-platform 20260904_add_er_yin_printer.sql，仅保留 DDL）。
|
||||
-- 字典（hard_type 类型12、hard_print_type、hard_print_status）与按钮权限请按 db/20260908_权限菜单字典待添加.txt 手动添加。
|
||||
-- 每个结构变更独立判断，可在兼容数据库自动提交部分DDL后安全重跑整个脚本。
|
||||
|
||||
ALTER TABLE `pjcloudx_hardware`.`hard_invoice`
|
||||
MODIFY COLUMN `hard_id` bigint(20) NULL COMMENT '来源业务或核销终端id',
|
||||
MODIFY COLUMN `pic` varchar(512) NULL COMMENT '后端生成的打印PNG地址';
|
||||
|
||||
SET @er_yin_ddl = IF(
|
||||
(SELECT COUNT(*) FROM `information_schema`.`columns`
|
||||
WHERE `table_schema` = 'pjcloudx_hardware' AND `table_name` = 'hard_invoice'
|
||||
AND `column_name` = 'printer_hard_id') = 0,
|
||||
'ALTER TABLE `pjcloudx_hardware`.`hard_invoice` ADD COLUMN `printer_hard_id` bigint(20) NULL COMMENT ''目标尔印打印终端id'' AFTER `hard_id`',
|
||||
'SELECT 1'
|
||||
);
|
||||
PREPARE er_yin_stmt FROM @er_yin_ddl;
|
||||
EXECUTE er_yin_stmt;
|
||||
DEALLOCATE PREPARE er_yin_stmt;
|
||||
|
||||
SET @er_yin_ddl = IF(
|
||||
(SELECT COUNT(*) FROM `information_schema`.`columns`
|
||||
WHERE `table_schema` = 'pjcloudx_hardware' AND `table_name` = 'hard_invoice'
|
||||
AND `column_name` = 'print_type') = 0,
|
||||
'ALTER TABLE `pjcloudx_hardware`.`hard_invoice` ADD COLUMN `print_type` char(2) NOT NULL DEFAULT ''1'' COMMENT ''打印类型，1发票、2兑换券'' AFTER `order_id`',
|
||||
'SELECT 1'
|
||||
);
|
||||
PREPARE er_yin_stmt FROM @er_yin_ddl;
|
||||
EXECUTE er_yin_stmt;
|
||||
DEALLOCATE PREPARE er_yin_stmt;
|
||||
|
||||
SET @er_yin_ddl = IF(
|
||||
(SELECT COUNT(*) FROM `information_schema`.`columns`
|
||||
WHERE `table_schema` = 'pjcloudx_hardware' AND `table_name` = 'hard_invoice'
|
||||
AND `column_name` = 'print_no') = 0,
|
||||
'ALTER TABLE `pjcloudx_hardware`.`hard_invoice` ADD COLUMN `print_no` int(11) NOT NULL DEFAULT 1 COMMENT ''同订单同类型打印序号'' AFTER `print_type`',
|
||||
'SELECT 1'
|
||||
);
|
||||
PREPARE er_yin_stmt FROM @er_yin_ddl;
|
||||
EXECUTE er_yin_stmt;
|
||||
DEALLOCATE PREPARE er_yin_stmt;
|
||||
|
||||
SET @er_yin_ddl = IF(
|
||||
(SELECT COUNT(*) FROM `information_schema`.`columns`
|
||||
WHERE `table_schema` = 'pjcloudx_hardware' AND `table_name` = 'hard_invoice'
|
||||
AND `column_name` = 'retry_version') = 0,
|
||||
'ALTER TABLE `pjcloudx_hardware`.`hard_invoice` ADD COLUMN `retry_version` int(11) NOT NULL DEFAULT 0 COMMENT ''人工失败重试版本'' AFTER `print_no`',
|
||||
'SELECT 1'
|
||||
);
|
||||
PREPARE er_yin_stmt FROM @er_yin_ddl;
|
||||
EXECUTE er_yin_stmt;
|
||||
DEALLOCATE PREPARE er_yin_stmt;
|
||||
|
||||
SET @er_yin_ddl = IF(
|
||||
(SELECT COUNT(*) FROM `information_schema`.`columns`
|
||||
WHERE `table_schema` = 'pjcloudx_hardware' AND `table_name` = 'hard_invoice'
|
||||
AND `column_name` = 'attempt_count') = 0,
|
||||
'ALTER TABLE `pjcloudx_hardware`.`hard_invoice` ADD COLUMN `attempt_count` int(11) NOT NULL DEFAULT 0 COMMENT ''终端USB累计尝试次数'' AFTER `retry_version`',
|
||||
'SELECT 1'
|
||||
);
|
||||
PREPARE er_yin_stmt FROM @er_yin_ddl;
|
||||
EXECUTE er_yin_stmt;
|
||||
DEALLOCATE PREPARE er_yin_stmt;
|
||||
|
||||
SET @er_yin_ddl = IF(
|
||||
(SELECT COUNT(*) FROM `information_schema`.`columns`
|
||||
WHERE `table_schema` = 'pjcloudx_hardware' AND `table_name` = 'hard_invoice'
|
||||
AND `column_name` = 'failure_stage') = 0,
|
||||
'ALTER TABLE `pjcloudx_hardware`.`hard_invoice` ADD COLUMN `failure_stage` varchar(32) NULL COMMENT ''BINDING、IMAGE_GENERATION、MQTT_DISPATCH或TERMINAL_PRINT'' AFTER `status`',
|
||||
'SELECT 1'
|
||||
);
|
||||
PREPARE er_yin_stmt FROM @er_yin_ddl;
|
||||
EXECUTE er_yin_stmt;
|
||||
DEALLOCATE PREPARE er_yin_stmt;
|
||||
|
||||
SET @er_yin_ddl = IF(
|
||||
(SELECT COUNT(*) FROM `information_schema`.`columns`
|
||||
WHERE `table_schema` = 'pjcloudx_hardware' AND `table_name` = 'hard_invoice'
|
||||
AND `column_name` = 'last_error') = 0,
|
||||
'ALTER TABLE `pjcloudx_hardware`.`hard_invoice` ADD COLUMN `last_error` varchar(2000) NULL COMMENT ''最近失败摘要'' AFTER `failure_stage`',
|
||||
'SELECT 1'
|
||||
);
|
||||
PREPARE er_yin_stmt FROM @er_yin_ddl;
|
||||
EXECUTE er_yin_stmt;
|
||||
DEALLOCATE PREPARE er_yin_stmt;
|
||||
|
||||
SET @er_yin_ddl = IF(
|
||||
(SELECT COUNT(*) FROM `information_schema`.`columns`
|
||||
WHERE `table_schema` = 'pjcloudx_hardware' AND `table_name` = 'hard_invoice'
|
||||
AND `column_name` = 'printed_at') = 0,
|
||||
'ALTER TABLE `pjcloudx_hardware`.`hard_invoice` ADD COLUMN `printed_at` datetime NULL COMMENT ''终端确认完整USB数据和切纸命令写入成功时间'' AFTER `last_error`',
|
||||
'SELECT 1'
|
||||
);
|
||||
PREPARE er_yin_stmt FROM @er_yin_ddl;
|
||||
EXECUTE er_yin_stmt;
|
||||
DEALLOCATE PREPARE er_yin_stmt;
|
||||
|
||||
SET @er_yin_ddl = IF(
|
||||
(SELECT COUNT(*) FROM `information_schema`.`columns`
|
||||
WHERE `table_schema` = 'pjcloudx_hardware' AND `table_name` = 'hard_invoice'
|
||||
AND `column_name` = 'reprint_reason') = 0,
|
||||
'ALTER TABLE `pjcloudx_hardware`.`hard_invoice` ADD COLUMN `reprint_reason` varchar(500) NULL COMMENT ''人工重打或再次核销原因'' AFTER `printed_at`',
|
||||
'SELECT 1'
|
||||
);
|
||||
PREPARE er_yin_stmt FROM @er_yin_ddl;
|
||||
EXECUTE er_yin_stmt;
|
||||
DEALLOCATE PREPARE er_yin_stmt;
|
||||
|
||||
-- 唯一索引尚未建立才回填历史发票，避免迁移完成后重跑时覆盖新产生的兑换券任务。
|
||||
SET @er_yin_ddl = IF(
|
||||
(SELECT COUNT(*) FROM `information_schema`.`statistics`
|
||||
WHERE `table_schema` = 'pjcloudx_hardware' AND `table_name` = 'hard_invoice'
|
||||
AND `index_name` = 'uk_hard_invoice_order_type_no') = 0,
|
||||
'UPDATE `pjcloudx_hardware`.`hard_invoice` invoice
|
||||
JOIN (
|
||||
SELECT ranked.`id`, ranked.`print_no`
|
||||
FROM (
|
||||
SELECT `id`, ROW_NUMBER() OVER (
|
||||
PARTITION BY `tenant_id`, `order_id`
|
||||
ORDER BY `create_time`, `id`
|
||||
) AS `print_no`
|
||||
FROM `pjcloudx_hardware`.`hard_invoice`
|
||||
) ranked
|
||||
) ranked_rows ON ranked_rows.`id` = invoice.`id`
|
||||
SET invoice.`print_type` = ''1'',
|
||||
invoice.`print_no` = ranked_rows.`print_no`,
|
||||
invoice.`retry_version` = 0,
|
||||
invoice.`attempt_count` = 0',
|
||||
'SELECT 1'
|
||||
);
|
||||
PREPARE er_yin_stmt FROM @er_yin_ddl;
|
||||
EXECUTE er_yin_stmt;
|
||||
DEALLOCATE PREPARE er_yin_stmt;
|
||||
|
||||
SET @er_yin_ddl = IF(
|
||||
(SELECT COUNT(*) FROM `information_schema`.`statistics`
|
||||
WHERE `table_schema` = 'pjcloudx_hardware' AND `table_name` = 'hard_invoice'
|
||||
AND `index_name` = 'uk_hard_invoice_order_type_no') = 0,
|
||||
'ALTER TABLE `pjcloudx_hardware`.`hard_invoice` ADD UNIQUE KEY `uk_hard_invoice_order_type_no` (`tenant_id`, `order_id`, `print_type`, `print_no`)',
|
||||
'SELECT 1'
|
||||
);
|
||||
PREPARE er_yin_stmt FROM @er_yin_ddl;
|
||||
EXECUTE er_yin_stmt;
|
||||
DEALLOCATE PREPARE er_yin_stmt;
|
||||
|
||||
SET @er_yin_ddl = IF(
|
||||
(SELECT COUNT(*) FROM `information_schema`.`statistics`
|
||||
WHERE `table_schema` = 'pjcloudx_hardware' AND `table_name` = 'hard_invoice'
|
||||
AND `index_name` = 'idx_hard_invoice_printer_status') = 0,
|
||||
'ALTER TABLE `pjcloudx_hardware`.`hard_invoice` ADD KEY `idx_hard_invoice_printer_status` (`tenant_id`, `printer_hard_id`, `status`, `update_time`, `del_flag`)',
|
||||
'SELECT 1'
|
||||
);
|
||||
PREPARE er_yin_stmt FROM @er_yin_ddl;
|
||||
EXECUTE er_yin_stmt;
|
||||
DEALLOCATE PREPARE er_yin_stmt;
|
||||
|
||||
SET @er_yin_ddl = IF(
|
||||
(SELECT COUNT(*) FROM `information_schema`.`statistics`
|
||||
WHERE `table_schema` = 'pjcloudx_hardware' AND `table_name` = 'hard_invoice'
|
||||
AND `index_name` = 'idx_hard_invoice_source_status') = 0,
|
||||
'ALTER TABLE `pjcloudx_hardware`.`hard_invoice` ADD KEY `idx_hard_invoice_source_status` (`tenant_id`, `hard_id`, `status`, `del_flag`)',
|
||||
'SELECT 1'
|
||||
);
|
||||
PREPARE er_yin_stmt FROM @er_yin_ddl;
|
||||
EXECUTE er_yin_stmt;
|
||||
DEALLOCATE PREPARE er_yin_stmt;
|
||||
|
||||
CREATE TABLE IF NOT EXISTS `pjcloudx_hardware`.`hard_printer_binding`
|
||||
(
|
||||
`id` bigint(20) NOT NULL COMMENT '绑定关系主键',
|
||||
`source_hard_id` bigint(20) NOT NULL COMMENT 'SUPERMARKET或CANTEEN来源业务终端id',
|
||||
`printer_hard_id` bigint(20) NOT NULL COMMENT 'EY_PRINT目标打印终端id',
|
||||
`merchant_id` bigint(20) NOT NULL COMMENT '双方共同所属商户id快照',
|
||||
`dept_id` bigint(20) NOT NULL COMMENT '双方共同所属商户部门id快照',
|
||||
`create_by` varchar(64) DEFAULT NULL COMMENT '创建人',
|
||||
`create_time` datetime DEFAULT NULL COMMENT '创建时间',
|
||||
`update_by` varchar(64) DEFAULT NULL COMMENT '修改人',
|
||||
`update_time` datetime DEFAULT NULL COMMENT '修改时间',
|
||||
`tenant_id` bigint(20) NOT NULL COMMENT '租户ID',
|
||||
PRIMARY KEY (`id`),
|
||||
UNIQUE KEY `uk_hard_printer_binding_source` (`tenant_id`, `source_hard_id`),
|
||||
UNIQUE KEY `uk_hard_printer_binding_printer` (`tenant_id`, `printer_hard_id`),
|
||||
KEY `idx_hard_printer_binding_merchant` (`tenant_id`, `merchant_id`)
|
||||
) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_general_ci
|
||||
COMMENT = '业务终端与尔印打印终端一对一绑定';
|
||||
|
||||
CREATE TABLE IF NOT EXISTS `pjcloudx_hardware`.`hard_printer_config`
|
||||
(
|
||||
`id` bigint(20) NOT NULL COMMENT '配置主键',
|
||||
`printer_hard_id` bigint(20) NOT NULL COMMENT 'EY_PRINT打印终端id',
|
||||
`printer_model` varchar(128) DEFAULT NULL COMMENT '打印机型号',
|
||||
`usb_vendor_id` int(11) DEFAULT NULL COMMENT 'USB Vendor ID十进制值',
|
||||
`usb_product_id` int(11) DEFAULT NULL COMMENT 'USB Product ID十进制值',
|
||||
`paper_width` int(11) NOT NULL DEFAULT 80 COMMENT '纸宽，单位mm，首期固定80',
|
||||
`auto_cut` char(1) NOT NULL DEFAULT '1' COMMENT '自动切刀开关，1开启、0关闭',
|
||||
`image_mode` varchar(16) NOT NULL DEFAULT 'GS_V0' COMMENT '图片指令模式，GS_V0或ESC_STAR',
|
||||
`create_by` varchar(64) DEFAULT NULL COMMENT '创建人',
|
||||
`create_time` datetime DEFAULT NULL COMMENT '创建时间',
|
||||
`update_by` varchar(64) DEFAULT NULL COMMENT '修改人',
|
||||
`update_time` datetime DEFAULT NULL COMMENT '修改时间',
|
||||
`tenant_id` bigint(20) NOT NULL COMMENT '租户ID',
|
||||
PRIMARY KEY (`id`),
|
||||
UNIQUE KEY `uk_hard_printer_config_printer` (`tenant_id`, `printer_hard_id`)
|
||||
) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_general_ci
|
||||
COMMENT = '尔印打印终端USB与ESC/POS配置';
|
||||
|
||||
SET @er_yin_ddl = NULL;
|
||||
@@ -0,0 +1,38 @@
|
||||
-- 终端日志文件表（hq-platform 无独立建表脚本，本 DDL 依据 HardTerminalLogFileEntity 与查询场景编写）。
|
||||
-- 记录 Android 终端上传到文件中心的日志文件索引，同一文件重复上传时累加 upload_count 并更新地址。
|
||||
CREATE TABLE IF NOT EXISTS `pjcloudx_hardware`.`hard_terminal_log_file`
|
||||
(
|
||||
`id` bigint NOT NULL AUTO_INCREMENT COMMENT '编号',
|
||||
`hard_id` bigint NOT NULL COMMENT '设备ID(hard_manager.id)',
|
||||
`hard_name` varchar(128) DEFAULT NULL COMMENT '上传时设备名称快照',
|
||||
`unique_code` varchar(128) DEFAULT NULL COMMENT '上传时设备唯一编号快照',
|
||||
`hard_type` char(10) DEFAULT NULL COMMENT '上传时设备类型快照',
|
||||
`merchant_id` bigint DEFAULT NULL COMMENT '上传时商户ID快照',
|
||||
`dept_id` bigint DEFAULT NULL COMMENT '上传时部门ID快照',
|
||||
`log_date` date NOT NULL COMMENT '日志所属日期',
|
||||
`relative_path` varchar(512) NOT NULL COMMENT '终端日志根目录下的相对路径',
|
||||
`original_name` varchar(255) DEFAULT NULL COMMENT '原日志文件名',
|
||||
`file_size` bigint DEFAULT NULL COMMENT '文件大小(字节)',
|
||||
`file_hash` char(32) DEFAULT NULL COMMENT '文件内容哈希(当前使用MD5)',
|
||||
`file_modified_time` datetime DEFAULT NULL COMMENT '终端本地文件最后修改时间',
|
||||
`sys_file_id` bigint DEFAULT NULL COMMENT '文件中心sys_file记录ID',
|
||||
`storage_file_name` varchar(255) DEFAULT NULL COMMENT 'OSS对象文件名',
|
||||
`storage_url` varchar(512) DEFAULT NULL COMMENT '文件访问相对地址',
|
||||
`app_version` varchar(64) DEFAULT NULL COMMENT '上传时应用版本',
|
||||
`sanitize_version` varchar(64) DEFAULT NULL COMMENT '日志脱敏规则版本',
|
||||
`upload_time` datetime DEFAULT NULL COMMENT '最近成功上传时间',
|
||||
`upload_count` int NOT NULL DEFAULT 1 COMMENT '成功上传次数',
|
||||
`remark` varchar(512) DEFAULT NULL COMMENT '备注',
|
||||
`create_by` varchar(64) DEFAULT NULL COMMENT '创建人',
|
||||
`create_time` datetime DEFAULT NULL COMMENT '创建时间',
|
||||
`update_by` varchar(64) DEFAULT NULL COMMENT '修改人',
|
||||
`update_time` datetime DEFAULT NULL COMMENT '修改时间',
|
||||
`del_flag` char(1) DEFAULT '0' COMMENT '删除标记',
|
||||
`tenant_id` bigint NOT NULL COMMENT '租户ID',
|
||||
PRIMARY KEY (`id`),
|
||||
UNIQUE KEY `uk_hard_terminal_log_position` (`tenant_id`, `hard_id`, `relative_path`, `del_flag`),
|
||||
KEY `idx_hard_terminal_log_date` (`tenant_id`, `hard_id`, `log_date`, `del_flag`),
|
||||
KEY `idx_hard_terminal_log_hash` (`tenant_id`, `file_hash`)
|
||||
) ENGINE = InnoDB
|
||||
DEFAULT CHARSET = utf8mb4
|
||||
COLLATE = utf8mb4_general_ci COMMENT ='终端日志文件';
|
||||
@@ -0,0 +1,25 @@
|
||||
-- 终端心跳状态表（迁移自 hq-platform 20260730_add_hard_terminal_status.sql）。
|
||||
-- 食堂、超市 Android 终端心跳状态。在线状态由服务端按最后心跳时间实时计算，不冗余落库。
|
||||
CREATE TABLE IF NOT EXISTS `pjcloudx_hardware`.`hard_terminal_status` (
|
||||
`hard_id` bigint NOT NULL COMMENT '设备ID，对应hard_manager.id',
|
||||
`last_online_time` datetime NOT NULL COMMENT '服务端最近收到心跳的时间',
|
||||
`heartbeat_scene` varchar(32) NOT NULL COMMENT '最近心跳场景(ONLINE,AUTO_UPDATE)',
|
||||
`disconnect_reason` varchar(128) DEFAULT NULL COMMENT '计划内断开原因，目前用于标记自动更新重启',
|
||||
`apk_version_name` varchar(64) DEFAULT NULL COMMENT '终端上报的APK展示版本号',
|
||||
`apk_version_code` bigint DEFAULT NULL COMMENT '终端上报的APK内部版本码',
|
||||
`system_uptime_seconds` bigint DEFAULT NULL COMMENT 'Android系统本次启动后运行秒数',
|
||||
`app_uptime_seconds` bigint DEFAULT NULL COMMENT '终端App本次进程运行秒数',
|
||||
`network_type` varchar(32) DEFAULT NULL COMMENT '最近心跳使用的网络类型',
|
||||
`available_storage_bytes` bigint DEFAULT NULL COMMENT '应用存储卷最近可用空间，单位字节',
|
||||
`root_status` varchar(16) DEFAULT NULL COMMENT 'Root状态(unknown,available,unavailable)',
|
||||
`device_owner` tinyint(1) DEFAULT NULL COMMENT '当前应用是否为Device Owner',
|
||||
`kiosk_active` tinyint(1) DEFAULT NULL COMMENT '最近心跳时是否处于Kiosk锁定任务模式',
|
||||
`device_status_json` json DEFAULT NULL COMMENT '打印机、电子秤、读卡器、副屏等可选硬件状态快照',
|
||||
`create_by` varchar(64) DEFAULT NULL COMMENT '创建人',
|
||||
`create_time` datetime NOT NULL COMMENT '创建时间',
|
||||
`update_by` varchar(64) DEFAULT NULL COMMENT '修改人',
|
||||
`update_time` datetime NOT NULL COMMENT '修改时间',
|
||||
`tenant_id` bigint NOT NULL COMMENT '租户ID',
|
||||
PRIMARY KEY (`hard_id`),
|
||||
KEY `idx_hard_terminal_status_tenant_online` (`tenant_id`, `last_online_time`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin COMMENT='食堂超市终端心跳状态';
|
||||
@@ -0,0 +1,30 @@
|
||||
-- 消费机日志表（迁移自 hq-platform 800pjcloudx_hardware.sql 末段）。
|
||||
-- 记录消费机终端 HTTP 调用日志（req/res/error/耗时），unique_code 唯一。
|
||||
CREATE TABLE IF NOT EXISTS `pjcloudx_hardware`.`hard_xfj_log`
|
||||
(
|
||||
`id` bigint NOT NULL AUTO_INCREMENT COMMENT '编号',
|
||||
`unique_code` varchar(64) NOT NULL COMMENT '设备唯一编号',
|
||||
`hard_type` varchar(32) NOT NULL COMMENT '设备类型',
|
||||
`title` varchar(64) NOT NULL COMMENT '接口标题',
|
||||
`headers` varchar(2048) COMMENT 'headers',
|
||||
`res` varchar(2048) COMMENT 'res',
|
||||
`req` varchar(2048) COMMENT 'req',
|
||||
`error` varchar(2048) COMMENT 'error',
|
||||
`start_time` datetime DEFAULT NULL COMMENT '开始时间',
|
||||
`end_time` datetime DEFAULT NULL COMMENT '结束时间',
|
||||
`cost` int DEFAULT NULL COMMENT '耗时(毫秒)',
|
||||
`create_by` varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人',
|
||||
`create_time` datetime DEFAULT NULL COMMENT '创建时间',
|
||||
`update_by` varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '修改人',
|
||||
`update_time` datetime DEFAULT NULL COMMENT '修改时间',
|
||||
`del_flag` char(1) COLLATE utf8mb4_general_ci DEFAULT '0' COMMENT '删除标记',
|
||||
`tenant_id` bigint DEFAULT NULL COMMENT '租户ID',
|
||||
PRIMARY KEY (`id`),
|
||||
UNIQUE KEY `idx_unique_code` (`unique_code`),
|
||||
KEY `idx_hard_type` (`hard_type`),
|
||||
KEY `idx_title` (`title`),
|
||||
KEY `idx_start_time` (`start_time`),
|
||||
KEY `idx_end_time` (`end_time`)
|
||||
) ENGINE = InnoDB
|
||||
DEFAULT CHARSET = utf8mb4
|
||||
COLLATE = utf8mb4_general_ci COMMENT ='消费机日志';
|
||||
@@ -0,0 +1,7 @@
|
||||
-- 为钱包流水补充财务统计标签和业务备注；历史数据保持为空。
|
||||
-- tags 保存 wallet_transaction_tag 字典值，多个值使用英文逗号分隔；remark 前后端统一限制为 256 个字符。
|
||||
ALTER TABLE wallet_transaction
|
||||
ADD COLUMN tags varchar(512) DEFAULT NULL COMMENT '财务统计标签，多个wallet_transaction_tag字典值使用英文逗号分隔' AFTER balance;
|
||||
|
||||
ALTER TABLE wallet_transaction
|
||||
ADD COLUMN remark varchar(256) DEFAULT NULL COMMENT '流水备注，最多256个字符' AFTER tags;
|
||||
@@ -0,0 +1,49 @@
|
||||
================================================================
|
||||
智能柜订单手动结算（2026-09-08）—— 权限 手动添加清单
|
||||
================================================================
|
||||
说明：第三方(旷世)识别不可用后，智能柜免密订单(payType=9 + 设备类型4)
|
||||
需要在售后订单详情页人工核对视频后手动结算/取消。以下权限需在 pjcloudx
|
||||
主库 sys_menu 手动添加（菜单管理界面配置或执行文末幂等 SQL）。
|
||||
|
||||
----------------------------------------------------------------
|
||||
一、按钮权限（sys_menu，menu_type='2'）
|
||||
----------------------------------------------------------------
|
||||
挂载位置建议：挂在「售后订单详情」可访问的角色/菜单下（订单详情页为
|
||||
动态路由 order-refund，无独立菜单，建议挂在 hard 订单相关父菜单下，
|
||||
与 hard_hardwareOrder_view 同级或同父）。
|
||||
|
||||
1. hard_hardwareOrder_manualSettle 订单-智能柜手动结算
|
||||
（售后订单详情页「手动结算」区块：手动结算 + 未拿商品取消订单，共用一个权限）
|
||||
|
||||
----------------------------------------------------------------
|
||||
二、页面菜单
|
||||
----------------------------------------------------------------
|
||||
无新增页面（功能内嵌在已有售后订单详情页 order-refund 中），无需配菜单。
|
||||
|
||||
----------------------------------------------------------------
|
||||
三、字典
|
||||
----------------------------------------------------------------
|
||||
无新增字典。
|
||||
|
||||
----------------------------------------------------------------
|
||||
四、附：可直接执行的幂等 SQL（按需使用，执行前请备份）
|
||||
----------------------------------------------------------------
|
||||
-- 按钮权限（挂在 hard_hardwareOrder_view 所在的父菜单下）
|
||||
SET @menu_id_base = (SELECT GREATEST(COALESCE(MAX(`menu_id`), 0), 2026090801000000000) FROM `pjcloudx`.`sys_menu`);
|
||||
INSERT INTO `pjcloudx`.`sys_menu`
|
||||
(`menu_id`, `name`, `permission`, `parent_id`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `del_flag`, `tenant_id`)
|
||||
SELECT @menu_id_base + ROW_NUMBER() OVER (ORDER BY p.`tenant_id`, p.`menu_id`),
|
||||
'智能柜手动结算', 'hard_hardwareOrder_manualSettle', p.`menu_id`, '1', 20, '0', '0', '2', 'system', NOW(), '0', p.`tenant_id`
|
||||
FROM `pjcloudx`.`sys_menu` p
|
||||
WHERE p.`permission` = 'hard_hardwareOrder_view' AND p.`del_flag` = '0'
|
||||
AND NOT EXISTS (
|
||||
SELECT 1 FROM `pjcloudx`.`sys_menu` e
|
||||
WHERE e.`tenant_id` = p.`tenant_id` AND e.`permission` = 'hard_hardwareOrder_manualSettle' AND e.`del_flag` = '0'
|
||||
);
|
||||
SET @menu_id_base = NULL;
|
||||
|
||||
----------------------------------------------------------------
|
||||
五、数据库迁移
|
||||
----------------------------------------------------------------
|
||||
无（复用 hard_door_flow.skuCallbackVo / skuCallbackTime 字段记录手动操作留痕，
|
||||
不涉及表结构变更，无需执行任何 SQL）。
|
||||
@@ -0,0 +1,158 @@
|
||||
================================================================
|
||||
hard 模块迁移（2026-09-08）—— 权限/菜单/字典 手动添加清单
|
||||
================================================================
|
||||
说明：以下内容需要在 pjcloudx 主库（sys_menu / sys_dict / sys_dict_item）手动添加，
|
||||
可以直接在「系统管理-菜单管理 / 字典管理」界面配置，也可以执行文末附带的 SQL（幂等，可重复执行）。
|
||||
每项都标注了用途，若目标环境已存在同名项请跳过。
|
||||
|
||||
----------------------------------------------------------------
|
||||
一、按钮权限（sys_menu，menu_type='2'）
|
||||
----------------------------------------------------------------
|
||||
挂载位置建议：挂在对应页面的父菜单下（与 hard_hardManager_view 同级）。
|
||||
|
||||
1. hard_hardTerminalLogFile_view 终端日志-查看 （终端日志页面 + 设备详情页日志区）
|
||||
2. hard_hardTerminalLogFile_preview 终端日志-预览
|
||||
3. hard_hardTerminalLogFile_down 终端日志-下载
|
||||
4. hard_hardTerminalLogFile_pull 终端日志-拉取
|
||||
5. hard_hardManager_printer_bind 设备管理-绑定打印机 （设备详情页打印配置区）
|
||||
6. hard_hardManager_export 设备管理-导出 （设备列表导出按钮，若已有则跳过）
|
||||
7. hard_hardInvoice_voucher_reprint 发票凭证-重打兑换券（打印任务弹窗重打，若不需要可不加）
|
||||
|
||||
----------------------------------------------------------------
|
||||
二、页面菜单（sys_menu，menu_type='1'，动态路由）
|
||||
----------------------------------------------------------------
|
||||
1. 终端日志（机器日志）
|
||||
路径 path：/hard/hard-terminal-log-file/index
|
||||
权限标识：hard_hardTerminalLogFile_view
|
||||
2. 消费机日志
|
||||
路径 path：/hard/xfj/xfj-log/index
|
||||
权限标识：（查看权限可留空或自定 hard_xfjLog_view，页面本身无按钮权限）
|
||||
|
||||
说明：
|
||||
- 设备详情页 /hard/hard-manager/details 已由前端静态路由注册（isHide），无需配菜单。
|
||||
- 售后订单详情 order-refund 沿用目标库已有菜单，无需改动。
|
||||
|
||||
----------------------------------------------------------------
|
||||
三、字典（sys_dict + sys_dict_item）
|
||||
----------------------------------------------------------------
|
||||
1. hard_type（设备类型，已有字典，补充缺失项）：
|
||||
- 9 云版消费机
|
||||
- 12 尔印打印机器
|
||||
（若已有 10/11 云音响等项则不动）
|
||||
2. 新增 hard_print_type（打印凭证类型）：
|
||||
- 1 发票
|
||||
- 2 兑换券
|
||||
3. 新增 hard_print_status（打印任务状态）：
|
||||
- 0 待生成
|
||||
- 1 待打印
|
||||
- 2 已打印
|
||||
- 3 打印失败
|
||||
- 4 已取消
|
||||
4. 可选：hard_appt_reserve_mode（预约模式，售后详情页预约信息列显示用；
|
||||
目标库若无此字典该列显示空，不影响其他功能）
|
||||
|
||||
----------------------------------------------------------------
|
||||
四、附：可直接执行的幂等 SQL（按需使用，执行前请备份）
|
||||
----------------------------------------------------------------
|
||||
-- 1. hard_type 补类型 9/12（每个已配置 hard_type 的租户幂等插入）
|
||||
SET @dict_item_id_base = (SELECT GREATEST(COALESCE(MAX(`id`), 0), 2026090800000000000) FROM `pjcloudx`.`sys_dict_item`);
|
||||
INSERT INTO `pjcloudx`.`sys_dict_item`
|
||||
(`id`, `dict_id`, `item_value`, `label`, `dict_type`, `description`, `sort_order`, `create_by`, `create_time`, `remarks`, `del_flag`, `tenant_id`)
|
||||
SELECT @dict_item_id_base + ROW_NUMBER() OVER (ORDER BY d.`tenant_id`, item.`item_value`),
|
||||
d.`id`, item.`item_value`, item.`label`, 'hard_type', item.`label`, CAST(item.`item_value` AS SIGNED),
|
||||
'system', NOW(), item.`label`, '0', d.`tenant_id`
|
||||
FROM `pjcloudx`.`sys_dict` d
|
||||
JOIN (
|
||||
SELECT '9' AS `item_value`, '云版消费机' AS `label`
|
||||
UNION ALL SELECT '12', '尔印打印机器'
|
||||
) item
|
||||
WHERE d.`dict_type` = 'hard_type' AND d.`del_flag` = '0'
|
||||
AND NOT EXISTS (
|
||||
SELECT 1 FROM `pjcloudx`.`sys_dict_item` i
|
||||
WHERE i.`tenant_id` = d.`tenant_id` AND i.`dict_type` = 'hard_type'
|
||||
AND i.`item_value` = item.`item_value` AND i.`del_flag` = '0'
|
||||
);
|
||||
SET @dict_item_id_base = NULL;
|
||||
|
||||
-- 2. hard_print_type / hard_print_status 字典（按租户幂等创建）
|
||||
SET @dict_id_base = (SELECT GREATEST(COALESCE(MAX(`id`), 0), 2026090800000000000) FROM `pjcloudx`.`sys_dict`);
|
||||
INSERT INTO `pjcloudx`.`sys_dict`
|
||||
(`id`, `dict_type`, `description`, `create_by`, `create_time`, `remarks`, `system_flag`, `del_flag`, `tenant_id`)
|
||||
SELECT @dict_id_base + ROW_NUMBER() OVER (ORDER BY tenant.`tenant_id`, t.`dict_type`),
|
||||
t.`dict_type`, t.`description`, 'system', NOW(), t.`description`, '1', '0', tenant.`tenant_id`
|
||||
FROM (SELECT DISTINCT `tenant_id` FROM `pjcloudx`.`sys_dict` WHERE `del_flag` = '0') tenant
|
||||
CROSS JOIN (
|
||||
SELECT 'hard_print_type' AS `dict_type`, '打印凭证类型' AS `description`
|
||||
UNION ALL SELECT 'hard_print_status', '打印任务状态'
|
||||
) t
|
||||
WHERE NOT EXISTS (
|
||||
SELECT 1 FROM `pjcloudx`.`sys_dict` d
|
||||
WHERE d.`tenant_id` = tenant.`tenant_id` AND d.`dict_type` = t.`dict_type` AND d.`del_flag` = '0'
|
||||
);
|
||||
SET @dict_id_base = NULL;
|
||||
|
||||
SET @dict_item_id_base = (SELECT GREATEST(COALESCE(MAX(`id`), 0), 2026090800000000000) FROM `pjcloudx`.`sys_dict_item`);
|
||||
INSERT INTO `pjcloudx`.`sys_dict_item`
|
||||
(`id`, `dict_id`, `item_value`, `label`, `dict_type`, `description`, `sort_order`, `create_by`, `create_time`, `del_flag`, `tenant_id`)
|
||||
SELECT @dict_item_id_base + ROW_NUMBER() OVER (ORDER BY d.`tenant_id`, d.`dict_type`, item.`sort_order`, item.`item_value`),
|
||||
d.`id`, item.`item_value`, item.`label`, d.`dict_type`, item.`label`, item.`sort_order`,
|
||||
'system', NOW(), '0', d.`tenant_id`
|
||||
FROM `pjcloudx`.`sys_dict` d
|
||||
JOIN (
|
||||
SELECT 'hard_print_type' AS `dict_type`, '1' AS `item_value`, '发票' AS `label`, 1 AS `sort_order`
|
||||
UNION ALL SELECT 'hard_print_type', '2', '兑换券', 2
|
||||
UNION ALL SELECT 'hard_print_status', '0', '待生成', 0
|
||||
UNION ALL SELECT 'hard_print_status', '1', '待打印', 1
|
||||
UNION ALL SELECT 'hard_print_status', '2', '已打印', 2
|
||||
UNION ALL SELECT 'hard_print_status', '3', '打印失败', 3
|
||||
UNION ALL SELECT 'hard_print_status', '4', '已取消', 4
|
||||
) item ON item.`dict_type` = d.`dict_type`
|
||||
WHERE d.`del_flag` = '0'
|
||||
AND NOT EXISTS (
|
||||
SELECT 1 FROM `pjcloudx`.`sys_dict_item` i
|
||||
WHERE i.`tenant_id` = d.`tenant_id` AND i.`dict_type` = d.`dict_type`
|
||||
AND i.`item_value` = item.`item_value` AND i.`del_flag` = '0'
|
||||
);
|
||||
SET @dict_item_id_base = NULL;
|
||||
|
||||
-- 3. 按钮权限（挂到已有父权限所在菜单下，menu_type='2'）
|
||||
-- 先在界面确认父菜单，或使用下面按 permission 定位父菜单的幂等插入：
|
||||
SET @menu_id_base = (SELECT GREATEST(COALESCE(MAX(`menu_id`), 0), 2026090800000000000) FROM `pjcloudx`.`sys_menu`);
|
||||
INSERT INTO `pjcloudx`.`sys_menu`
|
||||
(`menu_id`, `name`, `permission`, `parent_id`, `visible`, `sort_order`, `keep_alive`, `embedded`, `menu_type`, `create_by`, `create_time`, `del_flag`, `tenant_id`)
|
||||
SELECT @menu_id_base + ROW_NUMBER() OVER (ORDER BY p.`tenant_id`, p.`menu_id`, item.`permission`),
|
||||
item.`name`, item.`permission`, p.`menu_id`, '1', 20, '0', '0', '2', 'system', NOW(), '0', p.`tenant_id`
|
||||
FROM `pjcloudx`.`sys_menu` p
|
||||
JOIN (
|
||||
SELECT 'hard_hardTerminalLogFile_view' AS `permission`, '终端日志查看' AS `name`, 'hard_hardManager_view' AS `parent_permission`
|
||||
UNION ALL SELECT 'hard_hardTerminalLogFile_preview', '终端日志预览', 'hard_hardManager_view'
|
||||
UNION ALL SELECT 'hard_hardTerminalLogFile_down', '终端日志下载', 'hard_hardManager_view'
|
||||
UNION ALL SELECT 'hard_hardTerminalLogFile_pull', '终端日志拉取', 'hard_hardManager_view'
|
||||
UNION ALL SELECT 'hard_hardManager_printer_bind', '绑定打印机', 'hard_hardManager_view'
|
||||
UNION ALL SELECT 'hard_hardManager_export', '导出设备', 'hard_hardManager_view'
|
||||
UNION ALL SELECT 'hard_hardInvoice_voucher_reprint', '重打兑换券', 'hard_hardInvoice_view'
|
||||
) item ON item.`parent_permission` = p.`permission`
|
||||
WHERE p.`del_flag` = '0'
|
||||
AND NOT EXISTS (
|
||||
SELECT 1 FROM `pjcloudx`.`sys_menu` e
|
||||
WHERE e.`tenant_id` = p.`tenant_id` AND e.`permission` = item.`permission` AND e.`del_flag` = '0'
|
||||
);
|
||||
SET @menu_id_base = NULL;
|
||||
|
||||
-- 4. 页面菜单（终端日志 / 消费机日志）—— parent_id 请替换为实际的「设备管理/硬件」目录菜单ID
|
||||
-- （建议直接在菜单管理界面添加，下面仅作字段参考）
|
||||
-- INSERT INTO `pjcloudx`.`sys_menu`
|
||||
-- (`menu_id`,`name`,`permission`,`path`,`parent_id`,`icon`,`visible`,`sort_order`,`keep_alive`,`embedded`,`menu_type`,`create_by`,`create_time`,`del_flag`,`tenant_id`)
|
||||
-- VALUES
|
||||
-- (自定义ID, '终端日志', 'hard_hardTerminalLogFile_view', '/hard/hard-terminal-log-file/index', <父菜单ID>, NULL, '1', 100, '0', NULL, '1', 'admin', NOW(), '0', 1),
|
||||
-- (自定义ID, '消费机日志', NULL, '/hard/xfj/xfj-log/index', <父菜单ID>, NULL, '1', 101, '0', NULL, '1', 'admin', NOW(), '0', 1);
|
||||
|
||||
----------------------------------------------------------------
|
||||
五、数据库迁移 SQL 执行顺序（pj_service_cloud/db/ 下本次新增）
|
||||
----------------------------------------------------------------
|
||||
1. 20260908_add_hard_terminal_status.sql
|
||||
2. 20260908_add_hard_terminal_log_file.sql
|
||||
3. 20260908_add_hard_order_evidence_image.sql
|
||||
4. 20260908_add_hard_printer.sql （含 hard_invoice 打印任务化，注意先备份）
|
||||
5. 20260908_add_hard_xfj_log.sql
|
||||
6. 20260908_add_hard_order_verification_time.sql
|
||||
@@ -0,0 +1,18 @@
|
||||
-- 订单分页（POST hard/order/page-join）性能优化配套索引（OceanBase MySQL 模式）
|
||||
-- 背景：HardOrderMapper.xml 已参考 biz-api-cloud-zax 将"每单最新售后"的全表 GROUP BY
|
||||
-- 派生表改写为相关标量子查询：
|
||||
-- select max(id) from hard_after_sale where order_id = ? and del_flag = '0'
|
||||
-- 该写法需要 (order_id, del_flag, id) 前导索引支撑；此前 slowlog_optimization_20260826
|
||||
-- 推荐的 (tenant_id, order_id, id) 因租户列在前导位，无法服务新子查询。
|
||||
-- 执行前请确认同名索引不存在；建议低峰期执行并观察建索引耗时。本文件只包含索引 DDL。
|
||||
|
||||
CREATE INDEX idx_hard_after_sale_order_del_id
|
||||
ON pjcloudx_hardware.hard_after_sale (order_id, del_flag, id);
|
||||
|
||||
-- 说明：
|
||||
-- 1) 若 db/slowlog_optimization_20260826/01_add_indexes.sql 尚未执行，请一并执行其中
|
||||
-- idx_hard_order_tenant_del_ct_uid (tenant_id, del_flag, create_time, user_id)：
|
||||
-- 订单列表 ORDER BY create_time desc, user_id desc, id desc 依赖该索引做反向范围扫描
|
||||
-- （InnoDB/OceanBase 二级索引隐含主键 id 后缀，id desc 排序可直接复用，无需额外索引）。
|
||||
-- 2) 20260826 中的 idx_hard_after_sale_tenant_order_id 服务于旧派生表写法；本次新索引
|
||||
-- 上线后如确认无其他统计 SQL 依赖，可自行评估删除，本文件不强制处理。
|
||||
@@ -0,0 +1,6 @@
|
||||
-- 智能柜手动结算「操作快照」字段（2026-09-09）
|
||||
-- 用途：手动结算/取消订单时，在 hard_door_flow 保存完整操作快照
|
||||
-- （操作人id/姓名/时间/购物车明细含商品名单价/合计/支付方式/备注），供事后二次判断复核
|
||||
-- 与旷世识别回调字段（sku_callback_vo）互不干扰。
|
||||
ALTER TABLE hard_door_flow
|
||||
ADD COLUMN manual_settle_vo text DEFAULT NULL COMMENT '手动结算/取消操作快照(操作人+购物车明细+金额+备注)';
|
||||
@@ -0,0 +1,8 @@
|
||||
-- 终端虹软静态图片质量结果列（迁移自 hq-platform/biz-api-cloud-zax db/20260901_add_sys_user_face_quality.sql）。
|
||||
-- 保存终端虹软静态图片质量结果；旧终端和历史人脸保持 NULL，不影响现有人脸业务。
|
||||
ALTER TABLE sys_user_face
|
||||
ADD COLUMN quality_score decimal(5, 4) DEFAULT NULL COMMENT '虹软静态图片质量分，范围0-1' AFTER face_img,
|
||||
ADD COLUMN quality_status varchar(16) DEFAULT NULL COMMENT '终端检测状态：detected/failed' AFTER quality_score,
|
||||
ADD COLUMN quality_checked_at datetime DEFAULT NULL COMMENT '终端完成质量检测的时间' AFTER quality_status,
|
||||
ADD COLUMN quality_error_code int DEFAULT NULL COMMENT '虹软或终端质量检测错误码' AFTER quality_checked_at,
|
||||
ADD COLUMN quality_device_id bigint DEFAULT NULL COMMENT '最后一次上报质量的终端ID' AFTER quality_error_code;
|
||||
@@ -0,0 +1,206 @@
|
||||
-- ================================================================
|
||||
-- 智能柜订单手动结算 —— 测试数据脚本（2026-09-09）
|
||||
-- ================================================================
|
||||
-- 用途：在【测试环境】生成 10 笔可手动结算的智能柜免密订单
|
||||
-- pay_type='9'(智能柜免密) + sys_type='4'(生鲜柜) + order_status='1'(待结算)
|
||||
-- 覆盖表：hard_order（订单）/ hard_auth（用户授权）/ hard_door_flow（智能柜流程）
|
||||
-- 标记：三张表 create_by='test-manual-settle'，可重复执行（先清理再生成）
|
||||
-- 执行：mysql -h127.0.0.1 -P33905 -uroot -p pjcloudx_hardware < 本文件
|
||||
--
|
||||
-- 前置条件（缺一不可，脚本会自动挑选并检查）：
|
||||
-- 1. 已有智能柜设备：hard_door_manager + hard_door_cabinet 有数据
|
||||
-- 2. 柜内已配置商品：hard_spu_join 有 spu_id 指向有效 hard_spu 的记录
|
||||
-- （否则订单详情页手动结算区显示"未找到该柜的商品配置"，无法结算）
|
||||
-- 3. 钱包库存在消费钱包（wallet_type.unique_code='2'，同租户优先）
|
||||
-- —— 结算时会真实扣款（force 强制扣款允许透支），并真实生成钱包流水
|
||||
-- 说明：
|
||||
-- - 本地 docker 为分库架构：硬件=pjcloudx_hardware 钱包=pjcloudx_wallet 用户=pjcloudx；
|
||||
-- 单库环境请去掉 SQL 里的 pjcloudx_wallet. / pjcloudx. 库名前缀
|
||||
-- - 订单 order_type='1'(BELOW 线下购买)，与生产 TOB 用户走钱包扣款一致；
|
||||
-- 不要用 TOC_VISITOR('8')，那会走支付宝免密扣款，测试环境无第三方单会结算失败
|
||||
-- - 流程 flow_status='50'（已提交旷世识别、等待回调），即旷世跑路后的真实卡死状态
|
||||
-- - 视频为公网示例视频（主摄 vjs.zencdn.net / 辅摄 MDN，浏览器实测可达；
|
||||
-- media.w3.org / Google 桶在部分网络环境会被阻断，勿用），每单主摄/辅摄两路
|
||||
-- - 极老库若报 parent_car_id 不能为 NULL，先执行：
|
||||
-- ALTER TABLE hard_order MODIFY parent_car_id bigint NULL DEFAULT NULL;
|
||||
-- ================================================================
|
||||
|
||||
|
||||
-- ---------- 一、清理旧测试数据（脚本可重复执行） ----------
|
||||
DELETE FROM hard_door_flow WHERE create_by = 'test-manual-settle';
|
||||
DELETE FROM hard_auth WHERE create_by = 'test-manual-settle';
|
||||
DELETE FROM hard_order WHERE create_by = 'test-manual-settle';
|
||||
|
||||
-- ---------- 二、自动挑选基础数据 ----------
|
||||
-- 智能柜：优先挑有商品配置的柜子（hard_door_manager.id / 设备id / 租户 / 设备编号）
|
||||
SELECT dm.id, dm.hard_id, dm.tenant_id, dm.device_code
|
||||
INTO @hard_door_id, @hard_id, @tenant_id, @device_code
|
||||
FROM hard_door_manager dm
|
||||
WHERE dm.del_flag = '0'
|
||||
AND EXISTS (
|
||||
SELECT 1 FROM hard_spu_join j
|
||||
WHERE j.hard_door_id = dm.id AND j.del_flag = '0' AND j.spu_id IS NOT NULL
|
||||
)
|
||||
ORDER BY dm.id
|
||||
LIMIT 1;
|
||||
|
||||
-- 货柜号：挑该柜配置商品最多的货柜
|
||||
SELECT j.cabinet_no INTO @cabinet_no
|
||||
FROM hard_spu_join j
|
||||
WHERE j.hard_door_id = @hard_door_id AND j.del_flag = '0' AND j.spu_id IS NOT NULL
|
||||
GROUP BY j.cabinet_no
|
||||
ORDER BY COUNT(*) DESC
|
||||
LIMIT 1;
|
||||
|
||||
-- 商户信息：从设备取
|
||||
SELECT MAX(m.merchant_id), MAX(m.dept_id) INTO @merchant_id, @merchant_dept_id
|
||||
FROM hard_manager m
|
||||
WHERE m.id = @hard_id AND m.del_flag = '0';
|
||||
|
||||
-- 商户类型：优先沿用同商户已有订单的 merchant_type（查不到则为 NULL，不影响结算）
|
||||
SELECT MAX(o.merchant_type) INTO @merchant_type
|
||||
FROM hard_order o
|
||||
WHERE o.merchant_id = @merchant_id AND o.merchant_type IS NOT NULL;
|
||||
|
||||
-- 测试用户 + 消费钱包（wallet_type.unique_code='2'），同租户优先
|
||||
SELECT w.user_id, w.id INTO @user_id, @wallet_id
|
||||
FROM pjcloudx_wallet.wallet_manage w
|
||||
JOIN pjcloudx_wallet.wallet_type t ON t.id = w.wallet_type_id AND t.del_flag = '0' AND t.unique_code = '2'
|
||||
WHERE w.del_flag = '0'
|
||||
ORDER BY (w.tenant_id = @tenant_id) DESC, w.id
|
||||
LIMIT 1;
|
||||
|
||||
-- 用户部门（sys_user 不在本实例时可注释掉，手工 SET @user_dept_id）
|
||||
SELECT MAX(u.dept_id) INTO @user_dept_id
|
||||
FROM pjcloudx.sys_user u
|
||||
WHERE u.user_id = @user_id;
|
||||
|
||||
-- 测试主键基址：各表当前最大 id + 100 亿，避开现有与后续雪花 id
|
||||
SELECT COALESCE(MAX(id), 0) + 10000000000 INTO @order_id_base FROM hard_order;
|
||||
SELECT COALESCE(MAX(id), 0) + 10000000000 INTO @flow_id_base FROM hard_door_flow;
|
||||
SELECT COALESCE(MAX(id), 0) + 10000000000 INTO @auth_id_base FROM hard_auth;
|
||||
|
||||
-- ★ 检查：除 @merchant_type 外下列都不能为 NULL；为 NULL 说明缺前置数据，
|
||||
-- 请手工 SET 对应变量（或先在 柜机管理页 给柜子上架商品）后重跑
|
||||
SELECT @hard_door_id AS 柜配置id,
|
||||
@hard_id AS 设备id,
|
||||
@cabinet_no AS 货柜号,
|
||||
@tenant_id AS 租户,
|
||||
@merchant_id AS 商户id,
|
||||
@merchant_dept_id AS 商户部门,
|
||||
@merchant_type AS 商户类型_可空,
|
||||
@user_id AS 用户id,
|
||||
@wallet_id AS 钱包id,
|
||||
@order_id_base AS 订单id基址;
|
||||
|
||||
-- ---------- 三、生成 10 组 授权 / 流程 / 订单 ----------
|
||||
|
||||
-- 1. 用户授权（hard_auth）：已授权、未完成
|
||||
INSERT INTO hard_auth
|
||||
(id, user_id, hard_id, cabinet_no, auth_type, auth_status, auth_time, is_done, create_by, create_time, del_flag, tenant_id)
|
||||
SELECT @auth_id_base + n, @user_id, @hard_id, @cabinet_no, 'TEST', '1',
|
||||
NOW() - INTERVAL (n * 2) HOUR, '0',
|
||||
'test-manual-settle', NOW() - INTERVAL (n * 2) HOUR, '0', @tenant_id
|
||||
FROM (
|
||||
SELECT 1 AS n UNION ALL SELECT 2 UNION ALL SELECT 3 UNION ALL SELECT 4 UNION ALL SELECT 5
|
||||
UNION ALL SELECT 6 UNION ALL SELECT 7 UNION ALL SELECT 8 UNION ALL SELECT 9 UNION ALL SELECT 10
|
||||
) seq;
|
||||
|
||||
-- 2. 智能柜流程（hard_door_flow）：卡在"已提交识别、等待旷世回调"（flow_status='50'）
|
||||
INSERT INTO hard_door_flow
|
||||
(id, user_id, user_type, biz_type, hard_id, hard_door_id, cabinet_no, order_id, auth_id,
|
||||
request_open_dto, request_open_vo, request_open_time,
|
||||
is_open, open_callback_time, open_callback_vo,
|
||||
video_callback_vo, video_callback_time,
|
||||
sku_submit_dto, sku_submit_vo, sku_submit_recog_id, sku_submit_time,
|
||||
flow_status, create_by, create_time, del_flag, tenant_id)
|
||||
SELECT
|
||||
@flow_id_base + n, @user_id, '0', '10', @hard_id, @hard_door_id, @cabinet_no,
|
||||
@order_id_base + n, @auth_id_base + n,
|
||||
-- 请求开门参数/返回
|
||||
CONCAT('{"outOpenNo":"', @flow_id_base + n, '","hardDoorId":', @hard_door_id, ',"cabinetNo":', @cabinet_no, ',"userId":', @user_id, '}'),
|
||||
CONCAT('{"code":0,"msg":"成功","data":{"outOpenNo":"', @flow_id_base + n, '","isOpen":true}}'),
|
||||
NOW() - INTERVAL (n * 2 - 2) MINUTE,
|
||||
-- 开门回调（成功开门）
|
||||
'1', NOW() - INTERVAL (n * 2 - 1) MINUTE,
|
||||
CONCAT('{"eventId":"TEST-EVT-', n, '","outOpenNo":"', @flow_id_base + n, '","deviceCode":"', IFNULL(@device_code, 0), '","cabinetNo":', @cabinet_no, ',"resultCode":"SUCCESS"}'),
|
||||
-- 视频回调（公网示例视频，主摄/辅摄两路）
|
||||
CONCAT('{"eventId":"TEST-EVT-', n, '","outOpenNo":"', @flow_id_base + n, '","deviceCode":"', IFNULL(@device_code, 0),
|
||||
'","cabinetNo":', @cabinet_no, ',"resultCode":"SUCCESS","resultMsg":null,"videoList":[',
|
||||
'{"cameraNo":1,"videoUrl":"https://vjs.zencdn.net/v/oceans.mp4"},',
|
||||
'{"cameraNo":2,"videoUrl":"https://interactive-examples.mdn.mozilla.net/media/cc0-videos/flower.mp4"}]}'),
|
||||
NOW() - INTERVAL (n * 2) HOUR + INTERVAL 3 MINUTE,
|
||||
-- 已提交旷世识别（模拟旷世跑路前的最后一步，识别回调永远不回来）
|
||||
CONCAT('{"recog_id":"', @flow_id_base + n, '","resource_type":"1","container_id":"', @hard_door_id,
|
||||
'","sub_mch_id":"', @order_id_base + n,
|
||||
'","resource_urls":["https://media.w3.org/2010/05/sintel/trailer.mp4"]}'),
|
||||
CONCAT('{"code":0,"is_success":true,"ks_recog_id":"TEST-RECOG-', n, '","msg":"提交成功"}'),
|
||||
CONCAT('TEST-RECOG-', n),
|
||||
NOW() - INTERVAL (n * 2) HOUR + INTERVAL 4 MINUTE,
|
||||
-- 流程状态 50=已提交识别；sku_callback_*/pay_time 留空（未结算）
|
||||
'50', 'test-manual-settle', NOW() - INTERVAL (n * 2) HOUR, '0', @tenant_id
|
||||
FROM (
|
||||
SELECT 1 AS n UNION ALL SELECT 2 UNION ALL SELECT 3 UNION ALL SELECT 4 UNION ALL SELECT 5
|
||||
UNION ALL SELECT 6 UNION ALL SELECT 7 UNION ALL SELECT 8 UNION ALL SELECT 9 UNION ALL SELECT 10
|
||||
) seq;
|
||||
|
||||
-- 3. 订单（hard_order）：待结算的智能柜免密订单（形态对齐后端 createHardDoorOrder）
|
||||
INSERT INTO hard_order
|
||||
(id, user_id, user_dept_id, merchant_id, merchant_type, merchant_dept_id, hard_id, wallet_id,
|
||||
order_type, order_status, pay_type, sys_type,
|
||||
total_price, extra_price, pay_price, is_offline_order, product_desc,
|
||||
create_by, create_time, del_flag, tenant_id)
|
||||
SELECT @order_id_base + n, @user_id, @user_dept_id, @merchant_id, @merchant_type, @merchant_dept_id,
|
||||
@hard_id, @wallet_id,
|
||||
'1', '1', '9', '4',
|
||||
0, 0, 0, '0', CONCAT('智能柜手动结算测试订单-', n),
|
||||
'test-manual-settle', NOW() - INTERVAL (n * 2) HOUR, '0', @tenant_id
|
||||
FROM (
|
||||
SELECT 1 AS n UNION ALL SELECT 2 UNION ALL SELECT 3 UNION ALL SELECT 4 UNION ALL SELECT 5
|
||||
UNION ALL SELECT 6 UNION ALL SELECT 7 UNION ALL SELECT 8 UNION ALL SELECT 9 UNION ALL SELECT 10
|
||||
) seq;
|
||||
|
||||
-- ---------- 四、生成结果检查 ----------
|
||||
SELECT o.id AS 订单id,
|
||||
o.product_desc AS 商品描述,
|
||||
o.order_status AS 订单状态,
|
||||
o.pay_type AS 支付方式,
|
||||
o.sys_type AS 设备类型,
|
||||
f.id AS 流程id,
|
||||
f.flow_status AS 流程状态,
|
||||
f.cabinet_no AS 货柜号,
|
||||
a.id AS 授权id,
|
||||
a.is_done AS 授权完成
|
||||
FROM hard_order o
|
||||
JOIN hard_door_flow f ON f.order_id = o.id
|
||||
JOIN hard_auth a ON a.id = f.auth_id
|
||||
WHERE o.create_by = 'test-manual-settle'
|
||||
ORDER BY o.id;
|
||||
|
||||
-- ================================================================
|
||||
-- 测试入口与验证步骤
|
||||
-- ================================================================
|
||||
-- 1. 用对该订单商户有数据范围的管理员账号登录后台
|
||||
-- 2. 入口一：订单管理 → 未识别订单（hard-recog，本批次 10 笔会出现在列表）→ 订单详情
|
||||
-- 入口二：订单管理 → 订单列表 → 订单详情（售后订单详情页 order-refund）
|
||||
-- 3. 详情页右侧导航应出现「手动结算」：
|
||||
-- - 左侧为所选货柜按层商品（来自 hard_spu_join 配置），可调数量
|
||||
-- - 右侧为已选购物车 + 自动播放的公网示例视频（主摄/辅摄可切换）
|
||||
-- 4. 点「手动结算」→ 确认 → 期望：
|
||||
-- - 订单 order_status 变为 5(已支付)、pay_time/pay_price/total_price 写入
|
||||
-- - 生成 hard_parent_car / hard_car 商品明细，详情页"购物车"区出现商品
|
||||
-- - 智能柜库存扣减（hard_spu.repertory_count / hard_spu_join.repertory_count 减少）
|
||||
-- - hard_door_flow.flow_status 变 70、pay_time 写入、sku_callback_vo 记录手动结算留痕
|
||||
-- - hard_auth.is_done 变 1
|
||||
-- - 钱包库生成一笔 PAYMENT 扣款流水（允许透支）
|
||||
-- 5. 点「用户未拿商品，取消订单」→ 确认 → 期望：order_status 变 30(已取消)、
|
||||
-- flow 的 sku_callback_vo 记录手动取消留痕
|
||||
--
|
||||
-- ---------- 测试完成后的清理 ----------
|
||||
-- 重新执行本脚本第一、二节即可重置 10 笔新订单；
|
||||
-- 已结算订单产生的购物车明细按需清理：
|
||||
-- DELETE pc, c FROM hard_parent_car pc
|
||||
-- LEFT JOIN hard_car c ON c.parent_car_id = pc.id
|
||||
-- WHERE pc.id IN (SELECT parent_car_id FROM hard_order
|
||||
-- WHERE create_by = 'test-manual-settle' AND parent_car_id IS NOT NULL);
|
||||
-- 钱包流水在钱包库 wallet_transaction（biz_type='PAYMENT', biz_id=订单id），按需处理
|
||||
@@ -0,0 +1,42 @@
|
||||
-- =====================================================================
|
||||
-- 打印任务补偿扫描：由 hard 模块内 @Scheduled 改为 quartz 调度中心统一触发
|
||||
-- 接口：GET /hard-invoice/task/process-due（HardInvoiceController#processDueTasks）
|
||||
--
|
||||
-- 上线步骤：
|
||||
-- 1. 按部署环境修改 execute_path（默认为本机直连示例）：
|
||||
-- - 直连硬件服务（推荐，调度中心与服务同内网）：
|
||||
-- http://<hard服务地址>:6080/hard-invoice/task/process-due
|
||||
-- - 走网关：
|
||||
-- http://<网关地址>:9999/hard/hard-invoice/task/process-due
|
||||
-- 2. 执行本 INSERT；
|
||||
-- 3. 在管理端「工具 / 任务管理」页面找到该任务点击「启动」
|
||||
-- （job_status=1 已发布不会自动运行，启动后变为 2 运行中）。
|
||||
--
|
||||
-- 注意：
|
||||
-- * pjcloud-daemon-quartz 当前 quartz isClustered=false，调度中心必须单实例部署；
|
||||
-- 调度中心多实例会导致同一触发点被多次执行（接口内分布式锁仅兜底重叠执行，
|
||||
-- 不能区分多次正常触发）。
|
||||
-- * 任务必须挂在租户 1 下管理；接口内部已跳过租户过滤，扫描全部租户的任务。
|
||||
-- * 该 SQL 不含 ON DUPLICATE KEY，重复执行会主键冲突；若已在页面调整过任务，
|
||||
-- 请勿重复执行，以免覆盖手工配置。
|
||||
-- =====================================================================
|
||||
INSERT INTO `pjcloudx_job`.`sys_job` (
|
||||
`job_id`, `job_name`, `job_group`, `job_order`, `job_type`, `execute_path`,
|
||||
`cron_expression`, `misfire_policy`, `job_tenant_type`, `job_status`,
|
||||
`job_execute_status`, `create_by`, `tenant_id`, `remark`
|
||||
) VALUES (
|
||||
1949000000000000001,
|
||||
'hard-print-task-process-due',
|
||||
'DEFAULT',
|
||||
'1',
|
||||
'3',
|
||||
'http://127.0.0.1:6080/hard-invoice/task/process-due',
|
||||
'0/10 * * * * ?',
|
||||
'3',
|
||||
'2',
|
||||
'1',
|
||||
'0',
|
||||
'admin',
|
||||
1,
|
||||
'智能柜打印任务补偿扫描（原 HardPrintTaskJob，每10秒扫描待生成/待补偿下发的打印任务）'
|
||||
);
|
||||
+151
-15
@@ -177,22 +177,83 @@ CREATE TABLE hard_group
|
||||
DROP TABLE IF EXISTS `hard_invoice`;
|
||||
CREATE TABLE hard_invoice
|
||||
(
|
||||
id bigint NOT NULL COMMENT '编号',
|
||||
dept_id bigint NOT NULL COMMENT '部门id',
|
||||
hard_id bigint NOT NULL COMMENT '设备id',
|
||||
order_id bigint NOT NULL COMMENT '硬件订单id',
|
||||
status char(10) NOT NULL COMMENT '状态',
|
||||
pic varchar(256) NOT NULL COMMENT '发票图片',
|
||||
create_by varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人',
|
||||
create_time datetime DEFAULT NULL COMMENT '创建时间',
|
||||
update_by varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '修改人',
|
||||
update_time datetime DEFAULT NULL COMMENT '修改时间',
|
||||
del_flag char(1) COLLATE utf8mb4_general_ci DEFAULT '0' COMMENT '删除标记',
|
||||
tenant_id bigint DEFAULT NULL COMMENT '租户ID',
|
||||
PRIMARY KEY (id)
|
||||
id bigint NOT NULL COMMENT '编号',
|
||||
dept_id bigint NOT NULL COMMENT '部门id',
|
||||
hard_id bigint DEFAULT NULL COMMENT '来源业务或核销终端id',
|
||||
printer_hard_id bigint DEFAULT NULL COMMENT '目标尔印打印终端id',
|
||||
order_id bigint NOT NULL COMMENT '硬件订单id',
|
||||
print_type char(2) NOT NULL DEFAULT '1' COMMENT '打印类型，1发票、2兑换券',
|
||||
print_no int NOT NULL DEFAULT 1 COMMENT '同订单同类型打印序号',
|
||||
retry_version int NOT NULL DEFAULT 0 COMMENT '人工失败重试版本',
|
||||
attempt_count int NOT NULL DEFAULT 0 COMMENT '终端USB累计尝试次数',
|
||||
status char(10) NOT NULL DEFAULT '0' COMMENT '状态，0待生成、1待打印、2已打印、3打印失败、4已取消',
|
||||
failure_stage varchar(32) DEFAULT NULL COMMENT '失败阶段',
|
||||
last_error varchar(2000) DEFAULT NULL COMMENT '最近失败摘要',
|
||||
printed_at datetime DEFAULT NULL COMMENT '终端确认写入成功时间',
|
||||
reprint_reason varchar(500) DEFAULT NULL COMMENT '人工重打或再次核销原因',
|
||||
pic varchar(512) DEFAULT NULL COMMENT '后端生成的打印PNG地址',
|
||||
create_by varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人',
|
||||
create_time datetime DEFAULT NULL COMMENT '创建时间',
|
||||
update_by varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '修改人',
|
||||
update_time datetime DEFAULT NULL COMMENT '修改时间',
|
||||
del_flag char(1) COLLATE utf8mb4_general_ci DEFAULT '0' COMMENT '删除标记',
|
||||
tenant_id bigint DEFAULT NULL COMMENT '租户ID',
|
||||
PRIMARY KEY (id),
|
||||
UNIQUE KEY uk_hard_invoice_order_type_no (tenant_id, order_id, print_type, print_no),
|
||||
KEY idx_hard_invoice_printer_status (tenant_id, printer_hard_id, status, update_time, del_flag),
|
||||
KEY idx_hard_invoice_source_status (tenant_id, hard_id, status, del_flag)
|
||||
) ENGINE = InnoDB
|
||||
DEFAULT CHARSET = utf8mb4
|
||||
COLLATE = utf8mb4_general_ci COMMENT ='发票记录';
|
||||
COLLATE = utf8mb4_general_ci COMMENT ='打印任务与凭证记录';
|
||||
|
||||
-- ----------------------------
|
||||
-- Table structure for hard_printer_binding
|
||||
-- ----------------------------
|
||||
DROP TABLE IF EXISTS `hard_printer_binding`;
|
||||
CREATE TABLE hard_printer_binding
|
||||
(
|
||||
id bigint NOT NULL COMMENT '绑定关系主键',
|
||||
source_hard_id bigint NOT NULL COMMENT 'SUPERMARKET或CANTEEN来源业务终端id',
|
||||
printer_hard_id bigint NOT NULL COMMENT 'EY_PRINT目标打印终端id',
|
||||
merchant_id bigint NOT NULL COMMENT '双方共同所属商户id快照',
|
||||
dept_id bigint NOT NULL COMMENT '双方共同所属商户部门id快照',
|
||||
create_by varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人',
|
||||
create_time datetime DEFAULT NULL COMMENT '创建时间',
|
||||
update_by varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '修改人',
|
||||
update_time datetime DEFAULT NULL COMMENT '修改时间',
|
||||
tenant_id bigint NOT NULL COMMENT '租户ID',
|
||||
PRIMARY KEY (id),
|
||||
UNIQUE KEY uk_hard_printer_binding_source (tenant_id, source_hard_id),
|
||||
UNIQUE KEY uk_hard_printer_binding_printer (tenant_id, printer_hard_id),
|
||||
KEY idx_hard_printer_binding_merchant (tenant_id, merchant_id)
|
||||
) ENGINE = InnoDB
|
||||
DEFAULT CHARSET = utf8mb4
|
||||
COLLATE = utf8mb4_general_ci COMMENT ='业务终端与尔印打印终端一对一绑定';
|
||||
|
||||
-- ----------------------------
|
||||
-- Table structure for hard_printer_config
|
||||
-- ----------------------------
|
||||
DROP TABLE IF EXISTS `hard_printer_config`;
|
||||
CREATE TABLE hard_printer_config
|
||||
(
|
||||
id bigint NOT NULL COMMENT '配置主键',
|
||||
printer_hard_id bigint NOT NULL COMMENT 'EY_PRINT打印终端id',
|
||||
printer_model varchar(128) DEFAULT NULL COMMENT '打印机型号',
|
||||
usb_vendor_id int DEFAULT NULL COMMENT 'USB Vendor ID十进制值',
|
||||
usb_product_id int DEFAULT NULL COMMENT 'USB Product ID十进制值',
|
||||
paper_width int NOT NULL DEFAULT 80 COMMENT '纸宽，单位mm，首期固定80',
|
||||
auto_cut char(1) NOT NULL DEFAULT '1' COMMENT '自动切刀开关，1开启、0关闭',
|
||||
image_mode varchar(16) NOT NULL DEFAULT 'GS_V0' COMMENT '图片指令模式，GS_V0或ESC_STAR',
|
||||
create_by varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人',
|
||||
create_time datetime DEFAULT NULL COMMENT '创建时间',
|
||||
update_by varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '修改人',
|
||||
update_time datetime DEFAULT NULL COMMENT '修改时间',
|
||||
tenant_id bigint NOT NULL COMMENT '租户ID',
|
||||
PRIMARY KEY (id),
|
||||
UNIQUE KEY uk_hard_printer_config_printer (tenant_id, printer_hard_id)
|
||||
) ENGINE = InnoDB
|
||||
DEFAULT CHARSET = utf8mb4
|
||||
COLLATE = utf8mb4_general_ci COMMENT ='尔印打印终端USB与ESC/POS配置';
|
||||
|
||||
-- ----------------------------
|
||||
-- Table structure for hard_car
|
||||
@@ -311,6 +372,50 @@ CREATE TABLE hard_order
|
||||
PRIMARY KEY (id)
|
||||
) ENGINE = InnoDB COMMENT ='订单表';
|
||||
|
||||
-- ----------------------------
|
||||
-- Table structure for hard_order_evidence_image
|
||||
-- ----------------------------
|
||||
DROP TABLE IF EXISTS `hard_order_evidence_image`;
|
||||
CREATE TABLE hard_order_evidence_image
|
||||
(
|
||||
id bigint NOT NULL AUTO_INCREMENT COMMENT '证据记录自增主键',
|
||||
order_id bigint NOT NULL COMMENT '订单主键，来源hard_order.id',
|
||||
android_order_code varchar(128) NOT NULL COMMENT '终端本地稳定订单号快照',
|
||||
evidence_type varchar(32) NOT NULL COMMENT '证据类型，FACE_RECOGNITION或MENU_RECOGNITION',
|
||||
evidence_role varchar(32) NOT NULL COMMENT '图片角色，FACE_REFERENCE、FACE_LIVE或MENU_LIVE',
|
||||
sequence_no int NOT NULL DEFAULT 0 COMMENT '同类型同角色图片序号，从0开始',
|
||||
user_id bigint DEFAULT NULL COMMENT '识别用户主键快照',
|
||||
face_sample_id varchar(64) DEFAULT NULL COMMENT '虹软人脸样本编号快照',
|
||||
reference_image_url varchar(512) DEFAULT NULL COMMENT '识别时后台参考人脸来源地址快照，不作为展示地址',
|
||||
similarity decimal(8, 6) DEFAULT NULL COMMENT '识别相似度快照，取值0至1',
|
||||
similarity_threshold decimal(8, 6) DEFAULT NULL COMMENT '终端生效的相似度阈值快照，取值0至1',
|
||||
hard_id bigint NOT NULL COMMENT '产生证据的设备主键',
|
||||
captured_at datetime DEFAULT NULL COMMENT '终端实际采集时间',
|
||||
sys_file_id bigint DEFAULT NULL COMMENT '文件中心sys_file记录主键',
|
||||
storage_file_name varchar(255) DEFAULT NULL COMMENT '文件中心对象名',
|
||||
image_url varchar(512) DEFAULT NULL COMMENT '订单证据图片访问地址',
|
||||
image_hash char(64) DEFAULT NULL COMMENT '实际文件SHA-256哈希',
|
||||
image_size bigint DEFAULT NULL COMMENT '实际文件大小，单位字节',
|
||||
image_width int DEFAULT NULL COMMENT '实际图片宽度，单位像素',
|
||||
image_height int DEFAULT NULL COMMENT '实际图片高度，单位像素',
|
||||
status varchar(32) NOT NULL COMMENT '证据状态，PENDING、AVAILABLE或UNAVAILABLE',
|
||||
failure_reason varchar(500) DEFAULT NULL COMMENT '永久缺失或复制失败摘要，不保存终端完整路径',
|
||||
app_version varchar(64) DEFAULT NULL COMMENT '产生证据的终端应用版本',
|
||||
create_by varchar(64) DEFAULT NULL COMMENT '创建人',
|
||||
create_time datetime DEFAULT NULL COMMENT '创建时间',
|
||||
update_by varchar(64) DEFAULT NULL COMMENT '修改人',
|
||||
update_time datetime DEFAULT NULL COMMENT '修改时间',
|
||||
del_flag char(1) DEFAULT '0' COMMENT '逻辑删除标记，0有效，1删除',
|
||||
tenant_id bigint NOT NULL COMMENT '租户主键',
|
||||
PRIMARY KEY (id),
|
||||
UNIQUE KEY uk_hard_order_evidence_position
|
||||
(tenant_id, order_id, evidence_type, evidence_role, sequence_no, del_flag),
|
||||
KEY idx_hard_order_evidence_android_order
|
||||
(tenant_id, hard_id, android_order_code, del_flag),
|
||||
KEY idx_hard_order_evidence_status
|
||||
(tenant_id, status, update_time, del_flag)
|
||||
) ENGINE = InnoDB COMMENT ='硬件订单识别证据图片';
|
||||
|
||||
-- ----------------------------
|
||||
-- Table structure for hard_after_sale
|
||||
-- ----------------------------
|
||||
@@ -599,4 +704,35 @@ CREATE TABLE hard_third_mi_order
|
||||
del_flag char(1) COLLATE utf8mb4_general_ci DEFAULT '0' COMMENT '删除标记',
|
||||
tenant_id bigint DEFAULT NULL COMMENT '租户ID',
|
||||
PRIMARY KEY (id)
|
||||
) ENGINE = InnoDB COMMENT ='硬件商品免密订单';
|
||||
) ENGINE = InnoDB COMMENT ='硬件商品免密订单';
|
||||
|
||||
-- ----------------------------
|
||||
-- Table structure for hard_xfj_log
|
||||
-- ----------------------------
|
||||
DROP TABLE IF EXISTS `hard_xfj_log`;
|
||||
CREATE TABLE hard_xfj_log
|
||||
(
|
||||
id bigint NOT NULL AUTO_INCREMENT COMMENT '编号',
|
||||
unique_code varchar(64) NOT NULL COMMENT '设备唯一编号',
|
||||
hard_type varchar(32) NOT NULL COMMENT '设备类型',
|
||||
title varchar(64) NOT NULL COMMENT '接口标题',
|
||||
headers varchar(2048) COMMENT 'headers',
|
||||
res varchar(2048) COMMENT 'res',
|
||||
req varchar(2048) COMMENT 'req',
|
||||
error varchar(2048) COMMENT 'error',
|
||||
start_time datetime DEFAULT NULL COMMENT '开始时间',
|
||||
end_time datetime DEFAULT NULL COMMENT '结束时间',
|
||||
cost int DEFAULT NULL COMMENT '耗时(毫秒)',
|
||||
create_by varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人',
|
||||
create_time datetime DEFAULT NULL COMMENT '创建时间',
|
||||
update_by varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '修改人',
|
||||
update_time datetime DEFAULT NULL COMMENT '修改时间',
|
||||
del_flag char(1) COLLATE utf8mb4_general_ci DEFAULT '0' COMMENT '删除标记',
|
||||
tenant_id bigint DEFAULT NULL COMMENT '租户ID',
|
||||
PRIMARY KEY (id),
|
||||
UNIQUE KEY idx_unique_code (unique_code),
|
||||
KEY idx_hard_type (hard_type),
|
||||
KEY idx_title (title),
|
||||
KEY idx_start_time (start_time),
|
||||
KEY idx_end_time (end_time)
|
||||
) ENGINE = InnoDB COMMENT ='消费机日志';
|
||||
@@ -374,6 +374,8 @@ CREATE TABLE wallet_transaction
|
||||
title varchar(128) NOT NULL COMMENT '流水标题',
|
||||
price int NOT NULL COMMENT '交易金额, 单位分',
|
||||
balance int NOT NULL COMMENT '余额, 单位分',
|
||||
tags varchar(512) DEFAULT NULL COMMENT '财务统计标签，多个wallet_transaction_tag字典值使用英文逗号分隔',
|
||||
remark varchar(256) DEFAULT NULL COMMENT '流水备注，最多256个字符',
|
||||
create_by varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人',
|
||||
create_time datetime DEFAULT NULL COMMENT '创建时间',
|
||||
update_by varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '修改人',
|
||||
|
||||
@@ -0,0 +1,44 @@
|
||||
-- 线上慢 SQL 索引优化（OceanBase MySQL 模式）
|
||||
-- 执行前请确认同名索引不存在；建议低峰期逐条执行并观察建索引耗时。
|
||||
-- 本文件只包含索引 DDL，不包含任何数据修改。
|
||||
|
||||
-- P0：订单列表按租户、删除标记、创建时间倒序分页。
|
||||
CREATE INDEX idx_hard_order_tenant_del_ct_uid
|
||||
ON pjcloudx_hardware.hard_order (tenant_id, del_flag, create_time, user_id);
|
||||
|
||||
-- P0：订单号 + 订单类型 + 状态精确计数。
|
||||
CREATE INDEX idx_hard_order_tenant_del_order_lookup
|
||||
ON pjcloudx_hardware.hard_order (tenant_id, del_flag, order_no, order_type, order_status);
|
||||
|
||||
-- P0：设备侧订单号精确查询。
|
||||
CREATE INDEX idx_hard_order_tenant_del_android_code
|
||||
ON pjcloudx_hardware.hard_order (tenant_id, del_flag, android_order_code);
|
||||
|
||||
-- P0：每个订单取最新售后记录（GROUP BY order_id + MAX(id)）。
|
||||
CREATE INDEX idx_hard_after_sale_tenant_order_id
|
||||
ON pjcloudx_hardware.hard_after_sale (tenant_id, order_id, id);
|
||||
|
||||
-- P0：钱包流水按业务类型、时间倒序分页；biz_type 为 TINYTEXT，使用前缀索引。
|
||||
CREATE INDEX idx_wallet_tx_tenant_del_ct_uid
|
||||
ON pjcloudx_wallet.wallet_transaction (tenant_id, del_flag, create_time, user_id);
|
||||
|
||||
-- P0：钱包流水按业务类型、时间倒序分页；biz_type 为 TINYTEXT，使用前缀索引。
|
||||
CREATE INDEX idx_wallet_tx_tenant_del_biz_ct_uid
|
||||
ON pjcloudx_wallet.wallet_transaction (tenant_id, del_flag, biz_type(8), create_time, user_id);
|
||||
|
||||
-- P0：流程历史按办理人查询并按结束时间倒序。
|
||||
CREATE INDEX idx_act_hi_actinst_assignee_end
|
||||
ON pjcloudx_flow.act_hi_actinst (ASSIGNEE_, END_TIME_);
|
||||
|
||||
-- P1：支付状态 + 支付时间统计。先观察 P0 上线后的实际收益，再决定是否执行。
|
||||
-- CREATE INDEX idx_hard_order_tenant_del_status_ptime_mch
|
||||
-- ON pjcloudx_hardware.hard_order (tenant_id, del_flag, order_status, pay_time, merchant_id);
|
||||
|
||||
-- P1：指定商户部门的支付统计。索引较宽，按接口频率决定是否执行。
|
||||
-- CREATE INDEX idx_hard_order_tenant_del_mdept_status_mt_ptime
|
||||
-- ON pjcloudx_hardware.hard_order
|
||||
-- (tenant_id, del_flag, merchant_dept_id, order_status, merchant_type, pay_time);
|
||||
|
||||
-- P1：按钱包所属部门定位钱包 ID；维表较小时收益有限。
|
||||
-- CREATE INDEX idx_wallet_manage_tenant_dept_id
|
||||
-- ON pjcloudx_wallet.wallet_manage (tenant_id, dept_id, id);
|
||||
@@ -0,0 +1,54 @@
|
||||
# 线上慢 SQL 索引优化分析（2026-08-26）
|
||||
|
||||
## 数据范围
|
||||
|
||||
- 来源：`/Users/dengzhangchen/Downloads/rm-1fyg92tzhbt23g9hw_slowlog_*.csv`
|
||||
- 原始记录：638 条；按完整请求字段去重后 608 条；63 个 SQL Hash。
|
||||
- 数据库分布：`pjcloudx_hardware` 451 条、`pjcloudx_wallet` 153 条、`pjcloudx_flow` 4 条。
|
||||
- 主要扫描表：`hard_order`、`hard_after_sale`、`wallet_transaction`、`act_hi_actinst`。
|
||||
- 测试连接：OceanBase CE 4.3.5.5，MySQL 兼容模式；读取 `SHOW CREATE TABLE`、`SHOW INDEX`、`EXPLAIN`，并在测试库临时创建/回滚候选索引；未在生产库执行 DDL。
|
||||
|
||||
## 结论
|
||||
|
||||
### 强推荐，先上线
|
||||
|
||||
| 优先级 | 数据库/表 | 建议索引 | 主要覆盖日志 | 依据 |
|
||||
|---|---|---|---|---|
|
||||
| P0 | `pjcloudx_hardware.hard_order` | `(tenant_id, del_flag, create_time, user_id)` | 订单列表、分页 COUNT，Hash `270048891%7C1391`、`528608244%7C616` 等 | 现有索引的第三列是 `merchant_id` 或 `user_id`，无法同时支撑租户+删除标记后的时间倒序；临时索引验证后由扫描+TOP-N 变为反向范围扫描。 |
|
||||
| P0 | `pjcloudx_hardware.hard_order` | `(tenant_id, del_flag, order_no, order_type, order_status)` | 订单号精确 COUNT，Hash `_1019382644%7C138` | 原执行计划只能在统计索引上按 `order_status` 扫描，再回表过滤订单号/类型；临时索引验证为三列等值范围扫描。 |
|
||||
| P0 | `pjcloudx_hardware.hard_order` | `(tenant_id, del_flag, android_order_code)` | 设备订单号查询，Hash `_986870313%7C628` | 原计划扫描约 98 万行后回表过滤 `android_order_code`；临时索引验证为等值范围扫描。 |
|
||||
| P0 | `pjcloudx_hardware.hard_after_sale` | `(tenant_id, order_id, id)` | 订单列表中的“每单最新售后”子查询，覆盖 233 条相关记录 | 原表只有主键，`GROUP BY order_id + MAX(id)` 为全表扫描；临时索引验证后为有序范围扫描并使用 Merge Group By。 |
|
||||
| P0 | `pjcloudx_wallet.wallet_transaction` | `(tenant_id, del_flag, create_time, user_id)` | 无业务类型条件的钱包流水首页，Hash `698590166%7C408` | 原计划全表扫描并排序；临时索引验证后为反向范围扫描，直接取前 10 行。 |
|
||||
| P0 | `pjcloudx_wallet.wallet_transaction` | `(tenant_id, del_flag, biz_type(8), create_time, user_id)` | 钱包流水按业务类型筛选列表/COUNT，Hash `2036241023%7C466`、`255738862%7C620` 等 | `biz_type` 是 `TINYTEXT`，必须使用前缀索引；临时索引验证后可按租户、删除标记、业务类型及时间范围扫描。 |
|
||||
| P0 | `pjcloudx_flow.act_hi_actinst` | `(ASSIGNEE_, END_TIME_)` | 流程历史待办查询，Hash `_2096433074%7C126` | 原计划全表扫描并排序；临时索引验证后为反向范围扫描，直接满足 `ORDER BY END_TIME_ DESC LIMIT 10`。 |
|
||||
|
||||
### 条件推荐，先观察资源与收益
|
||||
|
||||
| 优先级 | 建议索引 | 适用场景 | 说明 |
|
||||
|---|---|---|---|
|
||||
| P1 | `pjcloudx_hardware.hard_order (tenant_id, del_flag, order_status, pay_time, merchant_id)` | 按支付状态+支付时间汇总，Hash `_1655261703%7C470` 等 | 临时索引可将范围缩小到状态/时间，但仍需要回表和聚合；建议 P0 上线后按 `EXPLAIN` 和实际耗时决定。 |
|
||||
| P1 | `pjcloudx_hardware.hard_order (tenant_id, del_flag, merchant_dept_id, order_status, merchant_type, pay_time)` | 指定商户部门的支付统计，Hash `1634334540%7C358` 等 | 对指定部门过滤收益明显；宽索引写放大较大，先对高频租户/接口评估。 |
|
||||
| P1 | `pjcloudx_wallet.wallet_manage (tenant_id, dept_id, id)` | 钱包按部门聚合 | 仅用于小维表定位钱包 ID；表规模较小时收益有限，适合与钱包统计接口一起验证。 |
|
||||
|
||||
## 暂不建议只靠加索引解决
|
||||
|
||||
- 统计类 SQL 使用派生表、外层权限过滤和 `ORDER BY CASE`，索引只能减少底层扫描，不能消除派生表物化/聚合成本；建议后续改为先过滤再聚合，并移除 COUNT 查询中的无意义排序。
|
||||
- `hard_order` 订单详情列表反复 `LEFT JOIN` 最新售后子查询；P0 索引后仍建议将“最新售后 ID”改为窗口/预聚合或单独维护字段。
|
||||
- `UPDATE hard_door_cabinet ... WHERE id = ? AND del_flag = ? AND tenant_id = ?` 已命中主键 `id`，慢点更可能是锁等待、事务或网络；加索引不能解决，需结合 `SHOW PROCESSLIST`、锁等待和事务耗时排查。
|
||||
|
||||
## 上线步骤
|
||||
|
||||
1. 低峰期逐条执行 `01_add_indexes.sql`，每条 DDL 单独观察完成时间和租户延迟。
|
||||
2. 执行前确认同名索引不存在；OceanBase 建索引可能持续几十秒到数分钟，不要重复提交。
|
||||
3. DDL 完成后对代表性 SQL 执行 `EXPLAIN`，确认使用新索引且不出现 `TABLE FULL SCAN`。
|
||||
4. 观察 15–30 分钟慢 SQL、CPU、IO、事务提交延迟；若写入延迟明显，再评估 P1 索引。
|
||||
5. 统计接口仍慢时，优先改写 SQL，再考虑继续增加宽复合索引。
|
||||
|
||||
## 验证记录
|
||||
|
||||
临时索引均已在测试库创建并回滚，最终检查无 `tmp_%` 索引残留。验证结果：
|
||||
|
||||
- 订单时间分页：`TABLE RANGE SCAN ... Reverse`，不再全表扫描/大范围 TOP-N。
|
||||
- 钱包业务流水：`TABLE RANGE SCAN ... Reverse`，`biz_type(8)` 前缀索引可用。
|
||||
- 最新售后：`MERGE GROUP BY` + `TABLE RANGE SCAN`，不再全表扫描。
|
||||
- 流程历史：`TABLE RANGE SCAN ... Reverse`，不再全表扫描。
|
||||
@@ -1,4 +1,4 @@
|
||||
MYSQL_HOST=123.157.250.162
|
||||
MYSQL_HOST=127.0.0.1
|
||||
MYSQL_PORT=33905
|
||||
MYSQL_USER=root@sys
|
||||
MYSQL_PWD=bsd.1799
|
||||
|
||||
+38
@@ -0,0 +1,38 @@
|
||||
package com.bsd.pjcloud.canteen.dto;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import lombok.Data;
|
||||
|
||||
import java.time.LocalDate;
|
||||
|
||||
/**
|
||||
* 收银终端按日期范围查询每日菜谱的请求参数。
|
||||
*/
|
||||
@Data
|
||||
@Schema(description = "收银终端每日菜谱日期范围查询参数")
|
||||
public class DailyMenuDateRangeQueryDTO {
|
||||
|
||||
/** 菜谱起始日期，查询闭区间包含当天。 */
|
||||
@NotNull(message = "菜谱开始日期不能为空")
|
||||
@Schema(description = "菜谱起始日期，格式为 yyyy-MM-dd", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
private LocalDate startDate;
|
||||
|
||||
/** 菜谱结束日期，查询闭区间包含当天。 */
|
||||
@NotNull(message = "菜谱结束日期不能为空")
|
||||
@Schema(description = "菜谱结束日期，格式为 yyyy-MM-dd", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
private LocalDate endDate;
|
||||
|
||||
/** 餐段协议编码；为空时查询全部餐段。 */
|
||||
@Schema(description = "餐段编码；为空表示全部餐段")
|
||||
private Integer hourType;
|
||||
|
||||
/** 菜品分类 ID；为空时查询全部分类。 */
|
||||
@Schema(description = "菜品分类 ID；为空表示全部分类")
|
||||
private Long categoryId;
|
||||
|
||||
/** 收银终端所属商户 ID，用于隔离不同商户的每日菜谱。 */
|
||||
@NotNull(message = "每日菜谱商户不能为空")
|
||||
@Schema(description = "收银终端所属商户 ID", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
private Long merchantId;
|
||||
}
|
||||
+7
@@ -3,6 +3,8 @@ package com.bsd.pjcloud.canteen.vo;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
|
||||
import java.time.LocalDate;
|
||||
|
||||
@Data
|
||||
public class ADCanteenDailyMenuListVO {
|
||||
/**
|
||||
@@ -10,6 +12,11 @@ public class ADCanteenDailyMenuListVO {
|
||||
*/
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 菜谱供应日期，yyyy-MM-dd；收银终端多日同步时以此归属到具体日期
|
||||
*/
|
||||
private LocalDate saleDate;
|
||||
|
||||
/**
|
||||
* spuid
|
||||
*/
|
||||
|
||||
+27
@@ -0,0 +1,27 @@
|
||||
package com.bsd.pjcloud.canteen.vo.app;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
@Schema(description = "套餐组成项（App）")
|
||||
public class OnlineSpuComboItemVO {
|
||||
|
||||
@Schema(description = "组成菜品 SPU id")
|
||||
private Long childSpuId;
|
||||
|
||||
@Schema(description = "组成菜品名称")
|
||||
private String name;
|
||||
|
||||
@Schema(description = "组成菜品封面")
|
||||
private String picUrl;
|
||||
|
||||
@Schema(description = "份数")
|
||||
private Integer quantity;
|
||||
|
||||
@Schema(description = "排序")
|
||||
private Integer sortOrder;
|
||||
|
||||
@Schema(description = "组成菜品单价（分，仅展示）")
|
||||
private Integer price;
|
||||
}
|
||||
+15
@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.bsd.pjcloud.canteen.dto.CanteenDailyMenuCVDTO;
|
||||
import com.bsd.pjcloud.canteen.dto.DailyMenuAll;
|
||||
import com.bsd.pjcloud.canteen.dto.DailyMenuDateRangeQueryDTO;
|
||||
import com.bsd.pjcloud.canteen.dto.app.DailyMenuDTO;
|
||||
import com.bsd.pjcloud.canteen.entity.CanteenSpuEntity;
|
||||
import com.bsd.pjcloud.canteen.service.CanteenSpuService;
|
||||
@@ -198,6 +199,20 @@ public class CanteenDailyMenuController {
|
||||
return R.ok(canteenDailyMenuService.getCanteenMenuListScope(day, hourType, categoryId,merchantId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 按闭区间（含起止两天）查询收银终端多日菜谱，字段与单日接口一致，
|
||||
* 每条记录额外携带供应日期 saleDate，便于终端按日期落库。
|
||||
*
|
||||
* @param request 日期范围、可选筛选条件和收银终端所属商户
|
||||
* @return 指定日期范围内的每日菜谱列表；无数据时返回空列表
|
||||
*/
|
||||
@PostMapping("/ad/getCanteenListByDateRange")
|
||||
@SysLog("按日期范围查询每日菜品列表")
|
||||
public R<List<ADCanteenDailyMenuListVO>> getCanteenListByDateRange(
|
||||
@Validated @RequestBody DailyMenuDateRangeQueryDTO request) {
|
||||
return R.ok(canteenDailyMenuService.getCanteenMenuListByDateRange(request));
|
||||
}
|
||||
|
||||
// --------------APP---------------
|
||||
|
||||
|
||||
|
||||
+11
@@ -1,6 +1,7 @@
|
||||
package com.bsd.pjcloud.canteen.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.bsd.pjcloud.canteen.dto.DailyMenuDateRangeQueryDTO;
|
||||
import com.bsd.pjcloud.canteen.dto.app.DailyMenuDTO;
|
||||
import com.bsd.pjcloud.canteen.vo.ADCanteenDailyMenuListVO;
|
||||
import com.bsd.pjcloud.canteen.vo.DailyMenuVO;
|
||||
@@ -31,6 +32,16 @@ public interface CanteenDailyMenuMapper extends PjcloudBaseMapper<CanteenDailyMe
|
||||
List<ADCanteenDailyMenuListVO> getCanteenMenuList(@Param("day") String day, @Param("hourType") Integer hourType,
|
||||
@Param("categoryId") Long categoryId, @Param("merchantId") Long merchantId,DataScope dataScope);
|
||||
|
||||
/**
|
||||
* 按闭区间查询收银终端多日菜谱展示数据，字段与单日查询保持一致。
|
||||
*
|
||||
* @param request 日期范围、可选筛选条件和商户 ID
|
||||
* @param dataScope 当前数据权限范围
|
||||
* @return 按日期、餐段和商品排序的菜谱列表
|
||||
*/
|
||||
List<ADCanteenDailyMenuListVO> getCanteenMenuListByDateRange(@Param("request") DailyMenuDateRangeQueryDTO request,
|
||||
DataScope dataScope);
|
||||
|
||||
|
||||
|
||||
Page<DailyMenuAppVO> selectTimeFoodPage(@Param("page")Page page, DailyMenuDTO dailyMenuDTO);
|
||||
|
||||
+10
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.bsd.pjcloud.canteen.dto.CanteenDailyMenuCVDTO;
|
||||
import com.bsd.pjcloud.canteen.dto.DailyMenuAll;
|
||||
import com.bsd.pjcloud.canteen.dto.DailyMenuDateRangeQueryDTO;
|
||||
import com.bsd.pjcloud.canteen.dto.app.DailyMenuDTO;
|
||||
import com.bsd.pjcloud.canteen.entity.CanteenDailyMenuEntity;
|
||||
import com.bsd.pjcloud.canteen.vo.ADCanteenDailyMenuListVO;
|
||||
@@ -51,6 +52,15 @@ public interface CanteenDailyMenuService extends IService<CanteenDailyMenuEntity
|
||||
*/
|
||||
List<ADCanteenDailyMenuListVO> getCanteenMenuListScope(String day, Integer hourType, Long categoryId, Long merchantId);
|
||||
|
||||
/**
|
||||
* 按闭区间查询收银终端多日菜谱，返回字段与单日查询保持一致，
|
||||
* 每条记录额外携带供应日期，供终端按日期分桶落库。
|
||||
*
|
||||
* @param request 日期范围、可选筛选条件和收银终端所属商户
|
||||
* @return 按日期、餐段和商品排序的菜谱列表
|
||||
*/
|
||||
List<ADCanteenDailyMenuListVO> getCanteenMenuListByDateRange(DailyMenuDateRangeQueryDTO request);
|
||||
|
||||
Page selectTimeFoodPage(Page page, DailyMenuDTO dailyMenuDTO);
|
||||
|
||||
|
||||
|
||||
+21
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.bsd.pjcloud.canteen.dto.CanteenDailyMenuCVDTO;
|
||||
import com.bsd.pjcloud.canteen.dto.DailyMenuAll;
|
||||
import com.bsd.pjcloud.canteen.dto.DailyMenuDateRangeQueryDTO;
|
||||
import com.bsd.pjcloud.canteen.dto.app.DailyMenuDTO;
|
||||
import com.bsd.pjcloud.canteen.entity.CanteenSpuEntity;
|
||||
import com.bsd.pjcloud.canteen.mapper.CanteenSpuMapper;
|
||||
@@ -142,6 +143,26 @@ public class CanteenDailyMenuServiceImpl extends ServiceImpl<CanteenDailyMenuMap
|
||||
return baseMapper.getCanteenMenuList(day, hourType, categoryId,merchantId, DataScope.of());
|
||||
}
|
||||
|
||||
/**
|
||||
* 按闭区间查询收银终端多日菜谱。
|
||||
*
|
||||
* @param request 日期范围、可选筛选条件和收银终端所属商户
|
||||
* @return 按日期、餐段和商品排序升序排列的菜谱列表
|
||||
*/
|
||||
@Override
|
||||
public List<ADCanteenDailyMenuListVO> getCanteenMenuListByDateRange(DailyMenuDateRangeQueryDTO request) {
|
||||
if (request == null || request.getStartDate() == null || request.getEndDate() == null) {
|
||||
throw new IllegalArgumentException("菜谱开始日期与结束日期不能为空");
|
||||
}
|
||||
if (request.getMerchantId() == null) {
|
||||
throw new IllegalArgumentException("每日菜谱商户不能为空");
|
||||
}
|
||||
if (request.getEndDate().isBefore(request.getStartDate())) {
|
||||
throw new IllegalArgumentException("菜谱结束日期不能早于开始日期");
|
||||
}
|
||||
return baseMapper.getCanteenMenuListByDateRange(request, DataScope.of());
|
||||
}
|
||||
|
||||
@Override
|
||||
public Page selectTimeFoodPage(Page page, DailyMenuDTO dailyMenuDTO) {
|
||||
Page<DailyMenuAppVO> pageData = baseMapper.selectTimeFoodPage(page, dailyMenuDTO);
|
||||
|
||||
+34
@@ -19,6 +19,7 @@
|
||||
|
||||
<resultMap id="adCanteenDailyMenuListVO" type="com.bsd.pjcloud.canteen.vo.ADCanteenDailyMenuListVO">
|
||||
<id property="id" column="id"/>
|
||||
<result property="saleDate" column="start_time"/>
|
||||
<result property="name" column="name"/>
|
||||
<result property="spuId" column="spu_id"/>
|
||||
<result property="hourType" column="hour_type"/>
|
||||
@@ -61,6 +62,7 @@
|
||||
SELECT
|
||||
sp.id as spu_id,
|
||||
t.id,
|
||||
t.start_time,
|
||||
sp.name,
|
||||
sp.pic_url,
|
||||
t.hour_type,
|
||||
@@ -90,6 +92,38 @@
|
||||
</if>
|
||||
</where>
|
||||
</select>
|
||||
<select id="getCanteenMenuListByDateRange" resultMap="adCanteenDailyMenuListVO">
|
||||
SELECT
|
||||
sp.id as spu_id,
|
||||
t.id,
|
||||
t.start_time,
|
||||
sp.name,
|
||||
sp.pic_url,
|
||||
t.hour_type,
|
||||
sp.price,
|
||||
sp.stock,
|
||||
sp.category_id,
|
||||
sp.sort,
|
||||
sp.is_price_increased,
|
||||
<!-- 数据权限拦截器会在当前查询外层按部门和创建人过滤，必须在临时结果集中透传这两个字段。 -->
|
||||
t.dept_id,
|
||||
t.create_by
|
||||
FROM canteen_daily_menu t
|
||||
LEFT JOIN canteen_spu sp
|
||||
on t.spu_id=sp.id
|
||||
<where>
|
||||
sp.del_flag = 0 and t.del_flag = 0
|
||||
AND t.start_time BETWEEN #{request.startDate} AND #{request.endDate}
|
||||
<if test="request.categoryId != null">
|
||||
AND sp.category_id = #{request.categoryId}
|
||||
</if>
|
||||
<if test="request.hourType != null">
|
||||
AND t.hour_type = #{request.hourType}
|
||||
</if>
|
||||
AND t.merchant_id = #{request.merchantId}
|
||||
</where>
|
||||
order by t.start_time asc, t.hour_type asc, sp.sort asc
|
||||
</select>
|
||||
<select id="selectTimeFoodPage" resultType="com.bsd.pjcloud.canteen.vo.app.DailyMenuAppVO"
|
||||
parameterType="com.bsd.pjcloud.canteen.dto.app.DailyMenuDTO">
|
||||
SELECT m.id,
|
||||
|
||||
+2
@@ -169,6 +169,8 @@ public interface CacheConstants {
|
||||
|
||||
String HARDER_ORDER_NON_PAY = "hard:order:non_pay";
|
||||
|
||||
String HARD_XFJ_WHITE_LIST_LOCK = "hard:xfj:whitelist:lock";
|
||||
|
||||
/* ************************************* end 订单相关 end ************************************* */
|
||||
|
||||
|
||||
|
||||
+44
@@ -0,0 +1,44 @@
|
||||
package com.bsd.pjcloud.hard.api.constant;
|
||||
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
|
||||
import java.util.Arrays;
|
||||
|
||||
/**
|
||||
* 打印任务失败阶段，帮助管理端区分配置问题、服务端故障和业务终端代理打印故障。
|
||||
*/
|
||||
@Getter
|
||||
@AllArgsConstructor
|
||||
public enum HardPrintFailureStageEnum {
|
||||
|
||||
/** 来源业务终端缺失、未绑定打印机或绑定关系失效。 */
|
||||
BINDING("BINDING", "设备绑定"),
|
||||
|
||||
/** 服务端读取业务数据、绘制 PNG 或上传文件失败。 */
|
||||
IMAGE_GENERATION("IMAGE_GENERATION", "图片生成"),
|
||||
|
||||
/** 服务端向绑定的来源业务终端发布 MQTT 消息失败。 */
|
||||
MQTT_DISPATCH("MQTT_DISPATCH", "MQTT下发"),
|
||||
|
||||
/** 来源业务终端下载图片、连接 USB 或写入 ESC/POS 数据失败。 */
|
||||
TERMINAL_PRINT("TERMINAL_PRINT", "终端打印");
|
||||
|
||||
/** 持久化阶段编码。 */
|
||||
private final String stage;
|
||||
|
||||
/** 阶段中文说明。 */
|
||||
private final String description;
|
||||
|
||||
/**
|
||||
* 按持久化编码解析失败阶段。
|
||||
*
|
||||
* @param stage 阶段编码
|
||||
* @return 匹配阶段；编码为空或未知时返回 {@code null}
|
||||
*/
|
||||
public static HardPrintFailureStageEnum valueOfByStage(String stage) {
|
||||
if (ObjectUtil.isEmpty(stage)) return null;
|
||||
return Arrays.stream(values()).filter(value -> ObjectUtil.equals(stage, value.stage)).findFirst().orElse(null);
|
||||
}
|
||||
}
|
||||
+27
-4
@@ -4,23 +4,46 @@ import cn.hutool.core.util.ObjectUtil;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
|
||||
import javax.xml.stream.events.StartDocument;
|
||||
import java.util.Arrays;
|
||||
|
||||
/**
|
||||
* 打印状态
|
||||
* 打印任务状态。
|
||||
*
|
||||
* <p>编码 {@code 1} 和 {@code 2} 分别兼容历史“已生成”和“已打印”记录。</p>
|
||||
*/
|
||||
@AllArgsConstructor
|
||||
@Getter
|
||||
public enum HardPrintStatusEnum {
|
||||
GENERATE("1", "已生成"),
|
||||
/** 任务已落库，等待后端生成并上传打印图片。 */
|
||||
PENDING_GENERATION("0", "待生成"),
|
||||
|
||||
/** 图片已生成并允许下发，历史枚举名保留为 GENERATE 以保持二进制兼容。 */
|
||||
GENERATE("1", "待打印"),
|
||||
|
||||
/** 来源业务终端已确认完整 USB 数据和切纸命令写入成功。 */
|
||||
PRINT("2", "已打印"),
|
||||
|
||||
/** 绑定、图片生成、MQTT 下发或业务终端代理打印阶段失败，可重试原任务。 */
|
||||
FAILED("3", "打印失败"),
|
||||
|
||||
/** 核销回退等业务动作取消了尚未打印的任务。 */
|
||||
CANCELLED("4", "已取消"),
|
||||
;
|
||||
|
||||
/** 持久化状态编码。 */
|
||||
private final String type;
|
||||
|
||||
/** 状态中文说明。 */
|
||||
private final String description;
|
||||
|
||||
/**
|
||||
* 按持久化编码解析打印状态。
|
||||
*
|
||||
* @param type 状态编码
|
||||
* @return 匹配状态；编码为空或未知时返回 {@code null}
|
||||
*/
|
||||
public static HardPrintStatusEnum valueOfByType(String type) {
|
||||
if (ObjectUtil.isEmpty(type)) return null;
|
||||
return Arrays.stream(values()).filter(v -> ObjectUtil.equals(type, v.getType())).findFirst().get();
|
||||
return Arrays.stream(values()).filter(v -> ObjectUtil.equals(type, v.getType())).findFirst().orElse(null);
|
||||
}
|
||||
}
|
||||
+38
@@ -0,0 +1,38 @@
|
||||
package com.bsd.pjcloud.hard.api.constant;
|
||||
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
|
||||
import java.util.Arrays;
|
||||
|
||||
/**
|
||||
* 打印凭证类型，用于选择后端图片模板和管理端业务动作。
|
||||
*/
|
||||
@Getter
|
||||
@AllArgsConstructor
|
||||
public enum HardPrintTypeEnum {
|
||||
|
||||
/** 支付订单的发票或消费小票。 */
|
||||
INVOICE("1", "发票"),
|
||||
|
||||
/** 预约订单核销成功后生成的纸质兑换凭证。 */
|
||||
REDEMPTION_VOUCHER("2", "兑换券");
|
||||
|
||||
/** 持久化类型编码。 */
|
||||
private final String type;
|
||||
|
||||
/** 类型中文说明。 */
|
||||
private final String description;
|
||||
|
||||
/**
|
||||
* 按持久化编码解析打印类型。
|
||||
*
|
||||
* @param type 类型编码
|
||||
* @return 匹配类型；编码为空或未知时返回 {@code null}
|
||||
*/
|
||||
public static HardPrintTypeEnum valueOfByType(String type) {
|
||||
if (ObjectUtil.isEmpty(type)) return null;
|
||||
return Arrays.stream(values()).filter(value -> ObjectUtil.equals(type, value.type)).findFirst().orElse(null);
|
||||
}
|
||||
}
|
||||
+14
@@ -23,8 +23,11 @@ public enum HardTypeEnum {
|
||||
OTHER("6", "其他支付方式(第三方接口对接)"),
|
||||
MERCHANT_ACT("7", "商户活动"),
|
||||
FARMER("8", "共富商城(助农)"),
|
||||
YUN_XFJ("9", "云版消费机"),
|
||||
YYX("10", "4G-云音响"),
|
||||
YYX_WIFI("11", "wifi-云音响"),
|
||||
/** 由绑定的超市或食堂 Android 终端代理驱动的无屏尔印 USB 打印机。 */
|
||||
EY_PRINT("12", "尔印打印机器"),
|
||||
;
|
||||
private final String type;
|
||||
private final String description;
|
||||
@@ -44,4 +47,15 @@ public enum HardTypeEnum {
|
||||
return Arrays.stream(values()).filter(v -> ObjectUtil.equals(type, v.getType())).findFirst().get();
|
||||
}
|
||||
|
||||
/**
|
||||
* 判断指定设备类型是否为尔印逻辑打印机资产。
|
||||
*
|
||||
* @param hardTypeEnum 待判断的设备类型
|
||||
* @return 类型为 {@link #EY_PRINT} 时返回 {@code true}
|
||||
*/
|
||||
public static boolean isPrintHard(HardTypeEnum hardTypeEnum) {
|
||||
if (ObjectUtil.isEmpty(hardTypeEnum)) return false;
|
||||
return List.of(EY_PRINT).contains(hardTypeEnum);
|
||||
}
|
||||
|
||||
}
|
||||
+19
@@ -0,0 +1,19 @@
|
||||
package com.bsd.pjcloud.hard.api.constant;
|
||||
|
||||
/**
|
||||
* 终端心跳场景。
|
||||
*
|
||||
* <p>枚举名称是终端与服务端之间的固定接口编码，不得随展示文案调整。</p>
|
||||
*/
|
||||
public enum TerminalHeartbeatSceneEnum {
|
||||
|
||||
/**
|
||||
* 普通在线心跳；收到后清除之前的计划更新断开原因。
|
||||
*/
|
||||
ONLINE,
|
||||
|
||||
/**
|
||||
* 自动更新安装前心跳；用于在应用重启期间保留可解释的离线原因。
|
||||
*/
|
||||
AUTO_UPDATE
|
||||
}
|
||||
+1
@@ -15,6 +15,7 @@ public enum HardHourTypeEnum {
|
||||
MORNING("1", "早餐"),
|
||||
NOONING("2", "午餐"),
|
||||
NIGHT("3", "晚餐"),
|
||||
LATE_NIGHT("4", "夜间餐"),
|
||||
;
|
||||
private final String type;
|
||||
private final String description;
|
||||
|
||||
+58
@@ -0,0 +1,58 @@
|
||||
package com.bsd.pjcloud.hard.api.constant.order;
|
||||
|
||||
import lombok.Getter;
|
||||
|
||||
import java.util.Arrays;
|
||||
|
||||
/**
|
||||
* 订单证据图片角色，编码用于唯一位置约束和跨端展示。
|
||||
*/
|
||||
@Getter
|
||||
public enum HardOrderEvidenceRoleEnum {
|
||||
|
||||
/**
|
||||
* 人脸库中被命中的后台参考人脸，由服务端从受信文件中心复制为订单快照。
|
||||
*/
|
||||
FACE_REFERENCE("FACE_REFERENCE", "后台参考人脸"),
|
||||
|
||||
/**
|
||||
* 终端实际通过比对的现场人脸裁剪图，由终端异步上传。
|
||||
*/
|
||||
FACE_LIVE("FACE_LIVE", "现场识别人脸"),
|
||||
|
||||
/**
|
||||
* 菜谱识别的现场餐盘图片预留角色，当前版本不创建该类证据。
|
||||
*/
|
||||
MENU_LIVE("MENU_LIVE", "餐盘现场图");
|
||||
|
||||
/**
|
||||
* 数据库和接口使用的稳定编码。
|
||||
*/
|
||||
private final String code;
|
||||
|
||||
/**
|
||||
* PC 订单详情使用的中文名称。
|
||||
*/
|
||||
private final String description;
|
||||
|
||||
/**
|
||||
* 构造订单证据图片角色。
|
||||
*
|
||||
* @param code 数据库与跨端协议编码
|
||||
* @param description 中文展示名称
|
||||
*/
|
||||
HardOrderEvidenceRoleEnum(String code, String description) {
|
||||
this.code = code;
|
||||
this.description = description;
|
||||
}
|
||||
|
||||
/**
|
||||
* 按协议编码解析图片角色，未知编码返回 {@code null}。
|
||||
*
|
||||
* @param code 数据库或接口编码
|
||||
* @return 对应角色；未知时返回 {@code null}
|
||||
*/
|
||||
public static HardOrderEvidenceRoleEnum valueOfCode(String code) {
|
||||
return Arrays.stream(values()).filter(item -> item.code.equals(code)).findFirst().orElse(null);
|
||||
}
|
||||
}
|
||||
+58
@@ -0,0 +1,58 @@
|
||||
package com.bsd.pjcloud.hard.api.constant.order;
|
||||
|
||||
import lombok.Getter;
|
||||
|
||||
import java.util.Arrays;
|
||||
|
||||
/**
|
||||
* 服务端订单证据状态，表达证据是否仍待补传、已经可查看或已永久缺失。
|
||||
*/
|
||||
@Getter
|
||||
public enum HardOrderEvidenceStatusEnum {
|
||||
|
||||
/**
|
||||
* 订单已记录识别元数据，但图片仍等待终端上传或服务端复制。
|
||||
*/
|
||||
PENDING("PENDING", "待补传"),
|
||||
|
||||
/**
|
||||
* 文件中心已经保存订单专属图片并可在订单详情中查看。
|
||||
*/
|
||||
AVAILABLE("AVAILABLE", "可查看"),
|
||||
|
||||
/**
|
||||
* 本地文件过期、损坏或参考图片变化，已确认无法继续补齐。
|
||||
*/
|
||||
UNAVAILABLE("UNAVAILABLE", "永久缺失");
|
||||
|
||||
/**
|
||||
* 数据库和接口使用的稳定编码。
|
||||
*/
|
||||
private final String code;
|
||||
|
||||
/**
|
||||
* PC 订单详情使用的中文名称。
|
||||
*/
|
||||
private final String description;
|
||||
|
||||
/**
|
||||
* 构造订单证据状态。
|
||||
*
|
||||
* @param code 数据库与跨端协议编码
|
||||
* @param description 中文展示名称
|
||||
*/
|
||||
HardOrderEvidenceStatusEnum(String code, String description) {
|
||||
this.code = code;
|
||||
this.description = description;
|
||||
}
|
||||
|
||||
/**
|
||||
* 按协议编码解析证据状态，未知编码返回 {@code null}。
|
||||
*
|
||||
* @param code 数据库或接口编码
|
||||
* @return 对应状态；未知时返回 {@code null}
|
||||
*/
|
||||
public static HardOrderEvidenceStatusEnum valueOfCode(String code) {
|
||||
return Arrays.stream(values()).filter(item -> item.code.equals(code)).findFirst().orElse(null);
|
||||
}
|
||||
}
|
||||
+53
@@ -0,0 +1,53 @@
|
||||
package com.bsd.pjcloud.hard.api.constant.order;
|
||||
|
||||
import lombok.Getter;
|
||||
|
||||
import java.util.Arrays;
|
||||
|
||||
/**
|
||||
* 订单证据业务类型，编码同时用于数据库、终端 SQLite 和跨端接口，禁止随展示文案调整。
|
||||
*/
|
||||
@Getter
|
||||
public enum HardOrderEvidenceTypeEnum {
|
||||
|
||||
/**
|
||||
* 人脸识别证据，当前版本保存后台参考人脸和现场识别人脸。
|
||||
*/
|
||||
FACE_RECOGNITION("FACE_RECOGNITION", "人脸识别"),
|
||||
|
||||
/**
|
||||
* 菜谱识别证据预留值，当前版本不执行菜谱识别或图片采集。
|
||||
*/
|
||||
MENU_RECOGNITION("MENU_RECOGNITION", "菜谱识别");
|
||||
|
||||
/**
|
||||
* 数据库和接口使用的稳定编码。
|
||||
*/
|
||||
private final String code;
|
||||
|
||||
/**
|
||||
* PC 订单详情使用的中文名称。
|
||||
*/
|
||||
private final String description;
|
||||
|
||||
/**
|
||||
* 构造订单证据业务类型。
|
||||
*
|
||||
* @param code 数据库与跨端协议编码
|
||||
* @param description 中文展示名称
|
||||
*/
|
||||
HardOrderEvidenceTypeEnum(String code, String description) {
|
||||
this.code = code;
|
||||
this.description = description;
|
||||
}
|
||||
|
||||
/**
|
||||
* 按协议编码解析证据类型，未知编码返回 {@code null} 供调用方拒绝非法请求。
|
||||
*
|
||||
* @param code 数据库或接口编码
|
||||
* @return 对应类型；未知时返回 {@code null}
|
||||
*/
|
||||
public static HardOrderEvidenceTypeEnum valueOfCode(String code) {
|
||||
return Arrays.stream(values()).filter(item -> item.code.equals(code)).findFirst().orElse(null);
|
||||
}
|
||||
}
|
||||
+5
@@ -20,6 +20,11 @@ public enum HardOrderStatusEnum {
|
||||
REFUND("10", "退款"),
|
||||
CANCEL("20", "已核销"),
|
||||
UNFOLLOW("30", "已取消(智能柜)"),
|
||||
TAKE_OUT_AWAIT("100", "待接单(外卖)"),
|
||||
TAKE_OUT_ING("110", "配送中(外卖)"),
|
||||
SHOP_WAIT_PAY_SUCCESS("200", "待发货/已支付(商城购买)"),
|
||||
SHOP_WAIT_RECEIVE("210", "待收货(商城购买)"),
|
||||
SHOP_WAIT_EVALUATE("220", "订单完成/待评价(商城购买)"),
|
||||
;
|
||||
private final String type;
|
||||
private final String description;
|
||||
|
||||
+2
@@ -21,6 +21,8 @@ public enum HardOrderTypeEnum {
|
||||
LB("6", "宁波银行(美好生活)"),
|
||||
FARMER("7", "共富商城(助农)"),
|
||||
TOC_VISITOR("8", "toc访客购买(不记名用户)"),
|
||||
XFJ("9", "消费机支付"),
|
||||
TAKE_OUT("10", "外卖"),
|
||||
;
|
||||
private final String type;
|
||||
private final String description;
|
||||
|
||||
+38
@@ -0,0 +1,38 @@
|
||||
package com.bsd.pjcloud.hard.api.constant.xfj;
|
||||
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
import com.bsd.pjcloud.hard.api.constant.order.HardPayTypeEnum;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
|
||||
import java.util.Arrays;
|
||||
|
||||
/**
|
||||
* 硬件授权类型
|
||||
*/
|
||||
@AllArgsConstructor
|
||||
@Getter
|
||||
public enum HardXfjTypeEnum {
|
||||
|
||||
QRCODE_PAY("10", "钱包二维码支付"),
|
||||
WECHAT_QRCODE_PAY("11", "微信二维码支付"),
|
||||
ALI_QRCODE_PAY("12", "支付宝二维码支付"),
|
||||
CARD_PAY("20", "饭卡支付"),
|
||||
;
|
||||
private final String type;
|
||||
private final String description;
|
||||
|
||||
public static HardXfjTypeEnum valueOfByType(String type) {
|
||||
if (ObjectUtil.isEmpty(type)) return null;
|
||||
return Arrays.stream(values()).filter(v -> ObjectUtil.equals(type, v.getType())).findFirst().orElse(null);
|
||||
}
|
||||
|
||||
public static HardPayTypeEnum getHardPayType(HardXfjTypeEnum type) {
|
||||
return switch (type) {
|
||||
case QRCODE_PAY -> HardPayTypeEnum.WALLET_QR_CODE;
|
||||
case WECHAT_QRCODE_PAY -> HardPayTypeEnum.WECHANT_SELF_QR_CODE_PAY;
|
||||
case ALI_QRCODE_PAY -> HardPayTypeEnum.ALI_SELF_QR_CODE_PAY;
|
||||
case CARD_PAY -> HardPayTypeEnum.WALLET_CARD;
|
||||
};
|
||||
}
|
||||
}
|
||||
+32
@@ -0,0 +1,32 @@
|
||||
package com.bsd.pjcloud.hard.api.dto;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* 管理端创建发票或兑换券打印任务的请求。
|
||||
*/
|
||||
@Data
|
||||
@Schema(description = "创建打印任务请求")
|
||||
public class HardPrintRequestDto {
|
||||
|
||||
/** 待打印凭证所属订单 ID。 */
|
||||
@NotNull(message = "订单ID不能为空")
|
||||
@Schema(description = "订单ID")
|
||||
private Long orderId;
|
||||
|
||||
/** 打印类型编码，1 发票、2 兑换券。 */
|
||||
@NotBlank(message = "打印类型不能为空")
|
||||
@Schema(description = "打印类型")
|
||||
private String printType;
|
||||
|
||||
/** 来源业务终端 ID；订单没有来源终端且同商户存在多个绑定时必填。 */
|
||||
@Schema(description = "来源业务终端ID")
|
||||
private Long sourceHardId;
|
||||
|
||||
/** 已打印任务再次创建下一序号时必填的重打原因。 */
|
||||
@Schema(description = "重打原因")
|
||||
private String reprintReason;
|
||||
}
|
||||
+45
@@ -0,0 +1,45 @@
|
||||
package com.bsd.pjcloud.hard.api.dto;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.validation.constraints.Min;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* 食堂或超市终端代理无屏 EY_PRINT 提交的打印结果回执。
|
||||
*/
|
||||
@Data
|
||||
@Schema(description = "业务终端代理打印结果回执")
|
||||
public class HardPrintResultDto {
|
||||
|
||||
/** hard_invoice 打印任务主键。 */
|
||||
@NotNull(message = "打印任务ID不能为空")
|
||||
@Schema(description = "打印任务ID")
|
||||
private Long taskId;
|
||||
|
||||
/** 任务所属订单 ID，用于阻断任务与订单错配。 */
|
||||
@NotNull(message = "订单ID不能为空")
|
||||
@Schema(description = "订单ID")
|
||||
private Long orderId;
|
||||
|
||||
/** 来源业务终端实际处理的重试版本。 */
|
||||
@NotNull(message = "重试版本不能为空")
|
||||
@Min(value = 0, message = "重试版本不能小于0")
|
||||
@Schema(description = "重试版本")
|
||||
private Integer retryVersion;
|
||||
|
||||
/** 完整 USB 数据及切纸命令是否已经被接口接受。 */
|
||||
@NotNull(message = "打印结果不能为空")
|
||||
@Schema(description = "是否成功")
|
||||
private Boolean success;
|
||||
|
||||
/** 本版本在来源业务终端执行的 USB 尝试次数。 */
|
||||
@NotNull(message = "尝试次数不能为空")
|
||||
@Min(value = 1, message = "尝试次数不能小于1")
|
||||
@Schema(description = "终端尝试次数")
|
||||
private Integer attemptCount;
|
||||
|
||||
/** 失败时的可诊断错误摘要，不得包含凭证或密码。 */
|
||||
@Schema(description = "错误摘要")
|
||||
private String errorMessage;
|
||||
}
|
||||
+31
@@ -0,0 +1,31 @@
|
||||
package com.bsd.pjcloud.hard.api.dto;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* 对既有打印任务执行失败重试或已打印重打的请求。
|
||||
*/
|
||||
@Data
|
||||
@Schema(description = "打印任务重试或重打请求")
|
||||
public class HardPrintRetryDto {
|
||||
|
||||
/** 既有 hard_invoice 打印任务主键。 */
|
||||
@NotNull(message = "打印任务ID不能为空")
|
||||
@Schema(description = "打印任务ID")
|
||||
private Long historyId;
|
||||
|
||||
/**
|
||||
* 失败任务需要补录的来源业务终端 ID。
|
||||
*
|
||||
* <p>仅当原任务因缺少来源终端而失败时使用；服务端仍会校验该终端与订单同商户，
|
||||
* 并根据服务端绑定关系确定目标 EY_PRINT，客户端不能直接指定打印机。</p>
|
||||
*/
|
||||
@Schema(description = "补录的来源业务终端ID")
|
||||
private Long sourceHardId;
|
||||
|
||||
/** 已打印任务重打时必须填写的原因；失败任务原任务重试时可为空。 */
|
||||
@Schema(description = "重打原因")
|
||||
private String reprintReason;
|
||||
}
|
||||
+23
@@ -0,0 +1,23 @@
|
||||
package com.bsd.pjcloud.hard.api.dto;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* 创建业务终端与无屏尔印 USB 打印机绑定关系的请求。
|
||||
*/
|
||||
@Data
|
||||
@Schema(description = "USB 打印机绑定请求")
|
||||
public class HardPrinterBindingDto {
|
||||
|
||||
/** SUPERMARKET 或 CANTEEN 来源终端 ID。 */
|
||||
@NotNull(message = "来源终端不能为空")
|
||||
@Schema(description = "来源业务终端ID")
|
||||
private Long sourceHardId;
|
||||
|
||||
/** EY_PRINT 逻辑打印机资产 ID。 */
|
||||
@NotNull(message = "打印机不能为空")
|
||||
@Schema(description = "逻辑打印机资产ID")
|
||||
private Long printerHardId;
|
||||
}
|
||||
+46
@@ -0,0 +1,46 @@
|
||||
package com.bsd.pjcloud.hard.api.dto;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* 保存无屏尔印 USB 打印机参数的请求。
|
||||
*/
|
||||
@Data
|
||||
@Schema(description = "USB 打印机配置请求")
|
||||
public class HardPrinterConfigDto {
|
||||
|
||||
/** EY_PRINT 逻辑打印机资产 ID。 */
|
||||
@NotNull(message = "打印机不能为空")
|
||||
@Schema(description = "逻辑打印机资产ID")
|
||||
private Long printerHardId;
|
||||
|
||||
/** 真机型号；未联调前允许为空。 */
|
||||
@Schema(description = "打印机型号")
|
||||
private String printerModel;
|
||||
|
||||
/** USB Vendor ID 十进制值；未联调前允许为空。 */
|
||||
@Schema(description = "USB VID")
|
||||
private Integer usbVendorId;
|
||||
|
||||
/** USB Product ID 十进制值；未联调前允许为空。 */
|
||||
@Schema(description = "USB PID")
|
||||
private Integer usbProductId;
|
||||
|
||||
/** 纸张宽度，首期只允许 80。 */
|
||||
@NotNull(message = "纸宽不能为空")
|
||||
@Schema(description = "纸宽，单位mm")
|
||||
private Integer paperWidth;
|
||||
|
||||
/** 自动切刀开关，1 开启、0 关闭。 */
|
||||
@NotBlank(message = "自动切刀开关不能为空")
|
||||
@Schema(description = "自动切刀开关")
|
||||
private String autoCut;
|
||||
|
||||
/** 图片指令模式，只允许 GS_V0 或 ESC_STAR。 */
|
||||
@NotBlank(message = "图片指令模式不能为空")
|
||||
@Schema(description = "图片指令模式")
|
||||
private String imageMode;
|
||||
}
|
||||
+37
@@ -0,0 +1,37 @@
|
||||
package com.bsd.pjcloud.hard.api.dto;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.validation.constraints.Max;
|
||||
import jakarta.validation.constraints.Min;
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import jakarta.validation.constraints.Size;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* 食堂或超市终端代理上报实际 USB 打印机信息的请求。
|
||||
*/
|
||||
@Data
|
||||
@Schema(description = "业务终端代理上报的 USB 打印机信息")
|
||||
public class HardPrinterInfoReportDto {
|
||||
|
||||
/** USB 描述符中的厂商和产品名称组合，最长保存 128 个字符。 */
|
||||
@NotBlank(message = "打印机型号不能为空")
|
||||
@Size(max = 128, message = "打印机型号不能超过128个字符")
|
||||
@Schema(description = "实际打印机型号")
|
||||
private String printerModel;
|
||||
|
||||
/** USB Vendor ID 十进制值，取值范围为无符号 16 位整数。 */
|
||||
@NotNull(message = "USB VID不能为空")
|
||||
@Min(value = 0, message = "USB VID必须在0到65535之间")
|
||||
@Max(value = 65535, message = "USB VID必须在0到65535之间")
|
||||
@Schema(description = "USB VID")
|
||||
private Integer usbVendorId;
|
||||
|
||||
/** USB Product ID 十进制值，取值范围为无符号 16 位整数。 */
|
||||
@NotNull(message = "USB PID不能为空")
|
||||
@Min(value = 0, message = "USB PID必须在0到65535之间")
|
||||
@Max(value = 65535, message = "USB PID必须在0到65535之间")
|
||||
@Schema(description = "USB PID")
|
||||
private Integer usbProductId;
|
||||
}
|
||||
+15
@@ -4,7 +4,9 @@ import com.bsd.pjcloud.hard.api.constant.HardTypeEnum;
|
||||
import com.bsd.pjcloud.hard.api.constant.order.HardOrderTypeEnum;
|
||||
import com.bsd.pjcloud.hard.api.constant.order.HardPayTypeEnum;
|
||||
import com.bsd.pjcloud.hard.api.dto.order.HardCreateCarDto;
|
||||
import com.bsd.pjcloud.hard.api.dto.order.HardOrderEvidenceMetadataDto;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.validation.Valid;
|
||||
import jakarta.validation.constraints.NotEmpty;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import lombok.AllArgsConstructor;
|
||||
@@ -78,4 +80,17 @@ public class HardCreateOrderDto {
|
||||
|
||||
@Schema(description = "离线支付是否成功")
|
||||
private Boolean offlinePaySuccess;
|
||||
|
||||
/**
|
||||
* 当前终端应用版本，仅用于订单证据问题追溯，不参与订单计价和支付。
|
||||
*/
|
||||
@Schema(description = "终端应用版本")
|
||||
private String appVersion;
|
||||
|
||||
/**
|
||||
* 人脸支付成功后需要挂接的证据元数据；旧终端不传时保持订单创建协议兼容。
|
||||
*/
|
||||
@Schema(description = "订单识别证据元数据")
|
||||
@Valid
|
||||
private List<HardOrderEvidenceMetadataDto> evidenceMetadataList;
|
||||
}
|
||||
+42
@@ -0,0 +1,42 @@
|
||||
package com.bsd.pjcloud.hard.api.dto.hard;
|
||||
|
||||
import jakarta.validation.constraints.Max;
|
||||
import jakarta.validation.constraints.Min;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* Android 终端离线人员快照分页请求。
|
||||
*
|
||||
* <p>按设备绑定部门树的用户主键升序做固定上界游标分页；部门和钱包类型均由
|
||||
* DEVICE-ID 解析，终端不可指定范围。首次请求 snapshotMaxId 传空，由服务端
|
||||
* 固定本次快照上界，后续请求必须原样携带。</p>
|
||||
*/
|
||||
@Data
|
||||
public class HardOfflineUserSyncDto {
|
||||
|
||||
/**
|
||||
* 排他游标；首页传 0，之后使用上一页返回的 nextAfterId。
|
||||
*/
|
||||
@NotNull(message = "离线人员同步游标不能为空")
|
||||
@Min(value = 0, message = "离线人员同步游标不能小于0")
|
||||
private Long afterId;
|
||||
|
||||
/**
|
||||
* 单页用户数量；默认 200，最大 500。
|
||||
*/
|
||||
@Min(value = 1, message = "离线人员同步分页大小必须大于0")
|
||||
@Max(value = 500, message = "离线人员同步分页大小不能超过500")
|
||||
private Integer limit;
|
||||
|
||||
/**
|
||||
* 首次请求由服务端固定的快照用户主键上界；后续请求原样携带。
|
||||
*/
|
||||
@Min(value = 0, message = "离线人员同步快照上界无效")
|
||||
private Long snapshotMaxId;
|
||||
|
||||
/**
|
||||
* 是否同步全租户人员；仅非生产调试使用，生产端点行为与本部门一致。
|
||||
*/
|
||||
private Boolean allTenant;
|
||||
}
|
||||
+21
@@ -0,0 +1,21 @@
|
||||
package com.bsd.pjcloud.hard.api.dto.hard;
|
||||
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import jakarta.validation.constraints.Size;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* Android 终端批量删除服务端人脸请求。
|
||||
*/
|
||||
@Data
|
||||
public class HardTerminalFaceDeleteDto {
|
||||
|
||||
/**
|
||||
* 待删除的虹软样本编号，设备部门由请求头解析，客户端不得指定。
|
||||
*/
|
||||
@NotNull(message = "人脸样本编号不能为空")
|
||||
@Size(min = 1, max = 500, message = "单次最多删除500条人脸")
|
||||
private List<String> sampleIds;
|
||||
}
|
||||
+23
@@ -0,0 +1,23 @@
|
||||
package com.bsd.pjcloud.hard.api.dto.hard;
|
||||
|
||||
import jakarta.validation.Valid;
|
||||
import jakarta.validation.constraints.NotEmpty;
|
||||
import jakarta.validation.constraints.Size;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* Android 终端批量上报在库人脸质量请求。
|
||||
*/
|
||||
@Data
|
||||
public class HardTerminalFaceQualityReportDto {
|
||||
|
||||
/**
|
||||
* 本批人脸质量结果；设备和部门身份仅从 DEVICE-ID 解析，单批最多 500 条。
|
||||
*/
|
||||
@Valid
|
||||
@NotEmpty(message = "人脸质量结果不能为空")
|
||||
@Size(max = 500, message = "单次最多上报500条人脸质量结果")
|
||||
private List<HardTerminalFaceQualityReportItemDto> items;
|
||||
}
|
||||
+49
@@ -0,0 +1,49 @@
|
||||
package com.bsd.pjcloud.hard.api.dto.hard;
|
||||
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import lombok.Data;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
/**
|
||||
* Android 终端提交的一条人脸静态图片质量结果。
|
||||
*/
|
||||
@Data
|
||||
public class HardTerminalFaceQualityReportItemDto {
|
||||
|
||||
/**
|
||||
* 虹软 32 位搜索样本编号；终端不得用用户编号替代。
|
||||
*/
|
||||
@NotBlank(message = "人脸样本编号不能为空")
|
||||
private String sampleId;
|
||||
|
||||
/**
|
||||
* 检测状态，跨端协议值仅允许 detected 或 failed。
|
||||
*/
|
||||
@NotBlank(message = "人脸质量检测状态不能为空")
|
||||
private String status;
|
||||
|
||||
/**
|
||||
* 虹软静态图片质量分，detected 时必填且范围为 0 到 1。
|
||||
*/
|
||||
private BigDecimal score;
|
||||
|
||||
/**
|
||||
* 终端检测所依据的人脸图片版本，来源于服务端人脸快照的 sourceUpdatedAt。
|
||||
*/
|
||||
@NotNull(message = "人脸图片版本不能为空")
|
||||
private LocalDateTime sourceUpdatedAt;
|
||||
|
||||
/**
|
||||
* 终端完成本次检测的本地时间，用于服务端拒绝旧结果覆盖新结果。
|
||||
*/
|
||||
@NotNull(message = "人脸质量检测时间不能为空")
|
||||
private LocalDateTime checkedAt;
|
||||
|
||||
/**
|
||||
* 虹软 SDK 或终端插件错误码，检测成功时为空。
|
||||
*/
|
||||
private Integer errorCode;
|
||||
}
|
||||
+85
@@ -0,0 +1,85 @@
|
||||
package com.bsd.pjcloud.hard.api.dto.hard;
|
||||
|
||||
import com.bsd.pjcloud.hard.api.constant.TerminalHeartbeatSceneEnum;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import jakarta.validation.constraints.Pattern;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 食堂、超市 Android 终端心跳请求。
|
||||
*/
|
||||
@Data
|
||||
@Schema(description = "终端心跳请求")
|
||||
public class TerminalHeartbeatDto {
|
||||
|
||||
/**
|
||||
* APK 展示版本号，来源于终端当前安装包；取不到时允许为空。
|
||||
*/
|
||||
@Schema(description = "APK展示版本号")
|
||||
private String apkVersionName;
|
||||
|
||||
/**
|
||||
* APK 内部版本码，来源于终端当前安装包；取不到时允许为空。
|
||||
*/
|
||||
@Schema(description = "APK内部版本码")
|
||||
private Long apkVersionCode;
|
||||
|
||||
/**
|
||||
* 本次上报场景，使用 {@link TerminalHeartbeatSceneEnum} 的固定接口名称。
|
||||
*/
|
||||
@NotNull(message = "心跳场景不能为空")
|
||||
@Schema(description = "心跳场景", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
private TerminalHeartbeatSceneEnum scene;
|
||||
|
||||
/**
|
||||
* Android 系统本次启动后的运行秒数，用于区分整机重启与应用进程重启。
|
||||
*/
|
||||
@Schema(description = "Android系统运行秒数")
|
||||
private Long systemUptimeSeconds;
|
||||
|
||||
/**
|
||||
* 当前应用进程运行秒数，用于识别应用崩溃或被系统重新拉起。
|
||||
*/
|
||||
@Schema(description = "应用进程运行秒数")
|
||||
private Long appUptimeSeconds;
|
||||
|
||||
/**
|
||||
* 最近上报时使用的网络类型，例如 ethernet、wifi、4g 或 offline。
|
||||
*/
|
||||
@Schema(description = "网络类型")
|
||||
private String networkType;
|
||||
|
||||
/**
|
||||
* 应用私有目录所在存储卷的可用空间，单位为字节。
|
||||
*/
|
||||
@Schema(description = "可用存储空间，单位字节")
|
||||
private Long availableStorageBytes;
|
||||
|
||||
/**
|
||||
* Root 最近检测状态，持久化值固定为 unknown、available 或 unavailable。
|
||||
*/
|
||||
@Pattern(regexp = "unknown|available|unavailable", message = "Root状态不正确")
|
||||
@Schema(description = "Root状态")
|
||||
private String rootStatus;
|
||||
|
||||
/**
|
||||
* 当前应用是否已被 Android 配置为 Device Owner；无法读取时为空。
|
||||
*/
|
||||
@Schema(description = "是否为Device Owner")
|
||||
private Boolean deviceOwner;
|
||||
|
||||
/**
|
||||
* 最近上报时是否处于 Kiosk 锁定任务模式；无法读取时为空。
|
||||
*/
|
||||
@Schema(description = "是否处于Kiosk模式")
|
||||
private Boolean kioskActive;
|
||||
|
||||
/**
|
||||
* 可选外围硬件状态，以稳定功能编码映射布尔值，例如 printer、steelyard、cardReader、subScreen。
|
||||
*/
|
||||
@Schema(description = "可选外围硬件状态")
|
||||
private Map<String, Boolean> deviceStatus;
|
||||
}
|
||||
+47
@@ -0,0 +1,47 @@
|
||||
package com.bsd.pjcloud.hard.api.dto.manager;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
/**
|
||||
* 终端日志管理端查询条件。
|
||||
*/
|
||||
@Data
|
||||
@Schema(description = "终端日志文件查询条件")
|
||||
public class HardTerminalLogFileQueryDto {
|
||||
|
||||
@Schema(description = "设备ID")
|
||||
private Long hardId;
|
||||
|
||||
@Schema(description = "设备名称")
|
||||
private String hardName;
|
||||
|
||||
@Schema(description = "设备唯一编号")
|
||||
private String uniqueCode;
|
||||
|
||||
@Schema(description = "商户ID")
|
||||
private Long merchantId;
|
||||
|
||||
@Schema(description = "部门ID")
|
||||
private Long deptId;
|
||||
|
||||
@DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
|
||||
@Schema(description = "日志日期开始")
|
||||
private LocalDate logDateStart;
|
||||
|
||||
@DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
|
||||
@Schema(description = "日志日期结束")
|
||||
private LocalDate logDateEnd;
|
||||
|
||||
@DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
|
||||
@Schema(description = "上传时间开始")
|
||||
private LocalDateTime uploadTimeStart;
|
||||
|
||||
@DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
|
||||
@Schema(description = "上传时间结束")
|
||||
private LocalDateTime uploadTimeEnd;
|
||||
}
|
||||
+32
@@ -0,0 +1,32 @@
|
||||
package com.bsd.pjcloud.hard.api.dto.manager;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.validation.constraints.Min;
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import jakarta.validation.constraints.Pattern;
|
||||
import jakarta.validation.constraints.Size;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* 终端日志上传预检参数。
|
||||
*/
|
||||
@Data
|
||||
@Schema(description = "终端日志上传预检参数")
|
||||
public class HardTerminalLogPreflightDto {
|
||||
|
||||
@NotBlank(message = "日志相对路径不能为空")
|
||||
@Size(max = 255, message = "日志相对路径不能超过255个字符")
|
||||
@Schema(description = "终端日志根目录下的相对路径")
|
||||
private String relativePath;
|
||||
|
||||
@NotNull(message = "文件大小不能为空")
|
||||
@Min(value = 0, message = "文件大小不能小于0")
|
||||
@Schema(description = "脱敏文件大小")
|
||||
private Long fileSize;
|
||||
|
||||
@NotBlank(message = "文件哈希不能为空")
|
||||
@Pattern(regexp = "(?i)^[0-9a-f]{32}$", message = "文件哈希必须为32位MD5")
|
||||
@Schema(description = "脱敏文件MD5")
|
||||
private String fileHash;
|
||||
}
|
||||
+43
@@ -0,0 +1,43 @@
|
||||
package com.bsd.pjcloud.hard.api.dto.manager;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import jakarta.validation.constraints.Size;
|
||||
import lombok.Data;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
/**
|
||||
* 终端日志上传元数据。设备快照由服务端根据请求头中的设备ID填充。
|
||||
*/
|
||||
@Data
|
||||
@Schema(description = "终端日志上传元数据")
|
||||
public class HardTerminalLogUploadDto {
|
||||
|
||||
@NotBlank(message = "日志相对路径不能为空")
|
||||
@Size(max = 255, message = "日志相对路径不能超过255个字符")
|
||||
@Schema(description = "终端日志根目录下的相对路径")
|
||||
private String relativePath;
|
||||
|
||||
@NotNull(message = "日志日期不能为空")
|
||||
@DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
|
||||
@Schema(description = "日志所属日期")
|
||||
private LocalDate logDate;
|
||||
|
||||
@NotNull(message = "本地修改时间不能为空")
|
||||
@DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
|
||||
@Schema(description = "终端本地文件最后修改时间")
|
||||
private LocalDateTime fileModifiedTime;
|
||||
|
||||
@Size(max = 64, message = "应用版本不能超过64个字符")
|
||||
@Schema(description = "应用版本")
|
||||
private String appVersion;
|
||||
|
||||
@NotBlank(message = "脱敏规则版本不能为空")
|
||||
@Size(max = 32, message = "脱敏规则版本不能超过32个字符")
|
||||
@Schema(description = "脱敏规则版本")
|
||||
private String sanitizeVersion;
|
||||
}
|
||||
+32
@@ -0,0 +1,32 @@
|
||||
package com.bsd.pjcloud.hard.api.dto.order;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 智能柜订单手动结算(第三方识别不可用时,人工核对视频后结算)
|
||||
*/
|
||||
@Data
|
||||
public class HardDoorManualSettleDto {
|
||||
|
||||
@Schema(description = "订单id", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
private Long orderId;
|
||||
|
||||
@Schema(description = "手动选择的商品列表", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
private List<Item> items;
|
||||
|
||||
@Schema(description = "操作备注(选填,记录人工判断依据)")
|
||||
private String reason;
|
||||
|
||||
@Data
|
||||
public static class Item {
|
||||
|
||||
@Schema(description = "智能柜商品id(hard_spu主键)", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
private Long productId;
|
||||
|
||||
@Schema(description = "数量", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
private Integer productCount;
|
||||
}
|
||||
}
|
||||
+4
-2
@@ -1,6 +1,6 @@
|
||||
package com.bsd.pjcloud.hard.api.dto.order;
|
||||
|
||||
import com.bsd.pjcloud.admin.api.vo.base.BaseIsIncludeTreeInterface;
|
||||
import com.bsd.pjcloud.admin.api.vo.base.BaseIsIncludeDeptMchTreeInterface;
|
||||
import com.bsd.pjcloud.common.core.constant.enums.DateRangeTypeEnum;
|
||||
import com.bsd.pjcloud.hard.api.entity.order.HardOrderEntity;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
@@ -11,7 +11,7 @@ import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
public class HardOrderDto extends HardOrderEntity implements BaseIsIncludeTreeInterface {
|
||||
public class HardOrderDto extends HardOrderEntity implements BaseIsIncludeDeptMchTreeInterface {
|
||||
|
||||
private DateRangeTypeEnum dateRangeType = DateRangeTypeEnum.YESTERDAY;
|
||||
|
||||
@@ -25,6 +25,8 @@ public class HardOrderDto extends HardOrderEntity implements BaseIsIncludeTreeIn
|
||||
|
||||
private List<Long> merchantDeptIds;
|
||||
|
||||
private Boolean isIncludeMerchantDept = false;
|
||||
|
||||
private List<Long> orderIds;
|
||||
|
||||
private List<Long> hardIds;
|
||||
|
||||
+130
@@ -0,0 +1,130 @@
|
||||
package com.bsd.pjcloud.hard.api.dto.order;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.validation.constraints.DecimalMax;
|
||||
import jakarta.validation.constraints.DecimalMin;
|
||||
import jakarta.validation.constraints.Max;
|
||||
import jakarta.validation.constraints.Min;
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import jakarta.validation.constraints.Pattern;
|
||||
import jakarta.validation.constraints.Size;
|
||||
import lombok.Data;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
/**
|
||||
* 订单创建和证据补传共用的识别元数据，不包含图片字节和服务端文件信息。
|
||||
*/
|
||||
@Data
|
||||
@Schema(description = "订单识别证据元数据")
|
||||
public class HardOrderEvidenceMetadataDto {
|
||||
|
||||
/**
|
||||
* 证据业务类型，使用 HardOrderEvidenceTypeEnum 的稳定编码。
|
||||
*/
|
||||
@NotBlank(message = "证据类型不能为空")
|
||||
@Size(max = 32, message = "证据类型不能超过32个字符")
|
||||
@Schema(description = "证据类型")
|
||||
private String evidenceType;
|
||||
|
||||
/**
|
||||
* 图片角色，使用 HardOrderEvidenceRoleEnum 的稳定编码。
|
||||
*/
|
||||
@NotBlank(message = "证据图片角色不能为空")
|
||||
@Size(max = 32, message = "证据图片角色不能超过32个字符")
|
||||
@Schema(description = "证据图片角色")
|
||||
private String evidenceRole;
|
||||
|
||||
/**
|
||||
* 同类型同角色下的图片序号，从0开始；人脸证据固定为0，菜谱识别可递增。
|
||||
*/
|
||||
@NotNull(message = "证据图片序号不能为空")
|
||||
@Min(value = 0, message = "证据图片序号不能小于0")
|
||||
@Max(value = 99, message = "证据图片序号不能大于99")
|
||||
@Schema(description = "证据图片序号")
|
||||
private Integer sequenceNo;
|
||||
|
||||
/**
|
||||
* 识别用户主键；未识别到平台用户时为空，不能由终端使用其他用户替代。
|
||||
*/
|
||||
@Schema(description = "识别用户主键")
|
||||
private Long userId;
|
||||
|
||||
/**
|
||||
* 虹软搜索样本编号；仅人脸识别角色使用，服务端据此校验后台参考人脸。
|
||||
*/
|
||||
@Size(max = 64, message = "人脸样本编号不能超过64个字符")
|
||||
@Schema(description = "人脸样本编号")
|
||||
private String faceSampleId;
|
||||
|
||||
/**
|
||||
* 识别时终端人脸库记录的参考图片地址，仅作为服务端复制参考图的线索，不直接作为可访问地址返回。
|
||||
*/
|
||||
@Size(max = 512, message = "参考人脸地址不能超过512个字符")
|
||||
@Schema(description = "参考人脸地址")
|
||||
private String referenceImageUrl;
|
||||
|
||||
/**
|
||||
* 识别时终端人脸快照对应的后台更新时间；旧终端允许为空，新终端用于识别同地址内容替换。
|
||||
*/
|
||||
@JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss[.SSS]", timezone = "Asia/Shanghai")
|
||||
@DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
|
||||
@Schema(description = "参考人脸来源版本")
|
||||
private LocalDateTime referenceImageVersion;
|
||||
|
||||
/**
|
||||
* 识别时实际相似度，取值0到1；为空表示当前证据类型不使用相似度。
|
||||
*/
|
||||
@DecimalMin(value = "0", message = "相似度不能小于0")
|
||||
@DecimalMax(value = "1", message = "相似度不能大于1")
|
||||
@Schema(description = "识别相似度")
|
||||
private BigDecimal similarity;
|
||||
|
||||
/**
|
||||
* 识别时终端生效的相似度阈值快照，取值0到1。
|
||||
*/
|
||||
@DecimalMin(value = "0", message = "相似度阈值不能小于0")
|
||||
@DecimalMax(value = "1", message = "相似度阈值不能大于1")
|
||||
@Schema(description = "相似度阈值快照")
|
||||
private BigDecimal similarityThreshold;
|
||||
|
||||
/**
|
||||
* 终端实际完成识别的本地时间；为空时服务端仅保留订单创建时间。
|
||||
*/
|
||||
@JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss[.SSS]", timezone = "Asia/Shanghai")
|
||||
@DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
|
||||
@Schema(description = "终端采集时间")
|
||||
private LocalDateTime capturedAt;
|
||||
|
||||
/**
|
||||
* 终端按原始证据文件计算的 SHA-256；图片尚未生成或永久缺失时允许为空。
|
||||
*/
|
||||
@Pattern(regexp = "(?i)^[0-9a-f]{64}$", message = "图片哈希必须为64位SHA-256")
|
||||
@Schema(description = "图片SHA-256")
|
||||
private String imageHash;
|
||||
|
||||
/**
|
||||
* 终端证据文件大小，单位字节；参考图无法读取或文件尚未生成时允许为空。
|
||||
*/
|
||||
@Min(value = 0, message = "图片大小不能小于0")
|
||||
@Schema(description = "图片大小，单位字节")
|
||||
private Long imageSize;
|
||||
|
||||
/**
|
||||
* 终端解码后的图片宽度，单位像素。
|
||||
*/
|
||||
@Min(value = 1, message = "图片宽度必须大于0")
|
||||
@Schema(description = "图片宽度，单位像素")
|
||||
private Integer imageWidth;
|
||||
|
||||
/**
|
||||
* 终端解码后的图片高度，单位像素。
|
||||
*/
|
||||
@Min(value = 1, message = "图片高度必须大于0")
|
||||
@Schema(description = "图片高度，单位像素")
|
||||
private Integer imageHeight;
|
||||
}
|
||||
+45
@@ -0,0 +1,45 @@
|
||||
package com.bsd.pjcloud.hard.api.dto.order;
|
||||
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.validation.constraints.AssertTrue;
|
||||
import jakarta.validation.constraints.Positive;
|
||||
import jakarta.validation.constraints.Size;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
/**
|
||||
* 终端订单识别证据的订单定位参数。
|
||||
*
|
||||
* <p>消费机现场下单继续使用终端订单号对账；预约核销订单不是当前终端创建的，核销成功后改用
|
||||
* 服务端订单 ID 定位。两种方式都必须结合请求头中的设备 ID 校验订单归属。</p>
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Schema(description = "订单识别证据的订单定位参数")
|
||||
public abstract class HardOrderEvidenceOrderRefDto extends HardOrderEvidenceMetadataDto {
|
||||
|
||||
/**
|
||||
* 终端本地稳定订单号，用于消费机现场下单后对账；预约核销证据允许为空。
|
||||
*/
|
||||
@Size(max = 128, message = "终端订单号不能超过128个字符")
|
||||
@Schema(description = "终端订单号，与服务端订单ID二选一")
|
||||
private String androidOrderCode;
|
||||
|
||||
/**
|
||||
* 已存在的服务端订单主键，仅用于当前设备已经成功核销的预约订单；现场下单证据允许为空。
|
||||
*/
|
||||
@Positive(message = "服务端订单ID必须大于0")
|
||||
@Schema(description = "服务端订单ID，与终端订单号二选一")
|
||||
private Long orderId;
|
||||
|
||||
/**
|
||||
* 校验至少提供一种订单定位信息，防止无条件查询或写入订单证据。
|
||||
*
|
||||
* @return 提供终端订单号或服务端订单 ID 时返回 {@code true}
|
||||
*/
|
||||
@AssertTrue(message = "终端订单号和服务端订单ID不能同时为空")
|
||||
public boolean isOrderReferencePresent() {
|
||||
return StrUtil.isNotBlank(androidOrderCode) || orderId != null;
|
||||
}
|
||||
}
|
||||
+38
@@ -0,0 +1,38 @@
|
||||
package com.bsd.pjcloud.hard.api.dto.order;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
import jakarta.validation.constraints.Size;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
/**
|
||||
* 终端提交订单证据元数据或永久缺失结果的请求。
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Schema(description = "订单证据元数据提交请求")
|
||||
public class HardOrderEvidenceSubmitDto extends HardOrderEvidenceOrderRefDto {
|
||||
|
||||
/**
|
||||
* 终端请求写入的目标状态，仅允许 PENDING 或 UNAVAILABLE；现场图片上传成功由服务端改为 AVAILABLE。
|
||||
*/
|
||||
@NotBlank(message = "证据状态不能为空")
|
||||
@Size(max = 32, message = "证据状态不能超过32个字符")
|
||||
@Schema(description = "证据状态")
|
||||
private String status;
|
||||
|
||||
/**
|
||||
* 永久缺失原因；状态为 UNAVAILABLE 时必填，禁止包含本地完整敏感路径。
|
||||
*/
|
||||
@Size(max = 500, message = "失败原因不能超过500个字符")
|
||||
@Schema(description = "永久缺失原因")
|
||||
private String failureReason;
|
||||
|
||||
/**
|
||||
* 产生识别证据的终端应用版本，用于问题追溯。
|
||||
*/
|
||||
@Size(max = 64, message = "应用版本不能超过64个字符")
|
||||
@Schema(description = "终端应用版本")
|
||||
private String appVersion;
|
||||
}
|
||||
+22
@@ -0,0 +1,22 @@
|
||||
package com.bsd.pjcloud.hard.api.dto.order;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.validation.constraints.Size;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
/**
|
||||
* 终端上传订单现场证据图片时随 multipart 一并提交的元数据。
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Schema(description = "订单现场证据上传请求")
|
||||
public class HardOrderEvidenceUploadDto extends HardOrderEvidenceOrderRefDto {
|
||||
|
||||
/**
|
||||
* 产生识别证据的终端应用版本，用于问题追溯。
|
||||
*/
|
||||
@Size(max = 64, message = "应用版本不能超过64个字符")
|
||||
@Schema(description = "终端应用版本")
|
||||
private String appVersion;
|
||||
}
|
||||
+51
@@ -0,0 +1,51 @@
|
||||
package com.bsd.pjcloud.hard.api.dto.order.xfj;
|
||||
|
||||
import com.bsd.pjcloud.hard.api.constant.xfj.HardXfjTypeEnum;
|
||||
import com.bsd.pjcloud.thirdparty.constant.miniplatform.AppPlusPlatformTypeEnum;
|
||||
import com.bsd.pjcloud.wallet.api.constant.WalletTypeEnum;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class HardXfjFastCreateOrderDto {
|
||||
|
||||
/**
|
||||
* 用户id
|
||||
*/
|
||||
private Long userId;
|
||||
|
||||
/**
|
||||
* 设备id
|
||||
*/
|
||||
private Long hardId;
|
||||
|
||||
/**
|
||||
* 订单编号
|
||||
*/
|
||||
private String orderNo;
|
||||
|
||||
/**
|
||||
* 支付金额(分)
|
||||
*/
|
||||
private int price;
|
||||
|
||||
/**
|
||||
* 钱包类型
|
||||
*/
|
||||
private WalletTypeEnum walletType;
|
||||
|
||||
/**
|
||||
* 消费机支付类型
|
||||
*/
|
||||
private HardXfjTypeEnum xfjPayType;
|
||||
|
||||
/**
|
||||
* 终端支付类型
|
||||
*/
|
||||
private AppPlusPlatformTypeEnum platformType;
|
||||
|
||||
/**
|
||||
* 付款码支付code
|
||||
*/
|
||||
private String devicePayCode;
|
||||
|
||||
}
|
||||
+18
@@ -0,0 +1,18 @@
|
||||
package com.bsd.pjcloud.hard.api.dto.xfj;
|
||||
|
||||
import com.bsd.pjcloud.hard.api.entity.xfj.HardXfjLogEntity;
|
||||
import lombok.Data;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Data
|
||||
public class HardXfjLogDto extends HardXfjLogEntity {
|
||||
|
||||
/**
|
||||
* 设备名称
|
||||
*/
|
||||
private String hardName;
|
||||
|
||||
private LocalDateTime[] createTimeList;
|
||||
|
||||
}
|
||||
+72
@@ -0,0 +1,72 @@
|
||||
package com.bsd.pjcloud.hard.api.dto.xfj;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
public class XfjConsumTransactionsDto {
|
||||
|
||||
/**
|
||||
* 消费序号(年月日时分秒+2个字节序号(0~65535)),用于识别上传数据不重复
|
||||
*/
|
||||
private String Order;
|
||||
|
||||
/**
|
||||
* 10进制卡序列号(实体卡号或虚拟卡号)
|
||||
*/
|
||||
private String CardNo;
|
||||
|
||||
/**
|
||||
* 卡模式
|
||||
* 0:实体卡
|
||||
* 1:电子卡
|
||||
*/
|
||||
private Integer CardMode;
|
||||
|
||||
/**
|
||||
* 交易模式
|
||||
* 0: 刷卡扣费
|
||||
* 1: 现金充值
|
||||
* 2: 余额查询
|
||||
* 3: 钱包转账
|
||||
* 4: 现金退款
|
||||
*/
|
||||
private Integer Mode;
|
||||
|
||||
/**
|
||||
* 扣费类型
|
||||
* 0:手动
|
||||
* 1:菜单
|
||||
* 2:定值
|
||||
* 3:取餐
|
||||
* 4:计时
|
||||
* 5:计次
|
||||
*/
|
||||
private Integer PayType;
|
||||
|
||||
/**
|
||||
* 消费金额(Mode为2时,此字段传入值可能为0)
|
||||
*/
|
||||
private String Amount;
|
||||
|
||||
/**
|
||||
* 菜品消费列表
|
||||
*/
|
||||
List<Menus> Menus;
|
||||
|
||||
@Data
|
||||
static public class Menus {
|
||||
|
||||
/**
|
||||
* 菜品编号(与菜品查询接口菜品编号一致)
|
||||
*/
|
||||
private String MenuID;
|
||||
|
||||
/**
|
||||
* 菜品数量(支持小数)
|
||||
*/
|
||||
private String Count;
|
||||
|
||||
}
|
||||
}
|
||||
+13
@@ -0,0 +1,13 @@
|
||||
package com.bsd.pjcloud.hard.api.dto.xfj;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class XfjMenusDto {
|
||||
|
||||
/**
|
||||
* 菜品编号(操作员在消费机键盘输入的数字)
|
||||
*/
|
||||
private String MenuNo;
|
||||
|
||||
}
|
||||
+48
@@ -0,0 +1,48 @@
|
||||
package com.bsd.pjcloud.hard.api.dto.xfj;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class XfjOffLinesDto {
|
||||
|
||||
/**
|
||||
* 终端设备ID
|
||||
*/
|
||||
private Integer DeviceNumber;
|
||||
|
||||
/**
|
||||
* 消费序号(年月日时分秒+2个字节序号)，用于识别上传数据不重复
|
||||
*/
|
||||
private String Order;
|
||||
|
||||
/**
|
||||
* 扣费类型
|
||||
* 0:手动模式
|
||||
* 1:菜单模式
|
||||
* 2:定值模式
|
||||
*/
|
||||
private Integer PayType;
|
||||
|
||||
/**
|
||||
* 卡模式
|
||||
* 0:实体卡
|
||||
* 1:电子卡
|
||||
*/
|
||||
private Integer CardMode;
|
||||
|
||||
/**
|
||||
* 消费时间年月日时分秒
|
||||
*/
|
||||
private String Time;
|
||||
|
||||
/**
|
||||
* 卡号10进制(实体卡号或虚拟卡号)
|
||||
*/
|
||||
private String CardNo;
|
||||
|
||||
/**
|
||||
* 扣费金额
|
||||
*/
|
||||
private String Money;
|
||||
|
||||
}
|
||||
+25
@@ -0,0 +1,25 @@
|
||||
package com.bsd.pjcloud.hard.api.dto.xfj;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class XfjOrderQueryDto {
|
||||
|
||||
/**
|
||||
* 消费序号(年月日时分秒+2个字节序号(0~65535))，用于识别上传数据不重复
|
||||
*/
|
||||
private String Order;
|
||||
|
||||
/**
|
||||
* 10进制卡序列号(实体卡号或虚拟卡号)
|
||||
*/
|
||||
private String CardNo;
|
||||
|
||||
/**
|
||||
* 卡模式
|
||||
* 0:实体卡
|
||||
* 1:电子卡
|
||||
*/
|
||||
private Integer CardMode;
|
||||
|
||||
}
|
||||
+17
@@ -0,0 +1,17 @@
|
||||
package com.bsd.pjcloud.hard.api.dto.xfj;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class XfjOrderRefundDto {
|
||||
|
||||
/**
|
||||
* 消费订单号(最大30字符)
|
||||
*/
|
||||
private String OrderSeralid;
|
||||
|
||||
/**
|
||||
* 退款金额
|
||||
*/
|
||||
private String Amount;
|
||||
}
|
||||
+55
@@ -0,0 +1,55 @@
|
||||
package com.bsd.pjcloud.hard.api.dto.xfj;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
public class XfjQRCodeTransactionDto {
|
||||
|
||||
/**
|
||||
* 交易模式
|
||||
* 0:扣费
|
||||
* 1:充值
|
||||
* 3:信息查询
|
||||
*/
|
||||
private String Mode;
|
||||
|
||||
/**
|
||||
* 扣费类型
|
||||
* 0:手动
|
||||
* 1:菜单
|
||||
* 2:定值
|
||||
* 3:取餐
|
||||
* 4:计时
|
||||
*/
|
||||
private Integer PayType;
|
||||
|
||||
/**
|
||||
* 消费金额(Mode为3时，此字段传入值可能为0)
|
||||
*/
|
||||
private String Amount;
|
||||
|
||||
/**
|
||||
* 扫描到的二维码字符串(最大长度为200)
|
||||
*/
|
||||
private String QR;
|
||||
|
||||
private List<MenuItem> Menus;
|
||||
|
||||
@Data
|
||||
public static class MenuItem {
|
||||
|
||||
/**
|
||||
* 菜品编号(与菜品查询接口菜品编号一致)
|
||||
*/
|
||||
private String MenuID;
|
||||
|
||||
/**
|
||||
* 菜品数量(支持小数)
|
||||
*/
|
||||
private String Count;
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
+13
@@ -0,0 +1,13 @@
|
||||
package com.bsd.pjcloud.hard.api.dto.xfj;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class XfjServerTimeDto {
|
||||
|
||||
/**
|
||||
* 设备中的总白名单数
|
||||
*/
|
||||
private Integer WLSum;
|
||||
|
||||
}
|
||||
+15
@@ -0,0 +1,15 @@
|
||||
package com.bsd.pjcloud.hard.api.dto.xfj;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class XfjTransactionDto {
|
||||
|
||||
/**
|
||||
* 从最后一笔消费往前算的位置
|
||||
* 1:就是最后一笔
|
||||
* 2:就是倒数第二笔
|
||||
*/
|
||||
private Integer Number;
|
||||
|
||||
}
|
||||
+13
@@ -0,0 +1,13 @@
|
||||
package com.bsd.pjcloud.hard.api.dto.xfj;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class XfjTransactionInquiryDto {
|
||||
|
||||
/**
|
||||
* 二维码交易订单号(该值来自于第六及第七接口返回的QROrder)
|
||||
*/
|
||||
private String QROrder;
|
||||
|
||||
}
|
||||
+23
@@ -0,0 +1,23 @@
|
||||
package com.bsd.pjcloud.hard.api.dto.xfj;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class XfjWhiteListDto {
|
||||
|
||||
/**
|
||||
* 通讯序号
|
||||
*/
|
||||
private Integer CommID;
|
||||
|
||||
/**
|
||||
* 页数
|
||||
*/
|
||||
private Long Page;
|
||||
|
||||
/**
|
||||
* 页个数(一页最多有多少个名单)
|
||||
*/
|
||||
private Long PageNumber;
|
||||
|
||||
}
|
||||
+6
@@ -182,6 +182,12 @@ public class HardDoorFlowEntity extends Model<HardDoorFlowEntity> {
|
||||
@Schema(description = "sku识别主动获取时间")
|
||||
private LocalDateTime skuDrivingTime;
|
||||
|
||||
/**
|
||||
* 手动结算/取消操作快照(操作人+购物车明细+金额+备注)
|
||||
*/
|
||||
@Schema(description = "手动结算/取消操作快照(操作人+购物车明细+金额+备注)")
|
||||
private String manualSettleVo;
|
||||
|
||||
/**
|
||||
* 支付时间
|
||||
*/
|
||||
|
||||
+74
-20
@@ -8,7 +8,7 @@ import com.bsd.pjcloud.common.core.util.TenantTable;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
/**
|
||||
* 发票记录
|
||||
* 打印任务与凭证记录
|
||||
*
|
||||
* @author dzc
|
||||
* @date 2025-01-05 14:17:32
|
||||
@@ -20,7 +20,7 @@ import java.time.LocalDateTime;
|
||||
@TenantTable
|
||||
@TableName("hard_invoice")
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Schema(description = "发票记录")
|
||||
@Schema(description = "打印任务与凭证记录")
|
||||
public class HardInvoiceEntity extends Model<HardInvoiceEntity> {
|
||||
|
||||
|
||||
@@ -37,55 +37,109 @@ public class HardInvoiceEntity extends Model<HardInvoiceEntity> {
|
||||
@Schema(description="部门id")
|
||||
private Long deptId;
|
||||
|
||||
/**
|
||||
* 设备id
|
||||
*/
|
||||
@Schema(description="设备id")
|
||||
/**
|
||||
* 来源业务终端 ID；历史记录继续保留原设备语义，不改写为打印机 ID。
|
||||
*/
|
||||
@Schema(description="来源业务终端ID")
|
||||
private Long hardId;
|
||||
|
||||
/**
|
||||
* 任务路由关联的尔印逻辑打印机资产 ID；历史记录和绑定失败任务允许为空。
|
||||
*/
|
||||
@Schema(description="逻辑打印机资产ID")
|
||||
private Long printerHardId;
|
||||
|
||||
/**
|
||||
* 硬件订单id
|
||||
*/
|
||||
@Schema(description="硬件订单id")
|
||||
private Long orderId;
|
||||
|
||||
/**
|
||||
* 状态
|
||||
*/
|
||||
@Schema(description="状态")
|
||||
/**
|
||||
* 打印任务状态，编码来自 HardPrintStatusEnum。
|
||||
*/
|
||||
@Schema(description="打印任务状态")
|
||||
private String status;
|
||||
|
||||
/**
|
||||
* 发票图片
|
||||
*/
|
||||
@Schema(description="发票图片")
|
||||
/**
|
||||
* 打印凭证类型，1 发票、2 兑换券；历史空值按发票兼容。
|
||||
*/
|
||||
@Schema(description="打印凭证类型")
|
||||
private String printType;
|
||||
|
||||
/**
|
||||
* 同一订单同一凭证类型的打印序号；重试同一任务时保持不变。
|
||||
*/
|
||||
@Schema(description="打印序号")
|
||||
private Integer printNo;
|
||||
|
||||
/**
|
||||
* 人工重试版本；来源业务终端用任务 ID 和该版本共同判断是否允许再次打印。
|
||||
*/
|
||||
@Schema(description="重试版本")
|
||||
private Integer retryVersion;
|
||||
|
||||
/**
|
||||
* 来源业务终端代理上报的 USB 累计尝试次数。
|
||||
*/
|
||||
@Schema(description="终端尝试次数")
|
||||
private Integer attemptCount;
|
||||
|
||||
/**
|
||||
* 最近失败阶段，编码来自 HardPrintFailureStageEnum。
|
||||
*/
|
||||
@Schema(description="失败阶段")
|
||||
private String failureStage;
|
||||
|
||||
/**
|
||||
* 最近失败摘要，不保存 MQTT 密码、访问令牌等敏感信息。
|
||||
*/
|
||||
@Schema(description="最近失败原因")
|
||||
private String lastError;
|
||||
|
||||
/**
|
||||
* 来源业务终端确认完整 USB 数据和切纸命令写入成功的时间。
|
||||
*/
|
||||
@Schema(description="打印成功时间")
|
||||
private LocalDateTime printedAt;
|
||||
|
||||
/**
|
||||
* 人工重打原因，自动首次打印或失败重试允许为空。
|
||||
*/
|
||||
@Schema(description="重打原因")
|
||||
private String reprintReason;
|
||||
|
||||
/**
|
||||
* 后端生成并上传的打印 PNG 地址；待生成和生成失败时允许为空。
|
||||
*/
|
||||
@Schema(description="打印图片")
|
||||
private String pic;
|
||||
|
||||
/**
|
||||
* 创建人
|
||||
*/
|
||||
@TableField(fill = FieldFill.INSERT)
|
||||
@TableField(fill = FieldFill.INSERT)
|
||||
@Schema(description="创建人")
|
||||
private String createBy;
|
||||
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
@TableField(fill = FieldFill.INSERT)
|
||||
@TableField(fill = FieldFill.INSERT)
|
||||
@Schema(description="创建时间")
|
||||
private LocalDateTime createTime;
|
||||
|
||||
/**
|
||||
* 修改人
|
||||
*/
|
||||
@TableField(fill = FieldFill.INSERT_UPDATE)
|
||||
@TableField(fill = FieldFill.INSERT_UPDATE)
|
||||
@Schema(description="修改人")
|
||||
private String updateBy;
|
||||
|
||||
/**
|
||||
* 修改时间
|
||||
*/
|
||||
@TableField(fill = FieldFill.INSERT_UPDATE)
|
||||
@TableField(fill = FieldFill.INSERT_UPDATE)
|
||||
@Schema(description="修改时间")
|
||||
private LocalDateTime updateTime;
|
||||
|
||||
@@ -93,7 +147,7 @@ public class HardInvoiceEntity extends Model<HardInvoiceEntity> {
|
||||
* 删除标记
|
||||
*/
|
||||
@TableLogic
|
||||
@TableField(fill = FieldFill.INSERT)
|
||||
@TableField(fill = FieldFill.INSERT)
|
||||
@Schema(description="删除标记")
|
||||
private String delFlag;
|
||||
|
||||
@@ -102,4 +156,4 @@ public class HardInvoiceEntity extends Model<HardInvoiceEntity> {
|
||||
*/
|
||||
@Schema(description="租户ID")
|
||||
private Long tenantId;
|
||||
}
|
||||
}
|
||||
+78
@@ -0,0 +1,78 @@
|
||||
package com.bsd.pjcloud.hard.api.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.FieldFill;
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.baomidou.mybatisplus.extension.activerecord.Model;
|
||||
import com.bsd.pjcloud.common.core.util.TenantTable;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
/**
|
||||
* 业务 Android 终端与无屏尔印 USB 打印机资产的一对一绑定关系。
|
||||
*
|
||||
* <p>记录使用物理删除，数据库分别对来源和目标设备设置唯一键，确保任何时刻都不能出现多重绑定。</p>
|
||||
*/
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
@TenantTable
|
||||
@TableName("hard_printer_binding")
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Schema(description = "业务终端与 USB 打印机绑定关系")
|
||||
public class HardPrinterBindingEntity extends Model<HardPrinterBindingEntity> {
|
||||
|
||||
/** 绑定关系主键。 */
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
@Schema(description = "绑定关系主键")
|
||||
private Long id;
|
||||
|
||||
/** 来源业务终端 ID，只允许 SUPERMARKET 或 CANTEEN。 */
|
||||
@Schema(description = "来源业务终端ID")
|
||||
private Long sourceHardId;
|
||||
|
||||
/** 逻辑打印机资产 ID，只允许 EY_PRINT；设备本身不登录、不上报心跳。 */
|
||||
@Schema(description = "逻辑打印机资产ID")
|
||||
private Long printerHardId;
|
||||
|
||||
/** 双方共同所属商户 ID 快照。 */
|
||||
@Schema(description = "商户ID")
|
||||
private Long merchantId;
|
||||
|
||||
/** 双方共同所属商户部门 ID 快照。 */
|
||||
@Schema(description = "商户部门ID")
|
||||
private Long deptId;
|
||||
|
||||
/** 创建人。 */
|
||||
@TableField(fill = FieldFill.INSERT)
|
||||
@Schema(description = "创建人")
|
||||
private String createBy;
|
||||
|
||||
/** 创建时间。 */
|
||||
@TableField(fill = FieldFill.INSERT)
|
||||
@Schema(description = "创建时间")
|
||||
private LocalDateTime createTime;
|
||||
|
||||
/** 修改人。 */
|
||||
@TableField(fill = FieldFill.INSERT_UPDATE)
|
||||
@Schema(description = "修改人")
|
||||
private String updateBy;
|
||||
|
||||
/** 修改时间。 */
|
||||
@TableField(fill = FieldFill.INSERT_UPDATE)
|
||||
@Schema(description = "修改时间")
|
||||
private LocalDateTime updateTime;
|
||||
|
||||
/** 租户 ID。 */
|
||||
@Schema(description = "租户ID")
|
||||
private Long tenantId;
|
||||
}
|
||||
+88
@@ -0,0 +1,88 @@
|
||||
package com.bsd.pjcloud.hard.api.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.FieldFill;
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.baomidou.mybatisplus.extension.activerecord.Model;
|
||||
import com.bsd.pjcloud.common.core.util.TenantTable;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
/**
|
||||
* 无屏尔印 USB 打印机资产的 USB 和 ESC/POS 参数配置。
|
||||
*/
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
@TenantTable
|
||||
@TableName("hard_printer_config")
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Schema(description = "尔印 USB 打印机配置")
|
||||
public class HardPrinterConfigEntity extends Model<HardPrinterConfigEntity> {
|
||||
|
||||
/** 配置主键。 */
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
@Schema(description = "配置主键")
|
||||
private Long id;
|
||||
|
||||
/** 配置所属 EY_PRINT 逻辑打印机资产 ID。 */
|
||||
@Schema(description = "逻辑打印机资产ID")
|
||||
private Long printerHardId;
|
||||
|
||||
/** 真机联调后填写的打印机型号。 */
|
||||
@Schema(description = "打印机型号")
|
||||
private String printerModel;
|
||||
|
||||
/** USB Vendor ID，使用十进制持久化。 */
|
||||
@Schema(description = "USB VID")
|
||||
private Integer usbVendorId;
|
||||
|
||||
/** USB Product ID，使用十进制持久化。 */
|
||||
@Schema(description = "USB PID")
|
||||
private Integer usbProductId;
|
||||
|
||||
/** 纸张宽度，首期固定为 80mm。 */
|
||||
@Schema(description = "纸宽，单位mm")
|
||||
private Integer paperWidth;
|
||||
|
||||
/** 是否在完整数据写入后发送自动切纸命令，1 开启、0 关闭。 */
|
||||
@Schema(description = "自动切刀开关")
|
||||
private String autoCut;
|
||||
|
||||
/** 图片指令模式，GS_V0 为默认值，ESC_STAR 为兼容回退。 */
|
||||
@Schema(description = "图片指令模式")
|
||||
private String imageMode;
|
||||
|
||||
/** 创建人。 */
|
||||
@TableField(fill = FieldFill.INSERT)
|
||||
@Schema(description = "创建人")
|
||||
private String createBy;
|
||||
|
||||
/** 创建时间。 */
|
||||
@TableField(fill = FieldFill.INSERT)
|
||||
@Schema(description = "创建时间")
|
||||
private LocalDateTime createTime;
|
||||
|
||||
/** 修改人。 */
|
||||
@TableField(fill = FieldFill.INSERT_UPDATE)
|
||||
@Schema(description = "修改人")
|
||||
private String updateBy;
|
||||
|
||||
/** 修改时间。 */
|
||||
@TableField(fill = FieldFill.INSERT_UPDATE)
|
||||
@Schema(description = "修改时间")
|
||||
private LocalDateTime updateTime;
|
||||
|
||||
/** 租户 ID。 */
|
||||
@Schema(description = "租户ID")
|
||||
private Long tenantId;
|
||||
}
|
||||
+191
@@ -0,0 +1,191 @@
|
||||
package com.bsd.pjcloud.hard.api.entity.manager;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import com.baomidou.mybatisplus.extension.activerecord.Model;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import com.bsd.pjcloud.common.core.util.TenantTable;
|
||||
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
/**
|
||||
* 终端日志文件
|
||||
*/
|
||||
@Data
|
||||
@TenantTable
|
||||
@TableName("hard_terminal_log_file")
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Schema(description = "终端日志文件")
|
||||
public class HardTerminalLogFileEntity extends Model<HardTerminalLogFileEntity> {
|
||||
|
||||
/**
|
||||
* 编号
|
||||
*/
|
||||
@TableId(type = IdType.AUTO)
|
||||
@Schema(description = "编号")
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 设备ID(hard_manager.id)
|
||||
*/
|
||||
@Schema(description = "设备ID(hard_manager.id)")
|
||||
private Long hardId;
|
||||
|
||||
/**
|
||||
* 上传时设备名称快照
|
||||
*/
|
||||
@Schema(description = "上传时设备名称快照")
|
||||
private String hardName;
|
||||
|
||||
/**
|
||||
* 上传时设备唯一编号快照
|
||||
*/
|
||||
@Schema(description = "上传时设备唯一编号快照")
|
||||
private String uniqueCode;
|
||||
|
||||
/**
|
||||
* 上传时设备类型快照
|
||||
*/
|
||||
@Schema(description = "上传时设备类型快照")
|
||||
private String hardType;
|
||||
|
||||
/**
|
||||
* 上传时商户ID快照
|
||||
*/
|
||||
@Schema(description = "上传时商户ID快照")
|
||||
private Long merchantId;
|
||||
|
||||
/**
|
||||
* 上传时部门ID快照
|
||||
*/
|
||||
@Schema(description = "上传时部门ID快照")
|
||||
private Long deptId;
|
||||
|
||||
/**
|
||||
* 日志所属日期
|
||||
*/
|
||||
@Schema(description = "日志所属日期")
|
||||
private LocalDate logDate;
|
||||
|
||||
/**
|
||||
* 终端日志根目录下的相对路径
|
||||
*/
|
||||
@Schema(description = "终端日志根目录下的相对路径")
|
||||
private String relativePath;
|
||||
|
||||
/**
|
||||
* 原日志文件名
|
||||
*/
|
||||
@Schema(description = "原日志文件名")
|
||||
private String originalName;
|
||||
|
||||
/**
|
||||
* 文件大小(字节)
|
||||
*/
|
||||
@Schema(description = "文件大小(字节)")
|
||||
private Long fileSize;
|
||||
|
||||
/**
|
||||
* 文件内容哈希(当前使用MD5)
|
||||
*/
|
||||
@Schema(description = "文件内容哈希(当前使用MD5)")
|
||||
private String fileHash;
|
||||
|
||||
/**
|
||||
* 终端本地文件最后修改时间
|
||||
*/
|
||||
@Schema(description = "终端本地文件最后修改时间")
|
||||
private LocalDateTime fileModifiedTime;
|
||||
|
||||
/**
|
||||
* 文件中心sys_file记录ID
|
||||
*/
|
||||
@Schema(description = "文件中心sys_file记录ID")
|
||||
private Long sysFileId;
|
||||
|
||||
/**
|
||||
* OSS对象文件名
|
||||
*/
|
||||
@Schema(description = "OSS对象文件名")
|
||||
private String storageFileName;
|
||||
|
||||
/**
|
||||
* 文件访问相对地址
|
||||
*/
|
||||
@Schema(description = "文件访问相对地址")
|
||||
private String storageUrl;
|
||||
|
||||
/**
|
||||
* 上传时应用版本
|
||||
*/
|
||||
@Schema(description = "上传时应用版本")
|
||||
private String appVersion;
|
||||
|
||||
/**
|
||||
* 日志脱敏规则版本
|
||||
*/
|
||||
@Schema(description = "日志脱敏规则版本")
|
||||
private String sanitizeVersion;
|
||||
|
||||
/**
|
||||
* 最近成功上传时间
|
||||
*/
|
||||
@Schema(description = "最近成功上传时间")
|
||||
private LocalDateTime uploadTime;
|
||||
|
||||
/**
|
||||
* 成功上传次数
|
||||
*/
|
||||
@Schema(description = "成功上传次数")
|
||||
private Integer uploadCount;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@Schema(description = "备注")
|
||||
private String remark;
|
||||
|
||||
/**
|
||||
* 创建人
|
||||
*/
|
||||
@TableField(fill = FieldFill.INSERT)
|
||||
@Schema(description = "创建人")
|
||||
private String createBy;
|
||||
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
@TableField(fill = FieldFill.INSERT)
|
||||
@Schema(description = "创建时间")
|
||||
private LocalDateTime createTime;
|
||||
|
||||
/**
|
||||
* 修改人
|
||||
*/
|
||||
@TableField(fill = FieldFill.INSERT_UPDATE)
|
||||
@Schema(description = "修改人")
|
||||
private String updateBy;
|
||||
|
||||
/**
|
||||
* 修改时间
|
||||
*/
|
||||
@TableField(fill = FieldFill.INSERT_UPDATE)
|
||||
@Schema(description = "修改时间")
|
||||
private LocalDateTime updateTime;
|
||||
|
||||
/**
|
||||
* 删除标记
|
||||
*/
|
||||
@TableLogic
|
||||
@TableField(fill = FieldFill.INSERT)
|
||||
@Schema(description = "删除标记")
|
||||
private String delFlag;
|
||||
|
||||
/**
|
||||
* 租户ID
|
||||
*/
|
||||
@Schema(description = "租户ID")
|
||||
private Long tenantId;
|
||||
}
|
||||
+146
@@ -0,0 +1,146 @@
|
||||
package com.bsd.pjcloud.hard.api.entity.manager;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.FieldFill;
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.baomidou.mybatisplus.extension.activerecord.Model;
|
||||
import com.bsd.pjcloud.common.core.util.TenantTable;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
/**
|
||||
* 食堂、超市 Android 终端的最新心跳状态。
|
||||
*
|
||||
* <p>每台设备只保留一条最新记录，在线布尔值由服务端按时间阈值实时计算。</p>
|
||||
*/
|
||||
@Data
|
||||
@TenantTable
|
||||
@TableName("hard_terminal_status")
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Schema(description = "终端最新心跳状态")
|
||||
public class HardTerminalStatusEntity extends Model<HardTerminalStatusEntity> {
|
||||
|
||||
/**
|
||||
* 设备 ID，同时作为主键，对应 {@code hard_manager.id}。
|
||||
*/
|
||||
@TableId(type = IdType.INPUT)
|
||||
@Schema(description = "设备ID")
|
||||
private Long hardId;
|
||||
|
||||
/**
|
||||
* 服务端最近收到心跳的时间，在线计算以此时间为准。
|
||||
*/
|
||||
@Schema(description = "最后在线时间")
|
||||
private LocalDateTime lastOnlineTime;
|
||||
|
||||
/**
|
||||
* 最近一次心跳场景，保存 {@code ONLINE} 或 {@code AUTO_UPDATE} 接口编码。
|
||||
*/
|
||||
@Schema(description = "最近心跳场景")
|
||||
private String heartbeatScene;
|
||||
|
||||
/**
|
||||
* 计划内断开原因；普通在线心跳会清空，当前仅保留“自动更新重启”。
|
||||
*/
|
||||
@Schema(description = "计划内断开原因")
|
||||
private String disconnectReason;
|
||||
|
||||
/**
|
||||
* 终端上报的 APK 展示版本号，无法读取时为空。
|
||||
*/
|
||||
@Schema(description = "APK展示版本号")
|
||||
private String apkVersionName;
|
||||
|
||||
/**
|
||||
* 终端上报的 APK 内部版本码，无法读取时为空。
|
||||
*/
|
||||
@Schema(description = "APK内部版本码")
|
||||
private Long apkVersionCode;
|
||||
|
||||
/**
|
||||
* Android 系统本次启动后的运行时长，单位为秒；终端无法读取时为空。
|
||||
*/
|
||||
@Schema(description = "Android系统运行秒数")
|
||||
private Long systemUptimeSeconds;
|
||||
|
||||
/**
|
||||
* 当前应用进程运行时长，单位为秒；终端无法读取时为空。
|
||||
*/
|
||||
@Schema(description = "应用进程运行秒数")
|
||||
private Long appUptimeSeconds;
|
||||
|
||||
/**
|
||||
* 最近一次心跳的网络类型，例如 ethernet、wifi、4g 或 offline。
|
||||
*/
|
||||
@Schema(description = "网络类型")
|
||||
private String networkType;
|
||||
|
||||
/**
|
||||
* 应用私有目录所在存储卷的可用空间，单位为字节。
|
||||
*/
|
||||
@Schema(description = "可用存储空间，单位字节")
|
||||
private Long availableStorageBytes;
|
||||
|
||||
/**
|
||||
* Root 最近检测状态，固定为 unknown、available 或 unavailable。
|
||||
*/
|
||||
@Schema(description = "Root状态")
|
||||
private String rootStatus;
|
||||
|
||||
/**
|
||||
* 最近一次心跳时当前应用是否为 Device Owner；无法读取时为空。
|
||||
*/
|
||||
@Schema(description = "是否为Device Owner")
|
||||
private Boolean deviceOwner;
|
||||
|
||||
/**
|
||||
* 最近一次心跳时是否处于 Kiosk 锁定任务模式；无法读取时为空。
|
||||
*/
|
||||
@Schema(description = "是否处于Kiosk模式")
|
||||
private Boolean kioskActive;
|
||||
|
||||
/**
|
||||
* 打印机、电子秤、读卡器和副屏等可选硬件状态 JSON 快照。
|
||||
*/
|
||||
@Schema(description = "可选外围硬件状态JSON")
|
||||
private String deviceStatusJson;
|
||||
|
||||
/**
|
||||
* 创建人；设备心跳没有后台用户上下文时为空。
|
||||
*/
|
||||
@TableField(fill = FieldFill.INSERT)
|
||||
@Schema(description = "创建人")
|
||||
private String createBy;
|
||||
|
||||
/**
|
||||
* 首次收到该设备心跳的服务端时间。
|
||||
*/
|
||||
@TableField(fill = FieldFill.INSERT)
|
||||
@Schema(description = "创建时间")
|
||||
private LocalDateTime createTime;
|
||||
|
||||
/**
|
||||
* 修改人；设备心跳没有后台用户上下文时为空。
|
||||
*/
|
||||
@TableField(fill = FieldFill.INSERT_UPDATE)
|
||||
@Schema(description = "修改人")
|
||||
private String updateBy;
|
||||
|
||||
/**
|
||||
* 最近一次心跳写入的服务端时间。
|
||||
*/
|
||||
@TableField(fill = FieldFill.INSERT_UPDATE)
|
||||
@Schema(description = "修改时间")
|
||||
private LocalDateTime updateTime;
|
||||
|
||||
/**
|
||||
* 数据所属租户 ID，取自已通过当前租户校验的设备记录。
|
||||
*/
|
||||
@Schema(description = "租户ID")
|
||||
private Long tenantId;
|
||||
}
|
||||
+7
-1
@@ -183,10 +183,16 @@ public class HardOrderEntity extends Model<HardOrderEntity> {
|
||||
@Schema(description = "退款状态")
|
||||
private String refundStatus;
|
||||
|
||||
/**
|
||||
* 订单实际核销完成时间，后续订单更新不得覆盖
|
||||
*/
|
||||
@Schema(description = "订单实际核销完成时间")
|
||||
private LocalDateTime verificationTime;
|
||||
|
||||
/**
|
||||
* 订单取消时间(退款订单)
|
||||
*/
|
||||
@Schema(description = "订单取消时间")
|
||||
@Schema(description = "订单取消时间(退款订单)")
|
||||
private LocalDateTime applyCancelTime;
|
||||
|
||||
/**
|
||||
|
||||
+208
@@ -0,0 +1,208 @@
|
||||
package com.bsd.pjcloud.hard.api.entity.order;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.FieldFill;
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableLogic;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.baomidou.mybatisplus.extension.activerecord.Model;
|
||||
import com.bsd.pjcloud.common.core.util.TenantTable;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
/**
|
||||
* 订单识别证据图片，从属于 hard_order 并长期保存争议处理所需的文件快照和识别元数据。
|
||||
*/
|
||||
@Data
|
||||
@TenantTable
|
||||
@TableName("hard_order_evidence_image")
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Schema(description = "订单识别证据图片")
|
||||
public class HardOrderEvidenceImageEntity extends Model<HardOrderEvidenceImageEntity> {
|
||||
|
||||
/**
|
||||
* 证据记录自增主键。
|
||||
*/
|
||||
@TableId(type = IdType.AUTO)
|
||||
@Schema(description = "证据记录主键")
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 服务端订单主键，来源于 hard_order.id。
|
||||
*/
|
||||
@Schema(description = "订单主键")
|
||||
private Long orderId;
|
||||
|
||||
/**
|
||||
* 证据订单引用快照；现场订单取终端订单号，预约等服务端订单取订单号或服务端主键内部引用。
|
||||
*/
|
||||
@Schema(description = "证据订单引用快照")
|
||||
private String androidOrderCode;
|
||||
|
||||
/**
|
||||
* 证据业务类型，保存 HardOrderEvidenceTypeEnum.code。
|
||||
*/
|
||||
@Schema(description = "证据类型")
|
||||
private String evidenceType;
|
||||
|
||||
/**
|
||||
* 图片角色，保存 HardOrderEvidenceRoleEnum.code。
|
||||
*/
|
||||
@Schema(description = "证据图片角色")
|
||||
private String evidenceRole;
|
||||
|
||||
/**
|
||||
* 同一订单、类型和角色下的图片序号，从0开始。
|
||||
*/
|
||||
@Schema(description = "证据图片序号")
|
||||
private Integer sequenceNo;
|
||||
|
||||
/**
|
||||
* 识别用户主键快照；无法识别到平台用户时允许为空。
|
||||
*/
|
||||
@Schema(description = "识别用户主键")
|
||||
private Long userId;
|
||||
|
||||
/**
|
||||
* 虹软人脸样本编号快照，来源于 sys_user_face.auto_code。
|
||||
*/
|
||||
@Schema(description = "人脸样本编号")
|
||||
private String faceSampleId;
|
||||
|
||||
/**
|
||||
* 识别时终端命中的后台参考图片地址快照，仅用于与 UPMS 权威记录比对，不直接作为展示地址。
|
||||
*/
|
||||
@Schema(description = "参考人脸来源地址快照")
|
||||
private String referenceImageUrl;
|
||||
|
||||
/**
|
||||
* 终端识别相似度快照，取值0到1。
|
||||
*/
|
||||
@Schema(description = "识别相似度")
|
||||
private BigDecimal similarity;
|
||||
|
||||
/**
|
||||
* 终端识别相似度阈值快照，取值0到1。
|
||||
*/
|
||||
@Schema(description = "识别相似度阈值")
|
||||
private BigDecimal similarityThreshold;
|
||||
|
||||
/**
|
||||
* 产生证据的服务端设备主键，来源于 hard_order.hard_id。
|
||||
*/
|
||||
@Schema(description = "设备主键")
|
||||
private Long hardId;
|
||||
|
||||
/**
|
||||
* 终端实际完成识别的本地时间，用于与订单时间交叉核验。
|
||||
*/
|
||||
@Schema(description = "终端采集时间")
|
||||
private LocalDateTime capturedAt;
|
||||
|
||||
/**
|
||||
* 文件中心 sys_file 主键；状态非 AVAILABLE 时允许为空。
|
||||
*/
|
||||
@Schema(description = "文件中心记录主键")
|
||||
private Long sysFileId;
|
||||
|
||||
/**
|
||||
* 文件中心对象名，仅供服务端读取或下载，不由终端提交。
|
||||
*/
|
||||
@Schema(description = "文件中心对象名")
|
||||
private String storageFileName;
|
||||
|
||||
/**
|
||||
* PC 可使用统一请求层访问的文件相对地址。
|
||||
*/
|
||||
@Schema(description = "图片访问地址")
|
||||
private String imageUrl;
|
||||
|
||||
/**
|
||||
* 实际保存文件的 SHA-256，用于幂等和防止证据被静默替换。
|
||||
*/
|
||||
@Schema(description = "图片SHA-256")
|
||||
private String imageHash;
|
||||
|
||||
/**
|
||||
* 实际保存文件大小，单位字节。
|
||||
*/
|
||||
@Schema(description = "图片大小，单位字节")
|
||||
private Long imageSize;
|
||||
|
||||
/**
|
||||
* 实际解码图片宽度，单位像素。
|
||||
*/
|
||||
@Schema(description = "图片宽度，单位像素")
|
||||
private Integer imageWidth;
|
||||
|
||||
/**
|
||||
* 实际解码图片高度，单位像素。
|
||||
*/
|
||||
@Schema(description = "图片高度，单位像素")
|
||||
private Integer imageHeight;
|
||||
|
||||
/**
|
||||
* 证据状态，保存 HardOrderEvidenceStatusEnum.code。
|
||||
*/
|
||||
@Schema(description = "证据状态")
|
||||
private String status;
|
||||
|
||||
/**
|
||||
* 永久缺失或服务端复制失败的摘要，不保存终端完整文件路径。
|
||||
*/
|
||||
@Schema(description = "失败原因")
|
||||
private String failureReason;
|
||||
|
||||
/**
|
||||
* 产生证据的终端应用版本快照。
|
||||
*/
|
||||
@Schema(description = "终端应用版本")
|
||||
private String appVersion;
|
||||
|
||||
/**
|
||||
* 创建人，由 MyBatis 填充器写入。
|
||||
*/
|
||||
@TableField(fill = FieldFill.INSERT)
|
||||
@Schema(description = "创建人")
|
||||
private String createBy;
|
||||
|
||||
/**
|
||||
* 证据占位记录创建时间，由 MyBatis 填充器写入。
|
||||
*/
|
||||
@TableField(fill = FieldFill.INSERT)
|
||||
@Schema(description = "创建时间")
|
||||
private LocalDateTime createTime;
|
||||
|
||||
/**
|
||||
* 修改人，由 MyBatis 填充器在状态变化时写入。
|
||||
*/
|
||||
@TableField(fill = FieldFill.INSERT_UPDATE)
|
||||
@Schema(description = "修改人")
|
||||
private String updateBy;
|
||||
|
||||
/**
|
||||
* 最近一次状态、文件或错误信息更新时间。
|
||||
*/
|
||||
@TableField(fill = FieldFill.INSERT_UPDATE)
|
||||
@Schema(description = "修改时间")
|
||||
private LocalDateTime updateTime;
|
||||
|
||||
/**
|
||||
* 逻辑删除标记；订单退款、取消和删除不会联动改变该值。
|
||||
*/
|
||||
@TableLogic
|
||||
@TableField(fill = FieldFill.INSERT)
|
||||
@Schema(description = "删除标记")
|
||||
private String delFlag;
|
||||
|
||||
/**
|
||||
* 租户主键，由当前请求租户上下文写入并由数据层自动隔离。
|
||||
*/
|
||||
@Schema(description = "租户主键")
|
||||
private Long tenantId;
|
||||
}
|
||||
+130
@@ -0,0 +1,130 @@
|
||||
package com.bsd.pjcloud.hard.api.entity.xfj;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import com.baomidou.mybatisplus.extension.activerecord.Model;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import com.bsd.pjcloud.common.core.util.TenantTable;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
/**
|
||||
* 消费机日志
|
||||
*/
|
||||
@Data
|
||||
@TenantTable
|
||||
@TableName("hard_xfj_log")
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Schema(description = "消费机日志")
|
||||
public class HardXfjLogEntity extends Model<HardXfjLogEntity> {
|
||||
|
||||
/**
|
||||
* 编号
|
||||
*/
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
@Schema(description = "编号")
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 设备唯一编号
|
||||
*/
|
||||
@Schema(description = "设备唯一编号")
|
||||
private String uniqueCode;
|
||||
|
||||
/**
|
||||
* 设备类型
|
||||
*/
|
||||
@Schema(description = "设备类型")
|
||||
private String hardType;
|
||||
|
||||
/**
|
||||
* 用户id
|
||||
*/
|
||||
@Schema(description = "用户id")
|
||||
private String title;
|
||||
|
||||
/**
|
||||
* headers
|
||||
*/
|
||||
@Schema(description = "headers")
|
||||
private String headers;
|
||||
|
||||
/**
|
||||
* res
|
||||
*/
|
||||
@Schema(description = "res")
|
||||
private String res;
|
||||
|
||||
/**
|
||||
* req
|
||||
*/
|
||||
@Schema(description = "req")
|
||||
private String req;
|
||||
|
||||
/**
|
||||
* error
|
||||
*/
|
||||
@Schema(description = "error")
|
||||
private String error;
|
||||
|
||||
/**
|
||||
* 开始时间
|
||||
*/
|
||||
@Schema(description = "开始时间")
|
||||
private LocalDateTime startTime;
|
||||
|
||||
/**
|
||||
* 结束时间
|
||||
*/
|
||||
@Schema(description = "结束时间")
|
||||
private LocalDateTime endTime;
|
||||
|
||||
/**
|
||||
* 耗时(毫秒)
|
||||
*/
|
||||
@Schema(description = "耗时(毫秒)")
|
||||
private Long cost;
|
||||
|
||||
/**
|
||||
* 创建人
|
||||
*/
|
||||
@TableField(fill = FieldFill.INSERT)
|
||||
@Schema(description = "创建人")
|
||||
private String createBy;
|
||||
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
@TableField(fill = FieldFill.INSERT)
|
||||
@Schema(description = "创建时间")
|
||||
private LocalDateTime createTime;
|
||||
|
||||
/**
|
||||
* 修改人
|
||||
*/
|
||||
@TableField(fill = FieldFill.INSERT_UPDATE)
|
||||
@Schema(description = "修改人")
|
||||
private String updateBy;
|
||||
|
||||
/**
|
||||
* 修改时间
|
||||
*/
|
||||
@TableField(fill = FieldFill.INSERT_UPDATE)
|
||||
@Schema(description = "修改时间")
|
||||
private LocalDateTime updateTime;
|
||||
|
||||
/**
|
||||
* 删除标记
|
||||
*/
|
||||
@TableLogic
|
||||
@TableField(fill = FieldFill.INSERT)
|
||||
@Schema(description = "删除标记")
|
||||
private String delFlag;
|
||||
|
||||
/**
|
||||
* 租户ID
|
||||
*/
|
||||
@Schema(description = "租户ID")
|
||||
private Long tenantId;
|
||||
}
|
||||
+565
@@ -0,0 +1,565 @@
|
||||
package com.bsd.pjcloud.hard.api.utils;
|
||||
|
||||
import javax.imageio.ImageIO;
|
||||
import java.awt.BasicStroke;
|
||||
import java.awt.Color;
|
||||
import java.awt.Font;
|
||||
import java.awt.FontMetrics;
|
||||
import java.awt.Graphics2D;
|
||||
import java.awt.RenderingHints;
|
||||
import java.awt.image.BufferedImage;
|
||||
import java.io.ByteArrayOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 面向 80mm、576px ESC/POS 打印的动态高度 PNG 绘制器。
|
||||
*
|
||||
* <p>商品名称按真实像素宽度换行，数量列固定右对齐，保证长名称不会与数量错配。</p>
|
||||
*/
|
||||
public class ThermalReceiptImage {
|
||||
|
||||
/** 80mm 打印头常见有效像素宽度。 */
|
||||
public static final int PAPER_WIDTH_PIXELS = 576;
|
||||
|
||||
/** 图片左右安全留白。 */
|
||||
private static final int HORIZONTAL_PADDING = 24;
|
||||
|
||||
/** 图片顶部和底部安全留白。 */
|
||||
private static final int VERTICAL_PADDING = 24;
|
||||
|
||||
/** 每次扩展画布的最小高度。 */
|
||||
private static final int HEIGHT_GROWTH = 512;
|
||||
|
||||
/** 数量列保留宽度。 */
|
||||
private static final int QUANTITY_COLUMN_WIDTH = 96;
|
||||
|
||||
/** 套餐组成项左侧缩进。 */
|
||||
private static final int CHILD_INDENT = 32;
|
||||
|
||||
/** 兑换券商品卡片的内容内边距。 */
|
||||
private static final int PRODUCT_CARD_PADDING = 14;
|
||||
|
||||
/** 相邻兑换券商品卡片的垂直间距。 */
|
||||
private static final int PRODUCT_CARD_GAP = 14;
|
||||
|
||||
/** 中文优先逻辑字体名称。 */
|
||||
private static final String FONT_FAMILY = "SansSerif";
|
||||
|
||||
/** 当前可扩展画布。 */
|
||||
private BufferedImage canvas;
|
||||
|
||||
/** 当前绘制上下文。 */
|
||||
private Graphics2D graphics;
|
||||
|
||||
/** 下一块内容的顶部 Y 坐标。 */
|
||||
private int cursorY = VERTICAL_PADDING;
|
||||
|
||||
/**
|
||||
* 创建 576px 宽的白底收据画布。
|
||||
*/
|
||||
public ThermalReceiptImage() {
|
||||
canvas = new BufferedImage(PAPER_WIDTH_PIXELS, HEIGHT_GROWTH, BufferedImage.TYPE_INT_RGB);
|
||||
graphics = canvas.createGraphics();
|
||||
configureGraphics(graphics);
|
||||
graphics.setColor(Color.WHITE);
|
||||
graphics.fillRect(0, 0, canvas.getWidth(), canvas.getHeight());
|
||||
graphics.setColor(Color.BLACK);
|
||||
}
|
||||
|
||||
/**
|
||||
* 绘制居中粗体标题。
|
||||
*
|
||||
* @param text 标题文本
|
||||
* @return 当前绘制器
|
||||
*/
|
||||
public ThermalReceiptImage title(String text) {
|
||||
setFont(Font.BOLD, 42);
|
||||
drawCentered(text, 16);
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* 绘制带黑色边框的大号打印次数提示，文字超过可用纸宽时自动换行。
|
||||
*
|
||||
* @param text 提示文本，例如“第 1 次打印”
|
||||
* @return 当前绘制器
|
||||
*/
|
||||
public ThermalReceiptImage banner(String text) {
|
||||
setFont(Font.BOLD, 44);
|
||||
FontMetrics metrics = graphics.getFontMetrics();
|
||||
List<String> lines = wrap(text == null ? "" : text, contentWidth() - 32, metrics);
|
||||
int lineHeight = metrics.getHeight() + 4;
|
||||
int height = lines.size() * lineHeight + 26;
|
||||
ensureCapacity(height + 20);
|
||||
graphics.setStroke(new BasicStroke(3F));
|
||||
graphics.drawRect(HORIZONTAL_PADDING, cursorY, contentWidth(), height);
|
||||
for (int index = 0; index < lines.size(); index++) {
|
||||
String line = lines.get(index);
|
||||
int x = HORIZONTAL_PADDING + Math.max(0, (contentWidth() - metrics.stringWidth(line)) / 2);
|
||||
graphics.drawString(line, x, cursorY + 13 + index * lineHeight + metrics.getAscent());
|
||||
}
|
||||
cursorY += height + 20;
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* 绘制醒目的核销短码。
|
||||
*
|
||||
* @param shortCode 核销短码
|
||||
* @return 当前绘制器
|
||||
*/
|
||||
public ThermalReceiptImage verificationCode(String shortCode) {
|
||||
setFont(Font.BOLD, 64);
|
||||
drawCentered(shortCode == null || shortCode.isBlank() ? "--" : shortCode, 18);
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* 绘制一行左右键值信息，值无法完整同行显示时整段从下一行开始并继续换行。
|
||||
*
|
||||
* @param label 左侧字段名
|
||||
* @param value 右侧字段值
|
||||
* @return 当前绘制器
|
||||
*/
|
||||
public ThermalReceiptImage keyValue(String label, String value) {
|
||||
setFont(Font.PLAIN, 33);
|
||||
String safeLabel = label == null ? "" : label;
|
||||
String safeValue = value == null || value.isBlank() ? "--" : value;
|
||||
FontMetrics metrics = graphics.getFontMetrics();
|
||||
int labelWidth = metrics.stringWidth(safeLabel + "：");
|
||||
int inlineValueWidth = contentWidth() - labelWidth - 12;
|
||||
boolean stackValue = metrics.stringWidth(safeValue) > inlineValueWidth;
|
||||
int valueWidth = stackValue ? contentWidth() : Math.max(120, inlineValueWidth);
|
||||
List<String> lines = wrap(safeValue, valueWidth, metrics);
|
||||
int valueLineOffset = stackValue ? 1 : 0;
|
||||
int lineHeight = metrics.getHeight() + 6;
|
||||
ensureCapacity((lines.size() + valueLineOffset) * lineHeight + 10);
|
||||
graphics.drawString(safeLabel + "：", HORIZONTAL_PADDING, cursorY + metrics.getAscent());
|
||||
for (int index = 0; index < lines.size(); index++) {
|
||||
int x = stackValue ? HORIZONTAL_PADDING : HORIZONTAL_PADDING + labelWidth + 12;
|
||||
graphics.drawString(lines.get(index), x,
|
||||
cursorY + (index + valueLineOffset) * lineHeight + metrics.getAscent());
|
||||
}
|
||||
cursorY += (lines.size() + valueLineOffset) * lineHeight + 6;
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* 绘制商品明细区标题。
|
||||
*
|
||||
* @param text 标题文本
|
||||
* @return 当前绘制器
|
||||
*/
|
||||
public ThermalReceiptImage sectionTitle(String text) {
|
||||
setFont(Font.BOLD, 36);
|
||||
ensureCapacity(60);
|
||||
graphics.drawString(text == null ? "" : text, HORIZONTAL_PADDING, cursorY + graphics.getFontMetrics().getAscent());
|
||||
cursorY += graphics.getFontMetrics().getHeight() + 10;
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* 绘制多订单合并兑换券中的紧凑订单摘要。
|
||||
*
|
||||
* <p>订单序号使用黑底标签形成扫描锚点，完整订单号及日期餐段均按实际像素宽度换行；相邻订单仅以
|
||||
* 细线分隔，避免重复商品版式中的大段标题和留白。</p>
|
||||
*
|
||||
* @param index 当前订单在合并批次中的一号起始序号
|
||||
* @param total 合并批次订单总数
|
||||
* @param orderNo 对外展示的完整订单号
|
||||
* @param orderDate 预约订餐日期
|
||||
* @param mealName 餐段名称
|
||||
* @return 当前绘制器
|
||||
*/
|
||||
public ThermalReceiptImage voucherOrderSummary(int index, int total, String orderNo,
|
||||
String orderDate, String mealName) {
|
||||
int safeTotal = Math.max(1, total);
|
||||
int safeIndex = Math.min(Math.max(1, index), safeTotal);
|
||||
String tag = "订单 " + safeIndex + "/" + safeTotal;
|
||||
String safeOrderNo = orderNo == null || orderNo.isBlank() ? "--" : orderNo;
|
||||
String summary = "订餐日期：" + (orderDate == null || orderDate.isBlank() ? "--" : orderDate)
|
||||
+ " 餐段：" + (mealName == null || mealName.isBlank() ? "--" : mealName);
|
||||
|
||||
setFont(Font.BOLD, 25);
|
||||
FontMetrics tagMetrics = graphics.getFontMetrics();
|
||||
int tagWidth = tagMetrics.stringWidth(tag) + 20;
|
||||
int tagHeight = tagMetrics.getHeight() + 6;
|
||||
|
||||
setFont(Font.BOLD, 31);
|
||||
FontMetrics orderMetrics = graphics.getFontMetrics();
|
||||
int orderX = HORIZONTAL_PADDING + tagWidth + 14;
|
||||
int orderWidth = PAPER_WIDTH_PIXELS - HORIZONTAL_PADDING - orderX;
|
||||
List<String> orderLines = wrap(safeOrderNo, Math.max(120, orderWidth), orderMetrics);
|
||||
int orderLineHeight = orderMetrics.getHeight() + 4;
|
||||
int headerHeight = Math.max(tagHeight, orderLines.size() * orderLineHeight);
|
||||
|
||||
setFont(Font.PLAIN, 29);
|
||||
FontMetrics summaryMetrics = graphics.getFontMetrics();
|
||||
List<String> summaryLines = wrap(summary, contentWidth(), summaryMetrics);
|
||||
int summaryLineHeight = summaryMetrics.getHeight() + 4;
|
||||
int separatorHeight = safeIndex < safeTotal ? 18 : 8;
|
||||
int blockHeight = headerHeight + 10 + summaryLines.size() * summaryLineHeight + separatorHeight;
|
||||
ensureCapacity(blockHeight);
|
||||
|
||||
int blockTop = cursorY;
|
||||
graphics.setColor(Color.BLACK);
|
||||
setFont(Font.BOLD, 25);
|
||||
graphics.fillRect(HORIZONTAL_PADDING, blockTop, tagWidth, tagHeight);
|
||||
graphics.setColor(Color.WHITE);
|
||||
graphics.drawString(tag, HORIZONTAL_PADDING + 10, blockTop + 3 + tagMetrics.getAscent());
|
||||
graphics.setColor(Color.BLACK);
|
||||
|
||||
setFont(Font.BOLD, 31);
|
||||
for (int lineIndex = 0; lineIndex < orderLines.size(); lineIndex++) {
|
||||
graphics.drawString(orderLines.get(lineIndex), orderX,
|
||||
blockTop + lineIndex * orderLineHeight + orderMetrics.getAscent());
|
||||
}
|
||||
|
||||
int summaryTop = blockTop + headerHeight + 10;
|
||||
setFont(Font.PLAIN, 29);
|
||||
for (int lineIndex = 0; lineIndex < summaryLines.size(); lineIndex++) {
|
||||
graphics.drawString(summaryLines.get(lineIndex), HORIZONTAL_PADDING,
|
||||
summaryTop + lineIndex * summaryLineHeight + summaryMetrics.getAscent());
|
||||
}
|
||||
if (safeIndex < safeTotal) {
|
||||
int separatorY = summaryTop + summaryLines.size() * summaryLineHeight + 7;
|
||||
graphics.setStroke(new BasicStroke(1F));
|
||||
graphics.drawLine(HORIZONTAL_PADDING, separatorY,
|
||||
PAPER_WIDTH_PIXELS - HORIZONTAL_PADDING, separatorY);
|
||||
}
|
||||
cursorY += blockHeight;
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* 绘制商品或套餐组成项，商品名换行且数量始终在首行右对齐。
|
||||
*
|
||||
* @param name 商品名称
|
||||
* @param quantity 数量文本
|
||||
* @param child 是否为套餐组成项
|
||||
* @param emphasized 是否使用粗体标记套餐主项
|
||||
* @return 当前绘制器
|
||||
*/
|
||||
public ThermalReceiptImage item(String name, String quantity, boolean child, boolean emphasized) {
|
||||
return item(name, quantity, child, emphasized, QUANTITY_COLUMN_WIDTH);
|
||||
}
|
||||
|
||||
/**
|
||||
* 绘制带数量和金额摘要的发票商品行。
|
||||
*
|
||||
* @param name 商品名称
|
||||
* @param quantity 数量或重量文本
|
||||
* @param amount 含货币符号的商品总价
|
||||
* @return 当前绘制器
|
||||
*/
|
||||
public ThermalReceiptImage invoiceItem(String name, String quantity, String amount) {
|
||||
return item(name, String.format("%s %s", quantity, amount), false, false, 190);
|
||||
}
|
||||
|
||||
/**
|
||||
* 绘制兑换券商品卡片，使用文字标签和边框粗细同时区分组合商品与单品。
|
||||
*
|
||||
* <p>商品名称和组合内容均按真实像素宽度完整换行；价格区固定展示单价、数量和小计。
|
||||
* 组合内容只解释套餐构成，不参与当前卡片金额计算。</p>
|
||||
*
|
||||
* @param name 商品快照名称；空值显示“未命名商品”
|
||||
* @param quantity 部分退款后的剩余可履约数量
|
||||
* @param unitPrice 商品快照单价，单位元且不含货币符号
|
||||
* @param subtotal 剩余可履约数量对应的小计，单位元且不含货币符号
|
||||
* @param combo 是否为组合商品
|
||||
* @param componentItems 组合商品组成说明，每项应已包含对应数量；单品或无组成时可为空
|
||||
* @return 当前绘制器
|
||||
*/
|
||||
public ThermalReceiptImage voucherProduct(String name, int quantity, String unitPrice, String subtotal,
|
||||
boolean combo, List<String> componentItems) {
|
||||
String typeLabel = combo ? "组合商品" : "单品";
|
||||
String safeName = name == null || name.isBlank() ? "未命名商品" : name;
|
||||
String safeUnitPrice = unitPrice == null || unitPrice.isBlank() ? "--" : unitPrice;
|
||||
String safeSubtotal = subtotal == null || subtotal.isBlank() ? "--" : subtotal;
|
||||
List<String> safeComponents = componentItems == null ? List.of() : componentItems.stream()
|
||||
.filter(item -> item != null && !item.isBlank()).toList();
|
||||
int innerWidth = contentWidth() - PRODUCT_CARD_PADDING * 2;
|
||||
|
||||
setFont(Font.BOLD, 28);
|
||||
FontMetrics tagMetrics = graphics.getFontMetrics();
|
||||
int tagHeight = tagMetrics.getHeight() + 6;
|
||||
int tagWidth = tagMetrics.stringWidth(typeLabel) + 20;
|
||||
|
||||
setFont(Font.BOLD, 40);
|
||||
FontMetrics nameMetrics = graphics.getFontMetrics();
|
||||
List<String> nameLines = wrap(safeName, innerWidth, nameMetrics);
|
||||
int nameLineHeight = nameMetrics.getHeight() + 4;
|
||||
|
||||
setFont(Font.PLAIN, 29);
|
||||
FontMetrics priceMetrics = graphics.getFontMetrics();
|
||||
String priceAndQuantity = "单价 ￥" + safeUnitPrice + " x" + Math.max(0, quantity);
|
||||
String subtotalText = "小计 ￥" + safeSubtotal;
|
||||
boolean splitPriceLine = priceMetrics.stringWidth(priceAndQuantity)
|
||||
+ priceMetrics.stringWidth(subtotalText) + 24 > innerWidth;
|
||||
int priceLineHeight = priceMetrics.getHeight() + 4;
|
||||
|
||||
setFont(Font.PLAIN, 29);
|
||||
FontMetrics componentMetrics = graphics.getFontMetrics();
|
||||
int componentLineHeight = componentMetrics.getHeight() + 3;
|
||||
List<List<String>> componentLines = new ArrayList<>();
|
||||
for (String component : safeComponents) {
|
||||
componentLines.add(wrap("- " + component, innerWidth - CHILD_INDENT, componentMetrics));
|
||||
}
|
||||
int componentHeight = componentLines.stream().mapToInt(List::size).sum() * componentLineHeight;
|
||||
int comboSectionHeight = combo && !componentLines.isEmpty()
|
||||
? 18 + componentLineHeight + componentHeight : 0;
|
||||
int cardHeight = PRODUCT_CARD_PADDING + tagHeight + 10 + nameLines.size() * nameLineHeight + 8
|
||||
+ (splitPriceLine ? priceLineHeight * 2 : priceLineHeight) + comboSectionHeight
|
||||
+ PRODUCT_CARD_PADDING;
|
||||
ensureCapacity(cardHeight + PRODUCT_CARD_GAP);
|
||||
|
||||
int cardTop = cursorY;
|
||||
int contentX = HORIZONTAL_PADDING + PRODUCT_CARD_PADDING;
|
||||
int contentY = cardTop + PRODUCT_CARD_PADDING;
|
||||
graphics.setColor(Color.BLACK);
|
||||
graphics.setStroke(new BasicStroke(combo ? 4F : 2F));
|
||||
graphics.drawRect(HORIZONTAL_PADDING, cardTop, contentWidth(), cardHeight);
|
||||
|
||||
setFont(Font.BOLD, 28);
|
||||
if (combo) {
|
||||
graphics.fillRect(contentX, contentY, tagWidth, tagHeight);
|
||||
graphics.setColor(Color.WHITE);
|
||||
graphics.drawString(typeLabel, contentX + 10, contentY + 3 + tagMetrics.getAscent());
|
||||
graphics.setColor(Color.BLACK);
|
||||
} else {
|
||||
graphics.setStroke(new BasicStroke(2F));
|
||||
graphics.drawRect(contentX, contentY, tagWidth, tagHeight);
|
||||
graphics.drawString(typeLabel, contentX + 10, contentY + 3 + tagMetrics.getAscent());
|
||||
}
|
||||
contentY += tagHeight + 10;
|
||||
|
||||
setFont(Font.BOLD, 40);
|
||||
for (String line : nameLines) {
|
||||
graphics.drawString(line, contentX, contentY + nameMetrics.getAscent());
|
||||
contentY += nameLineHeight;
|
||||
}
|
||||
contentY += 8;
|
||||
|
||||
setFont(Font.PLAIN, 29);
|
||||
graphics.drawString(priceAndQuantity, contentX, contentY + priceMetrics.getAscent());
|
||||
if (splitPriceLine) {
|
||||
contentY += priceLineHeight;
|
||||
}
|
||||
graphics.drawString(subtotalText,
|
||||
PAPER_WIDTH_PIXELS - HORIZONTAL_PADDING - PRODUCT_CARD_PADDING
|
||||
- priceMetrics.stringWidth(subtotalText),
|
||||
contentY + priceMetrics.getAscent());
|
||||
contentY += priceLineHeight;
|
||||
|
||||
if (combo && !componentLines.isEmpty()) {
|
||||
contentY += 8;
|
||||
graphics.setStroke(new BasicStroke(1F));
|
||||
graphics.drawLine(contentX, contentY,
|
||||
PAPER_WIDTH_PIXELS - HORIZONTAL_PADDING - PRODUCT_CARD_PADDING, contentY);
|
||||
contentY += 10;
|
||||
setFont(Font.BOLD, 29);
|
||||
graphics.drawString("组合内容", contentX, contentY + componentMetrics.getAscent());
|
||||
contentY += componentLineHeight;
|
||||
setFont(Font.PLAIN, 29);
|
||||
for (List<String> lines : componentLines) {
|
||||
for (String line : lines) {
|
||||
graphics.drawString(line, contentX + CHILD_INDENT,
|
||||
contentY + componentMetrics.getAscent());
|
||||
contentY += componentLineHeight;
|
||||
}
|
||||
}
|
||||
}
|
||||
cursorY += cardHeight + PRODUCT_CARD_GAP;
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* 绘制兑换券商品合计，使用粗分隔线和大号金额形成票据金额层级。
|
||||
*
|
||||
* @param totalAmount 剩余可履约商品合计，单位元且不含货币符号
|
||||
* @return 当前绘制器
|
||||
*/
|
||||
public ThermalReceiptImage voucherTotal(String totalAmount) {
|
||||
String safeAmount = totalAmount == null || totalAmount.isBlank() ? "--" : totalAmount;
|
||||
String label = "商品合计";
|
||||
String amount = "￥" + safeAmount;
|
||||
setFont(Font.BOLD, 42);
|
||||
FontMetrics metrics = graphics.getFontMetrics();
|
||||
int blockHeight = metrics.getHeight() + 30;
|
||||
ensureCapacity(blockHeight + 14);
|
||||
graphics.setColor(Color.BLACK);
|
||||
graphics.setStroke(new BasicStroke(3F));
|
||||
graphics.drawLine(HORIZONTAL_PADDING, cursorY,
|
||||
PAPER_WIDTH_PIXELS - HORIZONTAL_PADDING, cursorY);
|
||||
int baseline = cursorY + 15 + metrics.getAscent();
|
||||
graphics.drawString(label, HORIZONTAL_PADDING, baseline);
|
||||
graphics.drawString(amount, PAPER_WIDTH_PIXELS - HORIZONTAL_PADDING - metrics.stringWidth(amount), baseline);
|
||||
graphics.drawLine(HORIZONTAL_PADDING, cursorY + blockHeight,
|
||||
PAPER_WIDTH_PIXELS - HORIZONTAL_PADDING, cursorY + blockHeight);
|
||||
cursorY += blockHeight + 14;
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* 使用指定尾列宽度绘制一条可换行明细。
|
||||
*
|
||||
* @param name 左侧名称
|
||||
* @param trailing 首行右对齐摘要
|
||||
* @param child 是否为套餐组成项
|
||||
* @param emphasized 是否使用粗体
|
||||
* @param trailingWidth 尾列预留像素宽度
|
||||
* @return 当前绘制器
|
||||
*/
|
||||
private ThermalReceiptImage item(String name, String trailing, boolean child, boolean emphasized,
|
||||
int trailingWidth) {
|
||||
setFont(emphasized ? Font.BOLD : Font.PLAIN, child ? 30 : 34);
|
||||
FontMetrics metrics = graphics.getFontMetrics();
|
||||
int indent = child ? CHILD_INDENT : 0;
|
||||
String prefix = child ? "- " : "";
|
||||
String safeName = prefix + (name == null || name.isBlank() ? "未命名商品" : name);
|
||||
List<String> lines = wrap(safeName, contentWidth() - indent - trailingWidth, metrics);
|
||||
int lineHeight = metrics.getHeight() + 5;
|
||||
ensureCapacity(lines.size() * lineHeight + 8);
|
||||
for (int index = 0; index < lines.size(); index++) {
|
||||
graphics.drawString(lines.get(index), HORIZONTAL_PADDING + indent,
|
||||
cursorY + index * lineHeight + metrics.getAscent());
|
||||
}
|
||||
String safeTrailing = trailing == null || trailing.isBlank() ? "x0" : trailing;
|
||||
graphics.drawString(safeTrailing, PAPER_WIDTH_PIXELS - HORIZONTAL_PADDING - metrics.stringWidth(safeTrailing),
|
||||
cursorY + metrics.getAscent());
|
||||
cursorY += lines.size() * lineHeight + 6;
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* 绘制横向分隔线。
|
||||
*
|
||||
* @return 当前绘制器
|
||||
*/
|
||||
public ThermalReceiptImage divider() {
|
||||
ensureCapacity(28);
|
||||
graphics.setStroke(new BasicStroke(2F));
|
||||
graphics.drawLine(HORIZONTAL_PADDING, cursorY + 10,
|
||||
PAPER_WIDTH_PIXELS - HORIZONTAL_PADDING, cursorY + 10);
|
||||
cursorY += 28;
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* 输出裁剪到实际高度的 PNG 字节。
|
||||
*
|
||||
* @return PNG 字节
|
||||
* @throws IOException PNG 编码失败
|
||||
*/
|
||||
public byte[] toPngBytes() throws IOException {
|
||||
int finalHeight = cursorY + VERTICAL_PADDING;
|
||||
BufferedImage result = new BufferedImage(PAPER_WIDTH_PIXELS, finalHeight, BufferedImage.TYPE_INT_RGB);
|
||||
Graphics2D resultGraphics = result.createGraphics();
|
||||
resultGraphics.setColor(Color.WHITE);
|
||||
resultGraphics.fillRect(0, 0, result.getWidth(), result.getHeight());
|
||||
resultGraphics.drawImage(canvas, 0, 0, null);
|
||||
resultGraphics.dispose();
|
||||
graphics.dispose();
|
||||
try (ByteArrayOutputStream output = new ByteArrayOutputStream()) {
|
||||
ImageIO.write(result, "png", output);
|
||||
return output.toByteArray();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 设置当前字体。
|
||||
*
|
||||
* @param style 字体样式
|
||||
* @param size 字体像素大小
|
||||
*/
|
||||
private void setFont(int style, int size) {
|
||||
graphics.setFont(new Font(FONT_FAMILY, style, size));
|
||||
}
|
||||
|
||||
/**
|
||||
* 绘制一行居中文本并推进游标。
|
||||
*
|
||||
* @param text 文本
|
||||
* @param bottomSpace 底部留白
|
||||
*/
|
||||
private void drawCentered(String text, int bottomSpace) {
|
||||
String safeText = text == null ? "" : text;
|
||||
FontMetrics metrics = graphics.getFontMetrics();
|
||||
ensureCapacity(metrics.getHeight() + bottomSpace);
|
||||
int x = Math.max(HORIZONTAL_PADDING,
|
||||
(PAPER_WIDTH_PIXELS - metrics.stringWidth(safeText)) / 2);
|
||||
graphics.drawString(safeText, x, cursorY + metrics.getAscent());
|
||||
cursorY += metrics.getHeight() + bottomSpace;
|
||||
}
|
||||
|
||||
/**
|
||||
* 按实际字体宽度拆分字符串，单个超宽字符仍至少独占一行。
|
||||
*
|
||||
* @param text 原文本
|
||||
* @param maxWidth 最大像素宽度
|
||||
* @param metrics 当前字体度量
|
||||
* @return 非空行列表
|
||||
*/
|
||||
private List<String> wrap(String text, int maxWidth, FontMetrics metrics) {
|
||||
List<String> lines = new ArrayList<>();
|
||||
StringBuilder line = new StringBuilder();
|
||||
String safeText = text == null ? "" : text;
|
||||
for (int offset = 0; offset < safeText.length();) {
|
||||
int codePoint = safeText.codePointAt(offset);
|
||||
String character = new String(Character.toChars(codePoint));
|
||||
if (line.length() > 0 && metrics.stringWidth(line + character) > maxWidth) {
|
||||
lines.add(line.toString());
|
||||
line.setLength(0);
|
||||
}
|
||||
line.append(character);
|
||||
offset += Character.charCount(codePoint);
|
||||
}
|
||||
if (line.length() > 0 || lines.isEmpty()) lines.add(line.toString());
|
||||
return lines;
|
||||
}
|
||||
|
||||
/**
|
||||
* 确保画布能够容纳下一块内容，并在扩容时保留字体、画笔和已绘制像素。
|
||||
*
|
||||
* @param requiredHeight 下一块内容需要的高度
|
||||
*/
|
||||
private void ensureCapacity(int requiredHeight) {
|
||||
if (cursorY + requiredHeight <= canvas.getHeight()) return;
|
||||
int newHeight = canvas.getHeight();
|
||||
while (cursorY + requiredHeight > newHeight) newHeight += HEIGHT_GROWTH;
|
||||
Font font = graphics.getFont();
|
||||
Color color = graphics.getColor();
|
||||
BufferedImage expanded = new BufferedImage(PAPER_WIDTH_PIXELS, newHeight, BufferedImage.TYPE_INT_RGB);
|
||||
Graphics2D expandedGraphics = expanded.createGraphics();
|
||||
configureGraphics(expandedGraphics);
|
||||
expandedGraphics.setColor(Color.WHITE);
|
||||
expandedGraphics.fillRect(0, 0, expanded.getWidth(), expanded.getHeight());
|
||||
expandedGraphics.drawImage(canvas, 0, 0, null);
|
||||
expandedGraphics.setFont(font);
|
||||
expandedGraphics.setColor(color);
|
||||
graphics.dispose();
|
||||
canvas = expanded;
|
||||
graphics = expandedGraphics;
|
||||
}
|
||||
|
||||
/**
|
||||
* 配置文字抗锯齿和高质量图片渲染参数。
|
||||
*
|
||||
* @param target 待配置绘制上下文
|
||||
*/
|
||||
private static void configureGraphics(Graphics2D target) {
|
||||
target.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
|
||||
target.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY);
|
||||
}
|
||||
|
||||
/**
|
||||
* 计算扣除左右安全留白后的有效宽度。
|
||||
*
|
||||
* @return 内容宽度
|
||||
*/
|
||||
private static int contentWidth() {
|
||||
return PAPER_WIDTH_PIXELS - HORIZONTAL_PADDING * 2;
|
||||
}
|
||||
}
|
||||
+5
@@ -63,6 +63,11 @@ public class HardInvoiceVo extends HardInvoiceEntity implements BaseDeptInterfac
|
||||
|
||||
private String hardType;
|
||||
|
||||
/**
|
||||
* 任务绑定的尔印 USB 打印机资产名称。
|
||||
*/
|
||||
private String printerHardName;
|
||||
|
||||
/**
|
||||
* 用户相关
|
||||
*/
|
||||
|
||||
+32
@@ -0,0 +1,32 @@
|
||||
package com.bsd.pjcloud.hard.api.vo;
|
||||
|
||||
import com.bsd.pjcloud.hard.api.entity.HardPrinterBindingEntity;
|
||||
import com.bsd.pjcloud.hard.api.entity.HardPrinterConfigEntity;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
/**
|
||||
* 业务终端与无屏 USB 打印机绑定关系及展示信息。
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Schema(description = "USB 打印机绑定详情")
|
||||
public class HardPrinterBindingVo extends HardPrinterBindingEntity {
|
||||
|
||||
/** 来源业务终端名称。 */
|
||||
@Schema(description = "来源业务终端名称")
|
||||
private String sourceHardName;
|
||||
|
||||
/** 来源业务终端类型。 */
|
||||
@Schema(description = "来源业务终端类型")
|
||||
private String sourceHardType;
|
||||
|
||||
/** 逻辑打印机资产名称。 */
|
||||
@Schema(description = "逻辑打印机资产名称")
|
||||
private String printerHardName;
|
||||
|
||||
/** 目标 USB 打印机当前配置；尚未保存时返回默认配置。 */
|
||||
@Schema(description = "USB 打印机配置")
|
||||
private HardPrinterConfigEntity printerConfig;
|
||||
}
|
||||
+32
@@ -0,0 +1,32 @@
|
||||
package com.bsd.pjcloud.hard.api.vo.android;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* Android 终端离线人员快照分页结果。
|
||||
*/
|
||||
@Data
|
||||
public class HardOfflineUserSyncSnapshotVo {
|
||||
|
||||
/**
|
||||
* 当前页用户记录；服务端按用户主键严格升序返回，仅包含绑定了可用钱包的用户。
|
||||
*/
|
||||
private List<HardOfflineUserVo> records;
|
||||
|
||||
/**
|
||||
* 下一页排他游标；末页等于当前请求游标。
|
||||
*/
|
||||
private Long nextAfterId;
|
||||
|
||||
/**
|
||||
* 是否还有位于固定快照上界内的下一页。
|
||||
*/
|
||||
private Boolean hasMore;
|
||||
|
||||
/**
|
||||
* 本次快照固定的用户主键上界；分页期间数据变化不会扩大同步范围。
|
||||
*/
|
||||
private Long snapshotMaxId;
|
||||
}
|
||||
+48
@@ -0,0 +1,48 @@
|
||||
package com.bsd.pjcloud.hard.api.vo.android;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* Android 终端离线人员快照记录。
|
||||
*
|
||||
* <p>仅包含断网消费匹配和展示所需的字段：姓名已按首字符脱敏，不返回手机号、
|
||||
* 头像等个人信息；余额为同步时刻的服务端快照，离线扣款后以本地订单为准。</p>
|
||||
*/
|
||||
@Data
|
||||
public class HardOfflineUserVo {
|
||||
|
||||
/**
|
||||
* 用户ID；同时作为快照分页游标。
|
||||
*/
|
||||
private Long userId;
|
||||
|
||||
/**
|
||||
* 脱敏用户名，例如“张*”。
|
||||
*/
|
||||
private String username;
|
||||
|
||||
/**
|
||||
* 钱包卡号；断网刷离线饭卡时的匹配键。
|
||||
*/
|
||||
private String walletCardNumber;
|
||||
|
||||
/**
|
||||
* 钱包id。
|
||||
*/
|
||||
private Long walletId;
|
||||
|
||||
/**
|
||||
* 钱包类型id。
|
||||
*/
|
||||
private Long walletTypeId;
|
||||
|
||||
/**
|
||||
* 钱包余额(分)快照。
|
||||
*/
|
||||
private Integer walletBalance;
|
||||
|
||||
/**
|
||||
* 用户所属的商户id，主要用于机器的离线模式。
|
||||
*/
|
||||
private Long canteenId;
|
||||
}
|
||||
+60
@@ -6,6 +6,11 @@ import com.bsd.pjcloud.hard.api.vo.base.BaseHardGroupInterface;
|
||||
import com.bsd.pjcloud.wallet.api.vo.base.BaseMchInterface;
|
||||
import lombok.Data;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
/**
|
||||
* 设备管理视图，包含设备基础资料及仅用于接口返回的关联、运行状态信息。
|
||||
*/
|
||||
@Data
|
||||
public class HardManagerVo extends HardManagerEntity implements BaseDeptInterface, BaseMchInterface, BaseHardGroupInterface {
|
||||
|
||||
@@ -29,4 +34,59 @@ public class HardManagerVo extends HardManagerEntity implements BaseDeptInterfac
|
||||
|
||||
private String hardGroupName;
|
||||
|
||||
/**
|
||||
* 终端是否在线；超市、食堂设备返回布尔值，其他设备类型返回 {@code null} 表示暂不支持。
|
||||
*/
|
||||
private Boolean online;
|
||||
|
||||
/**
|
||||
* 服务端最近收到终端心跳的时间；尚未上报或设备类型不支持时为空。
|
||||
*/
|
||||
private LocalDateTime lastOnlineTime;
|
||||
|
||||
/**
|
||||
* 当前 APK 展示版本号，来源于终端最近一次心跳；未上报时为空。
|
||||
*/
|
||||
private String apkVersionName;
|
||||
|
||||
/**
|
||||
* 当前 APK 内部版本码，来源于终端最近一次心跳；未上报时为空。
|
||||
*/
|
||||
private Long apkVersionCode;
|
||||
|
||||
/**
|
||||
* 断开连接的可解释原因；除主动自动更新外均为基于心跳超时的推断结果。
|
||||
*/
|
||||
private String disconnectReason;
|
||||
|
||||
/** 当前来源业务终端所绑定的 EY_PRINT 打印机资产 ID；未绑定或当前行为打印机时为空。 */
|
||||
private Long boundPrinterHardId;
|
||||
|
||||
/** 当前来源业务终端所绑定的 EY_PRINT 设备名称。 */
|
||||
private String boundPrinterHardName;
|
||||
|
||||
/** 当前 EY_PRINT 打印机资产反向绑定的来源业务终端 ID；未绑定或当前行为来源设备时为空。 */
|
||||
private Long boundSourceHardId;
|
||||
|
||||
/** 当前 EY_PRINT 打印机资产反向绑定的来源业务终端名称。 */
|
||||
private String boundSourceHardName;
|
||||
|
||||
/** EY_PRINT 型号；未维护配置或非打印设备时为空。 */
|
||||
private String printerModel;
|
||||
|
||||
/** EY_PRINT 的 USB 厂商编号 VID；尚未真机回填时为空。 */
|
||||
private Integer usbVendorId;
|
||||
|
||||
/** EY_PRINT 的 USB 产品编号 PID；尚未真机回填时为空。 */
|
||||
private Integer usbProductId;
|
||||
|
||||
/** 热敏纸宽度，首期固定为 80mm。 */
|
||||
private Integer paperWidth;
|
||||
|
||||
/** 自动切刀开关，1 开启、0 关闭。 */
|
||||
private String autoCut;
|
||||
|
||||
/** 图片指令模式，首选 GS_V0，兼容 ESC_STAR。 */
|
||||
private String imageMode;
|
||||
|
||||
}
|
||||
+26
@@ -0,0 +1,26 @@
|
||||
package com.bsd.pjcloud.hard.api.vo.manager;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
/**
|
||||
* 终端申请商户部门人脸质量上报租约的结果。
|
||||
*/
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class HardTerminalFaceQualityLeaseVo {
|
||||
|
||||
/**
|
||||
* 当前设备是否取得租约；未取得时必须跳过本轮质量批量上报。
|
||||
*/
|
||||
private boolean granted;
|
||||
|
||||
/**
|
||||
* 当前租约剩余秒数；Redis 未返回有效 TTL 时为 {@code 0}。
|
||||
*/
|
||||
private long remainingSeconds;
|
||||
}
|
||||
+23
@@ -0,0 +1,23 @@
|
||||
package com.bsd.pjcloud.hard.api.vo.manager;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
/**
|
||||
* 终端日志设备聚合摘要。
|
||||
*/
|
||||
@Data
|
||||
@Schema(description = "终端日志设备摘要")
|
||||
public class HardTerminalLogDeviceVo {
|
||||
|
||||
private Long hardId;
|
||||
private String hardName;
|
||||
private String uniqueCode;
|
||||
private String hardType;
|
||||
private Long merchantId;
|
||||
private Long deptId;
|
||||
private Long fileCount;
|
||||
private LocalDateTime latestUploadTime;
|
||||
}
|
||||
+27
@@ -0,0 +1,27 @@
|
||||
package com.bsd.pjcloud.hard.api.vo.manager;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 终端日志文件树节点。
|
||||
*/
|
||||
@Data
|
||||
@Schema(description = "终端日志文件树节点")
|
||||
public class HardTerminalLogFileTreeVo {
|
||||
|
||||
private String key;
|
||||
private String label;
|
||||
private String relativePath;
|
||||
private Boolean directory;
|
||||
private Long fileId;
|
||||
private Long fileSize;
|
||||
private LocalDate logDate;
|
||||
private LocalDateTime uploadTime;
|
||||
private List<HardTerminalLogFileTreeVo> children = new ArrayList<>();
|
||||
}
|
||||
+19
@@ -0,0 +1,19 @@
|
||||
package com.bsd.pjcloud.hard.api.vo.manager;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* 终端日志上传预检结果。
|
||||
*/
|
||||
@Data
|
||||
@Builder
|
||||
@Schema(description = "终端日志上传预检结果")
|
||||
public class HardTerminalLogPreflightVo {
|
||||
|
||||
private Long id;
|
||||
private Boolean needUpload;
|
||||
private String normalizedPath;
|
||||
private String message;
|
||||
}
|
||||
+22
@@ -0,0 +1,22 @@
|
||||
package com.bsd.pjcloud.hard.api.vo.manager;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* 终端日志尾部预览。
|
||||
*/
|
||||
@Data
|
||||
@Builder
|
||||
@Schema(description = "终端日志预览")
|
||||
public class HardTerminalLogPreviewVo {
|
||||
|
||||
private Long id;
|
||||
private String originalName;
|
||||
private String relativePath;
|
||||
private String content;
|
||||
private Integer lineCount;
|
||||
private Long fileSize;
|
||||
private Boolean truncated;
|
||||
}
|
||||
+21
@@ -0,0 +1,21 @@
|
||||
package com.bsd.pjcloud.hard.api.vo.manager;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* 终端日志上传结果。
|
||||
*/
|
||||
@Data
|
||||
@Builder
|
||||
@Schema(description = "终端日志上传结果")
|
||||
public class HardTerminalLogUploadResultVo {
|
||||
|
||||
private Long id;
|
||||
private Boolean uploaded;
|
||||
private Boolean changed;
|
||||
private String relativePath;
|
||||
private Integer uploadCount;
|
||||
private String message;
|
||||
}
|
||||
+10
@@ -21,4 +21,14 @@ public class HardCarVo extends HardCarEntity {
|
||||
// 购买次数【统计使用】
|
||||
private Long payCount;
|
||||
|
||||
/**
|
||||
* 已完成退款份数，只统计售后状态为完成的商品明细；空响应按零处理。
|
||||
*/
|
||||
private Integer refundedProductCount;
|
||||
|
||||
/**
|
||||
* 当前剩余可履约份数，计算规则为原购份数减已完成退款份数，最小为零。
|
||||
*/
|
||||
private Integer effectiveProductCount;
|
||||
|
||||
}
|
||||
+35
@@ -0,0 +1,35 @@
|
||||
package com.bsd.pjcloud.hard.api.vo.order;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
/**
|
||||
* 一次商品查询同时完成购物车落库、总价计算和商品描述的结果。
|
||||
* <p>
|
||||
* 用于收银下单路径合并原本 computerCarTotalPrice/createCard/computerCarSubject
|
||||
* 三次重复的商品远程查询。
|
||||
*/
|
||||
@Data
|
||||
@Builder
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class HardCreateCardComputeVo {
|
||||
|
||||
/**
|
||||
* 新建的父购物车 id
|
||||
*/
|
||||
private Long parentCarId;
|
||||
|
||||
/**
|
||||
* 按商品快照计算出的总价（分）
|
||||
*/
|
||||
private Integer totalPrice;
|
||||
|
||||
/**
|
||||
* 商品描述，如 "苹果x2;香蕉x0.5/kg;"
|
||||
*/
|
||||
private String subject;
|
||||
|
||||
}
|
||||
+33
@@ -0,0 +1,33 @@
|
||||
package com.bsd.pjcloud.hard.api.vo.order;
|
||||
|
||||
import com.bsd.pjcloud.hard.api.entity.order.HardOrderEvidenceImageEntity;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
/**
|
||||
* PC 订单详情使用的订单证据图片，附带稳定编码对应的中文名称。
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Schema(description = "订单识别证据图片详情")
|
||||
public class HardOrderEvidenceImageVo extends HardOrderEvidenceImageEntity {
|
||||
|
||||
/**
|
||||
* 证据类型中文名称，未知历史编码时回退原编码。
|
||||
*/
|
||||
@Schema(description = "证据类型名称")
|
||||
private String evidenceTypeName;
|
||||
|
||||
/**
|
||||
* 图片角色中文名称，未知历史编码时回退原编码。
|
||||
*/
|
||||
@Schema(description = "证据图片角色名称")
|
||||
private String evidenceRoleName;
|
||||
|
||||
/**
|
||||
* 证据状态中文名称，未知历史编码时回退原编码。
|
||||
*/
|
||||
@Schema(description = "证据状态名称")
|
||||
private String statusName;
|
||||
}
|
||||
+34
@@ -0,0 +1,34 @@
|
||||
package com.bsd.pjcloud.hard.api.vo.order;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 终端按本地订单号对账时返回的服务端订单与证据快照。
|
||||
*/
|
||||
@Data
|
||||
@Builder
|
||||
@Schema(description = "订单证据对账结果")
|
||||
public class HardOrderEvidenceResolveVo {
|
||||
|
||||
/**
|
||||
* 服务端订单主键。
|
||||
*/
|
||||
@Schema(description = "服务端订单主键")
|
||||
private Long orderId;
|
||||
|
||||
/**
|
||||
* 服务端订单状态，终端仅在现有支付流程确认成功后上传证据。
|
||||
*/
|
||||
@Schema(description = "订单状态")
|
||||
private String orderStatus;
|
||||
|
||||
/**
|
||||
* 当前服务端已登记的证据位置和状态，用于终端幂等跳过成功项。
|
||||
*/
|
||||
@Schema(description = "证据列表")
|
||||
private List<HardOrderEvidenceImageVo> evidenceImages;
|
||||
}
|
||||
+50
@@ -0,0 +1,50 @@
|
||||
package com.bsd.pjcloud.hard.api.vo.order;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* 终端提交元数据、复制参考图或上传现场图后的幂等处理结果。
|
||||
*/
|
||||
@Data
|
||||
@Builder
|
||||
@Schema(description = "订单证据处理结果")
|
||||
public class HardOrderEvidenceUploadResultVo {
|
||||
|
||||
/**
|
||||
* 服务端证据记录主键。
|
||||
*/
|
||||
@Schema(description = "证据记录主键")
|
||||
private Long evidenceId;
|
||||
|
||||
/**
|
||||
* 服务端订单主键。
|
||||
*/
|
||||
@Schema(description = "订单主键")
|
||||
private Long orderId;
|
||||
|
||||
/**
|
||||
* 处理后的证据状态。
|
||||
*/
|
||||
@Schema(description = "证据状态")
|
||||
private String status;
|
||||
|
||||
/**
|
||||
* AVAILABLE 状态下的图片访问地址，其他状态允许为空。
|
||||
*/
|
||||
@Schema(description = "图片访问地址")
|
||||
private String imageUrl;
|
||||
|
||||
/**
|
||||
* 是否实际上传或复制了新文件；幂等命中时为 false。
|
||||
*/
|
||||
@Schema(description = "是否新写入文件")
|
||||
private Boolean uploaded;
|
||||
|
||||
/**
|
||||
* 面向终端同步日志的简短处理结果。
|
||||
*/
|
||||
@Schema(description = "处理结果说明")
|
||||
private String message;
|
||||
}
|
||||
Loaded 100 of 243 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user