diff --git a/app/src/main/resources/sql/h2/create_all_tables_ddl_v1.h2.sql b/app/src/main/resources/sql/h2/create_all_tables_ddl_v1.h2.sql index 0e9de41..c4f9a87 100644 --- a/app/src/main/resources/sql/h2/create_all_tables_ddl_v1.h2.sql +++ b/app/src/main/resources/sql/h2/create_all_tables_ddl_v1.h2.sql @@ -651,6 +651,7 @@ create table `t_component_library` `id` int not null auto_increment comment '主键id', `version` varchar(255) not null comment '版本', `name` varchar(255) not null comment '名称', + `app_id` int comment '关联应用id', `package` varchar(255) not null comment '包名', `registry` varchar(255) comment '注册', `framework` varchar(255) not null comment '技术栈', diff --git a/app/src/main/resources/sql/h2/update_all_tables_ddl.sql b/app/src/main/resources/sql/h2/update_all_tables_ddl.sql index 7a944fa..d041c58 100644 --- a/app/src/main/resources/sql/h2/update_all_tables_ddl.sql +++ b/app/src/main/resources/sql/h2/update_all_tables_ddl.sql @@ -27,3 +27,5 @@ ALTER TABLE t_platform MODIFY tenant_id varchar(60) NULL; ALTER TABLE t_platform_history MODIFY tenant_id varchar(60) NULL; ALTER TABLE t_task_record MODIFY tenant_id varchar(60) NULL; ALTER TABLE t_user MODIFY tenant_id varchar(60) NULL; + +ALTER TABLE t_component_library ADD app_id int NULL; \ No newline at end of file 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 0e9de41..c4f9a87 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 @@ -651,6 +651,7 @@ create table `t_component_library` `id` int not null auto_increment comment '主键id', `version` varchar(255) not null comment '版本', `name` varchar(255) not null comment '名称', + `app_id` int comment '关联应用id', `package` varchar(255) not null comment '包名', `registry` varchar(255) comment '注册', `framework` varchar(255) not null comment '技术栈', diff --git a/app/src/main/resources/sql/mysql/update_all_tables_ddl.sql b/app/src/main/resources/sql/mysql/update_all_tables_ddl.sql index 7a944fa..d041c58 100644 --- a/app/src/main/resources/sql/mysql/update_all_tables_ddl.sql +++ b/app/src/main/resources/sql/mysql/update_all_tables_ddl.sql @@ -27,3 +27,5 @@ ALTER TABLE t_platform MODIFY tenant_id varchar(60) NULL; ALTER TABLE t_platform_history MODIFY tenant_id varchar(60) NULL; ALTER TABLE t_task_record MODIFY tenant_id varchar(60) NULL; ALTER TABLE t_user MODIFY tenant_id varchar(60) NULL; + +ALTER TABLE t_component_library ADD app_id int NULL; \ No newline at end of file diff --git a/base/src/main/java/com/tinyengine/it/common/handler/MyMetaObjectHandler.java b/base/src/main/java/com/tinyengine/it/common/handler/MyMetaObjectHandler.java index 27596b7..d54aa94 100644 --- a/base/src/main/java/com/tinyengine/it/common/handler/MyMetaObjectHandler.java +++ b/base/src/main/java/com/tinyengine/it/common/handler/MyMetaObjectHandler.java @@ -41,6 +41,7 @@ public void insertFill(MetaObject metaObject) { this.setFieldValByName("createdBy", loginUserContext.getLoginUserId(), metaObject); this.setFieldValByName("lastUpdatedBy", loginUserContext.getLoginUserId(), metaObject); this.setFieldValByName("platformId", loginUserContext.getPlatformId(), metaObject); + fillStrategy(metaObject, "tenantId", loginUserContext.getTenantId()); } @Override diff --git a/base/src/main/java/com/tinyengine/it/model/entity/ComponentLibrary.java b/base/src/main/java/com/tinyengine/it/model/entity/ComponentLibrary.java index 86d1671..b9555f1 100644 --- a/base/src/main/java/com/tinyengine/it/model/entity/ComponentLibrary.java +++ b/base/src/main/java/com/tinyengine/it/model/entity/ComponentLibrary.java @@ -44,6 +44,9 @@ public class ComponentLibrary extends BaseEntity { @Schema(name = "name", description = "名称") private String name; + @Schema(name = "appId", description = "关联应用id") + private Integer appId; + @JsonProperty("package") @Schema(name = "package", description = "包名") private String packageName; diff --git a/base/src/main/java/com/tinyengine/it/service/app/impl/PageServiceImpl.java b/base/src/main/java/com/tinyengine/it/service/app/impl/PageServiceImpl.java index 3e59426..8651621 100644 --- a/base/src/main/java/com/tinyengine/it/service/app/impl/PageServiceImpl.java +++ b/base/src/main/java/com/tinyengine/it/service/app/impl/PageServiceImpl.java @@ -530,7 +530,7 @@ public Result del(Integer id) { */ public Result checkDelete(Integer id) { // needTODO 从缓存中获取的user信息 - User user = userService.queryUserById(1); + User user = userService.queryUserById(Integer.parseInt(loginUserContext.getLoginUserId())); Page page = pageMapper.queryPageById(id); User occupier = page.getOccupier(); diff --git a/base/src/main/resources/mappers/ComponentLibraryMapper.xml b/base/src/main/resources/mappers/ComponentLibraryMapper.xml index 65f344a..22821ff 100644 --- a/base/src/main/resources/mappers/ComponentLibraryMapper.xml +++ b/base/src/main/resources/mappers/ComponentLibraryMapper.xml @@ -7,7 +7,7 @@ id - , version, `name`, package, registry, framework, description, script, css, bundle, dependencies, `others`, thumbnail, `public`, is_started, is_official, is_default, created_by, last_updated_by, created_time, last_updated_time, + , version, `name`, app_id, package, registry, framework, description, script, css, bundle, dependencies, `others`, thumbnail, `public`, is_started, is_official, is_default, created_by, last_updated_by, created_time, last_updated_time, tenant_id, renter_id, site_id @@ -19,6 +19,9 @@ AND `name` = #{name} + + AND app_id = #{appId} + AND package = #{packageName} @@ -89,6 +92,9 @@ `name` = #{name}, + + app_id = #{appId}, + `package` = #{packageName}, @@ -156,6 +162,7 @@ + @@ -218,6 +225,7 @@ CL.id, CL.version, CL.`name`, + CL.app_id, CL.package, CL.registry, CL.framework, @@ -282,6 +290,7 @@ CL.id, CL.version, CL.`name`, + CL.app_id, CL.package, CL.registry, CL.framework, @@ -372,6 +381,7 @@ INSERT INTO t_component_library ( id , version , `name` + , app_id , package , registry , framework @@ -396,6 +406,7 @@ VALUES ( #{id} , #{version} , #{name} + , #{appId} , #{packageName} , #{registry} , #{framework} diff --git a/base/src/test/java/com/tinyengine/it/common/handler/MyMetaObjectHandlerTest.java b/base/src/test/java/com/tinyengine/it/common/handler/MyMetaObjectHandlerTest.java index d398dcd..a713172 100644 --- a/base/src/test/java/com/tinyengine/it/common/handler/MyMetaObjectHandlerTest.java +++ b/base/src/test/java/com/tinyengine/it/common/handler/MyMetaObjectHandlerTest.java @@ -36,7 +36,7 @@ void testInsertFill() throws NoSuchFieldException, IllegalAccessException { when(param.hasSetter("tenantId")).thenReturn(true); TestUtil.setPrivateValue(myMetaObjectHandler, "loginUserContext", new MockUserContext()); myMetaObjectHandler.insertFill(param); - verify(param, times(5)).hasSetter(anyString()); + verify(param, times(6)).hasSetter(anyString()); } @Test