Skip to content

fix:fix block function #172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lu-yg merged 1 commit into from
Feb 5, 2025
Merged

fix:fix block function #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 26 additions & 27 deletions README.zh-CN.md
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion app/src/main/resources/sql/mysql/create_all_tables_ddl_v1.mysql.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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，设计预留字段',
Expand Down
2 changes: 1 addition & 1 deletion base/src/main/java/com/tinyengine/it/mapper/BlockGroupBlockMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ public interface BlockGroupBlockMapper extends BaseMapper<BlockGroupBlock> {
List<BlockGroupBlock> findBlockGroupBlockByBlockGroupId(Integer blockGroupId);

/**
* 通过区块分组id查询分组下区块
* 通过区块分组id和区块删除区块与分组关联关系
* @param blockId the block id
* @param groupId the block group id
* @return the list
Expand Down
3 changes: 0 additions & 3 deletions base/src/main/java/com/tinyengine/it/model/entity/BlockHistory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,6 @@ public class BlockHistory extends HistoryEntity {
@TableField(typeHandler = MapTypeHandler.class)
private Map<String, Object> i18n;

@Schema(name = "blockGroupId", description = "区块分组关联Id")
private Integer blockGroupId;

@Schema(name = "contentBlocks", description = "*暂不清楚*")
@TableField(typeHandler = MapTypeHandler.class)
private List<BlockVersionDto> contentBlocks;
Expand Down
3 changes: 2 additions & 1 deletion base/src/main/java/com/tinyengine/it/service/material/impl/BlockServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ public Result<BlockDto> createBlock(BlockParam blockParam) {
if (groupResult < 1) {
return Result.failed(ExceptionEnum.CM001);
}
return Result.success(blocksResult);
return Result.success(queryBlockById(id));
}

/**
Expand Down Expand Up @@ -555,6 +555,7 @@ public Result<BlockDto> 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) {
Expand Down
11 changes: 1 addition & 10 deletions base/src/main/resources/mappers/BlockHistoryMapper.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<sql id="Base_Column_List">
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
</sql>

Expand Down Expand Up @@ -80,9 +80,6 @@
<if test="i18n!=null and i18n!=''">
AND i18n = #{i18n}
</if>
<if test="blockGroupId!=null and blockGroupId!=''">
AND block_group_id = #{blockGroupId}
</if>
<if test="contentBlocks!=null and contentBlocks!=''">
AND content_blocks = #{contentBlocks}
</if>
Expand Down Expand Up @@ -177,9 +174,6 @@
<if test="i18n!=null and i18n!=''">
i18n = #{i18n},
</if>
<if test="blockGroupId!=null and blockGroupId!=''">
block_group_id = #{blockGroupId},
</if>
<if test="contentBlocks!=null and contentBlocks!=''">
content_blocks = #{contentBlocks},
</if>
Expand Down Expand Up @@ -232,7 +226,6 @@
<result column="app_id" property="appId"/>
<result column="npm_name" property="npmName"/>
<result column="i18n" property="i18n"/>
<result column="block_group_id" property="blockGroupId"/>
<result column="content_blocks" property="contentBlocks"/>
<result column="created_by" property="createdBy"/>
<result column="last_updated_by" property="lastUpdatedBy"/>
Expand Down Expand Up @@ -325,7 +318,6 @@
, app_id
, npm_name
, i18n
, block_group_id
, content_blocks
, created_by
, last_updated_by
Expand Down Expand Up @@ -357,7 +349,6 @@
, #{appId}
, #{npmName}
, #{i18n}
, #{blockGroupId}
, #{contentBlocks}
, #{createdBy}
, #{lastUpdatedBy}
Expand Down
Loading