diff --git a/db/20261110_add_hard_manager_xfj_scene.sql b/db/20261110_add_hard_manager_xfj_scene.sql new file mode 100644 index 000000000..fcb99264d --- /dev/null +++ b/db/20261110_add_hard_manager_xfj_scene.sql @@ -0,0 +1,13 @@ +-- 云版消费机增加接入场景,使用 xfj_scene 字典,1 表示食堂。 +-- 先执行本迁移,再发布读取该字段的后端代码;历史设备通过字段默认值兼容为食堂。 +-- 字段已存在时直接跳过,支持重复执行。 +USE `pjcloudx_hardware`; + +SET @ddl = (SELECT IF(COUNT(*) = 0, + 'ALTER TABLE `hard_manager` ADD COLUMN `xfj_scene` varchar(32) NOT NULL DEFAULT ''1'' COMMENT ''云版消费机接入场景,字典xfj_scene,1食堂'' AFTER `type`', + 'SELECT 1') + FROM information_schema.COLUMNS + WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'hard_manager' AND COLUMN_NAME = 'xfj_scene'); +PREPARE stmt FROM @ddl; +EXECUTE stmt; +DEALLOCATE PREPARE stmt; diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/manager/HardManagerEntity.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/manager/HardManagerEntity.java index e80c9dfb4..bfd3f4c4c 100644 --- a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/manager/HardManagerEntity.java +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/manager/HardManagerEntity.java @@ -58,6 +58,14 @@ public class HardManagerEntity extends Model { @Schema(description="设备类型") private String type; + /** + * 云版消费机接入场景,保存 xfj_scene 字典编码,1 表示食堂,仅 type=9 时使用。 + * 未传或空串时,新增使用数据库默认值,更新保留已保存场景。 + */ + @TableField(insertStrategy = FieldStrategy.NOT_EMPTY, updateStrategy = FieldStrategy.NOT_EMPTY) + @Schema(description="云版消费机接入场景,字典xfj_scene,默认1食堂") + private String xfjScene; + /** * mq连接id */ diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/manager/HardManagerMapper.xml b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/manager/HardManagerMapper.xml index 5f34ed120..b1699c1cf 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/manager/HardManagerMapper.xml +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/manager/HardManagerMapper.xml @@ -8,6 +8,7 @@ +