diff --git a/README.zh-CN.md b/README.zh-CN.md index e9c12268..bbf7ce7e 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -171,9 +171,6 @@ mysql 8 ### 数据迁移前后数据库表映射 -- 区块 ------->区块分组关联变化: -由nodejs的blocks_groups__block_groups_blocks重构后直接是在区块t_block表里添加了block_group_id字段进行关联，就不需要nodejs的blocks_groups__block_groups_blocks表了 - - 区块 ------->区块历史关联变化: 由nodejs的blocks__histories重构后直接在java数据库的t_block_history表里加了ref_id这个属性关联的区块表，就不需要blocks__histories关联表了 @@ -185,34 +182,36 @@ mysql 8 - 数据库表字段定义的更规范，由以前的驼峰变成下划线命名，比如isDefault -> is_default - 数据库表字段定义的意义更清晰明了，比如app -> app_id，created_at -> created_time - 数据库表里大部分新增了tenant_id、site_id、renter_id、platform_id字段以及设计器表t_platform和设计器历史表t_platform_history，由于要进行租户隔离 -- 数据库表关系更清晰明了，删除了一些没用的表关系，比如区块和区块分组的表关系，是直接在区块表里加分组的id做为外键 +- 数据库表关系更清晰明了，删除了一些没用的表关系，比如区块和区块历史的表关系，是直接在区块历史表里t_block_history加区块的id即ref_id做为外键 - 删除了block_categories区块分类，把区块分组和分类合并成了区块分组，考虑到分组和分类差不多的功能和作用 - 预留了业务分类表t_business_category、物料与业务分类的关系表r_material_category -| nodejs数据库表 | java数据库表 | 新增属性 | 删除属性 | 修改属性 | -| :----- |:----------------------------:|:----------------------------------------------------------------------------------------|:---------------------------------|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:| -| app_extensions | t_app_extension | tenant_id、site_id、renter_id | | app -> app_id、updated_by -> last_updated_by、created_at -> created_time、 updated_at -> last_updated_time、 | -| apps | t_app | site_id、renter_id | tpl-groups、created_by、updated_by | platform -> platform_id、platform_history -> platform_history_id、 obs_url -> publish_url、home_page -> home_page_id、tenant -> tenant_id、createdBy -> created_by、updatedBy -> last_updated_by、 created_at -> created_time、 updated_at -> last_updated_time | -| block_groups | t_block_group | platform_id、tenant_id、site_id、renter_id | | app -> app_id、 dec -> description、updated_by -> last_updated_by、created_at -> created_time、 updated_at -> last_updated_time | -| block_histories | t_block_history | framework、 tags、is_official、 public、is_default、tiny_reserved、platform_id、block_group_id | | created_app -> app_id、block_id -> ref_id、updated_by -> last_updated_by、created_at -> created_time、 updated_at -> last_updated_time、 | -| blocks | t_block | latest_version、 i18n | created_by、updated_by、author、 | name_cn -> name、current_history -> latest_history_id、occupier -> occupier_by、isOfficial -> is_official、isDefault -> is_default、createdBy -> created_by、updatedBy -> last_updated_by、 created_at -> created_time、 updated_at -> last_updated_time | -| block_histories_material_histories__material_histories_blocks | r_material_history_block | | | material-history_id -> material_history_id、 block-history_id -> block_history_id | -| i18n_langs | t_i18n_lang | | | updated_by -> last_updated_by、created_at -> created_time、 updated_at -> last_updated_time | -| material_histories | t_material_history | image_url、build_info、tgz_url、 material_size、site_id、renter_id | | material -> ref_id、 tenant -> tenant_id 、updated_by -> last_updated_by、created_at -> created_time、 updated_at -> last_updated_time | -| material_histories_components__user_components_mhs | r_material_history_component | | | material-history_id -> material_history_id、 user-component_id -> component_id | -| materials | t_material | material_category_id、material_size、tgz_url、unzip_tgz_root_path_url、unzip_tgz_files、tenant_id、site_id、renter_id | name_cn、user_components、latest| version -> latest_version、material_histories -> latest_history_id、isOfficial -> is_official、isDefault ->is_default、component_library -> component_library_id、 | -| materials_user_components__user_components_materials | r_material_component | | | user-component_id -> component_id | -| pages | t_page | latest_version、latest_history_id、tenant_id、site_id、renter_id|created_by、updated_by | app -> app_id、occupier -> occupier_by、createdBy -> created_by、updatedBy -> last_updated_by、created_at -> created_time、 updated_at -> last_updated_time | -| pages_histories | t_page_history | ref_id、version、app_id、depth、is_page、is_default、is_published、tenant_id、site_id、renter_id|time | updated_by -> last_updated_by、created_at -> created_time、 updated_at -> last_updated_time | -| templates | t_page_template |name、status、is_preset、image_url、tenant_id、site_id、renter_id、platform_id、 |name_en、name_cn、thumbnail、tags、created_app、create_app、created_by、updated_by |content ->page_content、tpl_type ->type、createdBy -> created_by、updatedBy -> last_updated_by、created_at -> created_time、 updated_at -> last_updated_time | -| i18n_entries | t_i18n_entry | tenant_id、site_id、renter_id | | host -> host_id、lang -> lang_id、 updated_by -> last_updated_by、created_at -> created_time、 updated_at -> last_updated_time | -| i18n_langs | t_i18n_lang | | | updated_by -> last_updated_by、created_at -> created_time、 updated_at -> last_updated_time | -| sources | t_datasource | platform_id、tenant_id、site_id、renter_id| | app -> app_id、desc -> description、updated_by -> last_updated_by、created_at -> created_time、 updated_at -> last_updated_time | -| task_record | t_task_record | build_id、tenant_id、site_id、renter_id|uniqueId、created_by、updated_by | teamId ->team_id、taskTypeId ->task_type、taskName ->task_name、taskStatus ->task_status、taskResult ->task_result、createdBy -> created_by、updatedBy -> last_updated_by、created_at -> created_time、 updated_at -> last_updated_time | -| user_components | t_component |name_en、tenant_id、site_id、renter_id |component | isOfficial ->is_official、isDefault -> is_default、library -> library_id、updated_by -> last_updated_by、created_at -> created_time、 updated_at -> last_updated_time | -| users-permissions_user | t_user |enable、tenant_id、site_id、renter_id | provider、password、resetPasswordToken、confirmationToken、confirmed、blocked| updated_by -> last_updated_by、created_at -> created_time、 updated_at -> last_updated_time | -| tenants | t_tenant | | created_by、updated_by| tenant_id -> org_code、createdBy -> created_by、updatedBy -> last_updated_by、created_at -> created_time、 updated_at -> last_updated_time | +| nodejs数据库表 | java数据库表 | 新增属性 | 删除属性 | 修改属性 | +| :----- |:----------------------------:|:----------------------------------------------------------------------------------------|:----------------------------------------------------------------------------|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:| +| app_extensions | t_app_extension | tenant_id、site_id、renter_id | | app -> app_id、updated_by -> last_updated_by、created_at -> created_time、 updated_at -> last_updated_time、 | +| apps | t_app | site_id、renter_id | tpl-groups、created_by、updated_by | platform -> platform_id、platform_history -> platform_history_id、 obs_url -> publish_url、home_page -> home_page_id、tenant -> tenant_id、createdBy -> created_by、updatedBy -> last_updated_by、 created_at -> created_time、 updated_at -> last_updated_time | +| block_groups | t_block_group | platform_id、tenant_id、site_id、renter_id | | app -> app_id、 dec -> description、updated_by -> last_updated_by、created_at -> created_time、 updated_at -> last_updated_time | +| block_histories | t_block_history | framework、 tags、is_official、 public、is_default、tiny_reserved、platform_id、block_group_id | | created_app -> app_id、block_id -> ref_id、updated_by -> last_updated_by、created_at -> created_time、 updated_at -> last_updated_time、 | +| blocks | t_block | latest_version、 i18n | created_by、updated_by、author、 | name_cn -> name、current_history -> latest_history_id、occupier -> occupier_by、isOfficial -> is_official、isDefault -> is_default、createdBy -> created_by、updatedBy -> last_updated_by、 created_at -> created_time、 updated_at -> last_updated_time | +| blocks_groups__block_groups_blocks | r_block_group_block | | |block-group_id -> block_group_id、 | +|blocks_carriers_relations|t_block_carriers_relation|tenant_id、site_id、renter_id| |block -> block_id、 host ->host_id、created_at -> created_time、updated_by -> last_updated_by、updated_at -> last_updated_time | +| block_histories_material_histories__material_histories_blocks | r_material_history_block | | | material-history_id -> material_history_id、 block-history_id -> block_history_id | +| i18n_langs | t_i18n_lang | | | updated_by -> last_updated_by、created_at -> created_time、 updated_at -> last_updated_time | +| material_histories | t_material_history | image_url、build_info、tgz_url、 material_size、site_id、renter_id | | material -> ref_id、 tenant -> tenant_id 、updated_by -> last_updated_by、created_at -> created_time、 updated_at -> last_updated_time | +| material_histories_components__user_components_mhs | r_material_history_component | | | material-history_id -> material_history_id、 user-component_id -> component_id | +| materials | t_material | material_category_id、material_size、tgz_url、unzip_tgz_root_path_url、unzip_tgz_files、tenant_id、site_id、renter_id | name_cn、user_components、latest | version -> latest_version、material_histories -> latest_history_id、isOfficial -> is_official、isDefault ->is_default、component_library -> component_library_id、 | +| materials_user_components__user_components_materials | r_material_component | | | user-component_id -> component_id | +| pages | t_page | latest_version、latest_history_id、tenant_id、site_id、renter_id| created_by、updated_by | app -> app_id、occupier -> occupier_by、createdBy -> created_by、updatedBy -> last_updated_by、created_at -> created_time、 updated_at -> last_updated_time | +| pages_histories | t_page_history | ref_id、version、app_id、depth、is_page、is_default、is_published、tenant_id、site_id、renter_id| time | updated_by -> last_updated_by、created_at -> created_time、 updated_at -> last_updated_time | +| templates | t_page_template |name、status、is_preset、image_url、tenant_id、site_id、renter_id、platform_id、 | name_en、name_cn、thumbnail、tags、created_app、create_app、created_by、updated_by |content ->page_content、tpl_type ->type、createdBy -> created_by、updatedBy -> last_updated_by、created_at -> created_time、 updated_at -> last_updated_time | +| i18n_entries | t_i18n_entry | tenant_id、site_id、renter_id | | host -> host_id、lang -> lang_id、 updated_by -> last_updated_by、created_at -> created_time、 updated_at -> last_updated_time | +| i18n_langs | t_i18n_lang | | | updated_by -> last_updated_by、created_at -> created_time、 updated_at -> last_updated_time | +| sources | t_datasource | platform_id、tenant_id、site_id、renter_id| | app -> app_id、desc -> description、updated_by -> last_updated_by、created_at -> created_time、 updated_at -> last_updated_time | +| task_record | t_task_record | build_id、tenant_id、site_id、renter_id| uniqueId、created_by、updated_by | teamId ->team_id、taskTypeId ->task_type、taskName ->task_name、taskStatus ->task_status、taskResult ->task_result、createdBy -> created_by、updatedBy -> last_updated_by、created_at -> created_time、 updated_at -> last_updated_time | +| user_components | t_component |name_en、tenant_id、site_id、renter_id | component | isOfficial ->is_official、isDefault -> is_default、library -> library_id、updated_by -> last_updated_by、created_at -> created_time、 updated_at -> last_updated_time | +| users-permissions_user | t_user |enable、tenant_id、site_id、renter_id | provider、password、resetPasswordToken、confirmationToken、confirmed、blocked | updated_by -> last_updated_by、created_at -> created_time、 updated_at -> last_updated_time | +| tenants | t_tenant | | created_by、updated_by | tenant_id -> org_code、createdBy -> created_by、updatedBy -> last_updated_by、created_at -> created_time、 updated_at -> last_updated_time | ### 🤝 参与贡献 diff --git a/app/src/main/resources/sql/mysql/create_all_tables_ddl_v1.mysql.sql b/app/src/main/resources/sql/mysql/create_all_tables_ddl_v1.mysql.sql index e94f5395..71896f28 100644 --- a/app/src/main/resources/sql/mysql/create_all_tables_ddl_v1.mysql.sql +++ b/app/src/main/resources/sql/mysql/create_all_tables_ddl_v1.mysql.sql @@ -237,7 +237,6 @@ create table `t_block_history` `npm_name` varchar(255) comment 'npm包名', `i18n` longtext NULL COMMENT '国际化', `content_blocks` longtext comment '设计预留字段', - `block_group_id` int comment '区块分组id', `tenant_id` varchar(60) not null comment '租户id', `renter_id` varchar(60) comment '业务租户id', `site_id` varchar(60) comment '站点id，设计预留字段', diff --git a/base/src/main/java/com/tinyengine/it/mapper/BlockGroupBlockMapper.java b/base/src/main/java/com/tinyengine/it/mapper/BlockGroupBlockMapper.java index 7eced891..47c878e1 100644 --- a/base/src/main/java/com/tinyengine/it/mapper/BlockGroupBlockMapper.java +++ b/base/src/main/java/com/tinyengine/it/mapper/BlockGroupBlockMapper.java @@ -90,7 +90,7 @@ public interface BlockGroupBlockMapper extends BaseMapper { List findBlockGroupBlockByBlockGroupId(Integer blockGroupId); /** - * 通过区块分组id查询分组下区块 + * 通过区块分组id和区块删除区块与分组关联关系 * @param blockId the block id * @param groupId the block group id * @return the list diff --git a/base/src/main/java/com/tinyengine/it/model/entity/BlockHistory.java b/base/src/main/java/com/tinyengine/it/model/entity/BlockHistory.java index c962d399..a6cd9060 100644 --- a/base/src/main/java/com/tinyengine/it/model/entity/BlockHistory.java +++ b/base/src/main/java/com/tinyengine/it/model/entity/BlockHistory.java @@ -110,9 +110,6 @@ public class BlockHistory extends HistoryEntity { @TableField(typeHandler = MapTypeHandler.class) private Map i18n; - @Schema(name = "blockGroupId", description = "区块分组关联Id") - private Integer blockGroupId; - @Schema(name = "contentBlocks", description = "*暂不清楚*") @TableField(typeHandler = MapTypeHandler.class) private List contentBlocks; diff --git a/base/src/main/java/com/tinyengine/it/service/material/impl/BlockServiceImpl.java b/base/src/main/java/com/tinyengine/it/service/material/impl/BlockServiceImpl.java index 1a2d9603..148cc733 100644 --- a/base/src/main/java/com/tinyengine/it/service/material/impl/BlockServiceImpl.java +++ b/base/src/main/java/com/tinyengine/it/service/material/impl/BlockServiceImpl.java @@ -254,7 +254,7 @@ public Result createBlock(BlockParam blockParam) { if (groupResult < 1) { return Result.failed(ExceptionEnum.CM001); } - return Result.success(blocksResult); + return Result.success(queryBlockById(id)); } /** @@ -555,6 +555,7 @@ public Result deploy(BlockBuildDto blockBuildDto) { blockParam.setLatestHistoryId(blockHistory); blockParam.setLatestVersion(blockHistory.getVersion()); blockParam.setId(blockDto.getId()); + blockParam.setGroups(null); return updateBlockById(blockParam, blockDto.getAppId()); } catch (Exception e) { diff --git a/base/src/main/resources/mappers/BlockHistoryMapper.xml b/base/src/main/resources/mappers/BlockHistoryMapper.xml index bdba7257..9a8c4afc 100644 --- a/base/src/main/resources/mappers/BlockHistoryMapper.xml +++ b/base/src/main/resources/mappers/BlockHistoryMapper.xml @@ -8,7 +8,7 @@ id , ref_id, message, version, label, name, framework, content, assets, build_info, screenshot, path, description, - tags, is_official, public, is_default, tiny_reserved, mode, platform_id, app_id, npm_name, i18n, block_group_id, + tags, is_official, public, is_default, tiny_reserved, mode, platform_id, app_id, npm_name, i18n, content_blocks, created_by, last_updated_by, created_time, last_updated_time, tenant_id, renter_id, site_id @@ -80,9 +80,6 @@ AND i18n = #{i18n} - - AND block_group_id = #{blockGroupId} - AND content_blocks = #{contentBlocks} @@ -177,9 +174,6 @@ i18n = #{i18n}, - - block_group_id = #{blockGroupId}, - content_blocks = #{contentBlocks}, @@ -232,7 +226,6 @@ - @@ -325,7 +318,6 @@ , app_id , npm_name , i18n - , block_group_id , content_blocks , created_by , last_updated_by @@ -357,7 +349,6 @@ , #{appId} , #{npmName} , #{i18n} - , #{blockGroupId} , #{contentBlocks} , #{createdBy} , #{lastUpdatedBy}