From ab39d619476e859fb8d06622889bbc9f949ba3e2 Mon Sep 17 00:00:00 2001 From: zjc <1569294420@qq.com> Date: Mon, 31 Mar 2025 19:32:18 -0700 Subject: [PATCH 1/4] fix:fix page bug --- .../com/tinyengine/it/model/entity/App.java | 10 ++--- .../it/service/app/impl/PageServiceImpl.java | 40 ++++++++++++++----- 2 files changed, 36 insertions(+), 14 deletions(-) diff --git a/base/src/main/java/com/tinyengine/it/model/entity/App.java b/base/src/main/java/com/tinyengine/it/model/entity/App.java index 58b261e3..70fe58cc 100644 --- a/base/src/main/java/com/tinyengine/it/model/entity/App.java +++ b/base/src/main/java/com/tinyengine/it/model/entity/App.java @@ -86,14 +86,14 @@ public class App extends BaseEntity { @Schema(name = "config", description = "*设计预留字段*") @TableField(typeHandler = MapTypeHandler.class) - private Map config = new HashMap<>(); + private Map config; @Schema(name = "constants", description = "*设计预留字段*") private String constants; @Schema(name = "dataHandler", description = "数据源的拦截器") @TableField(typeHandler = MapTypeHandler.class) - private Map dataHandler = new HashMap<>(); + private Map dataHandler; @Schema(name = "description", description = "描述") private String description; @@ -134,14 +134,14 @@ public class App extends BaseEntity { @Schema(name = "globalState", description = "应用全局状态") @JsonProperty("global_state") @TableField(typeHandler = ListTypeHandler.class) - private List> globalState = new ArrayList<>(); + private List> globalState; @Schema(name = "defaultLang", description = "默认语言") private String defaultLang; @Schema(name = "extendConfig", description = "应用扩展config") @TableField(typeHandler = MapTypeHandler.class) - private Map extendConfig = new HashMap<>(); + private Map extendConfig; @Schema(name = "dataHash", description = "应用内容哈希值") private String dataHash; @@ -152,5 +152,5 @@ public class App extends BaseEntity { @Schema(name = "dataSourceGlobal", description = "数据源全局配置") @JsonProperty("data_source_global") @TableField(typeHandler = MapTypeHandler.class) - private Map dataSourceGlobal = new HashMap<>(); + private Map dataSourceGlobal; } 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 09095570..7a80cd65 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 @@ -138,7 +138,17 @@ public class PageServiceImpl implements PageService { @Override @SystemServiceLog(description = "通过appId查询page所有数据实现方法") public List queryAllPage(Integer aid) { - return pageMapper.queryPageByApp(aid); + List pageList = pageMapper.queryPageByApp(aid); + if(pageList == null){ + return null; + } + // 遍历数据给页面的ishome字段赋值 + for (Page page:pageList) { + if(page.getIsPage()){ + addIsHome(page); + } + } + return pageList; } /** @@ -372,15 +382,11 @@ public Result update(Page page) { // getFolder 获取父类信息 Page parentInfo = pageMapper.queryPageById(page.getId()); // 当更新参数中没有depth 或 depth没有发生改变时 - if (page.getDepth().equals(parentInfo.getDepth())) { - int result = pageMapper.updatePageById(page); - if (result < 1) { - return Result.failed(ExceptionEnum.CM001); - } - Page pagesResult = queryPageById(page.getId()); - return Result.success(pagesResult); + if (shouldUpdateDepth(page, parentInfo)) { + return performUpdate(page); } - return Result.failed(ExceptionEnum.CM002); + // 如果深度发生改变，执行更新 + return performUpdate(page); } /** @@ -419,6 +425,22 @@ public boolean setAppHomePage(int appId, int pageId) { return result >= 1; } + // 执行页面更新操作 + private Result performUpdate(Page page) { + int result = pageMapper.updatePageById(page); + if (result < 1) { + return Result.failed(ExceptionEnum.CM001); + } + + Page updatedPage = queryPageById(page.getId()); + return Result.success(updatedPage); + } + + // 判断是否需要更新深度 + private boolean shouldUpdateDepth(Page page, Page parentInfo) { + return page.getDepth() == 0 || page.getDepth().equals(parentInfo.getDepth()); + } + /** * 获取文件夹深度 * From 2ab1ef1558429f710f8ad3d3e27a20b104b53bf4 Mon Sep 17 00:00:00 2001 From: zjc <1569294420@qq.com> Date: Mon, 31 Mar 2025 23:27:43 -0700 Subject: [PATCH 2/4] fix:modify issues --- .../it/config/context/DefaultLoginUserContext.java | 2 ++ .../it/service/app/impl/PageServiceImpl.java | 11 ----------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/com/tinyengine/it/config/context/DefaultLoginUserContext.java b/app/src/main/java/com/tinyengine/it/config/context/DefaultLoginUserContext.java index 37ad3e83..b5add8e6 100644 --- a/app/src/main/java/com/tinyengine/it/config/context/DefaultLoginUserContext.java +++ b/app/src/main/java/com/tinyengine/it/config/context/DefaultLoginUserContext.java @@ -12,10 +12,12 @@ package com.tinyengine.it.config.context; import com.tinyengine.it.common.context.LoginUserContext; +import org.springframework.stereotype.Service; /** * 默认的登录用户Context实现 */ +@Service public class DefaultLoginUserContext implements LoginUserContext { @Override public String getTenantId() { 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 7a80cd65..bdbd53b4 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 @@ -379,12 +379,6 @@ public Result update(Page page) { } page.setDepth(depthInfo.getData() + 1); } - // getFolder 获取父类信息 - Page parentInfo = pageMapper.queryPageById(page.getId()); - // 当更新参数中没有depth 或 depth没有发生改变时 - if (shouldUpdateDepth(page, parentInfo)) { - return performUpdate(page); - } // 如果深度发生改变，执行更新 return performUpdate(page); } @@ -436,11 +430,6 @@ private Result performUpdate(Page page) { return Result.success(updatedPage); } - // 判断是否需要更新深度 - private boolean shouldUpdateDepth(Page page, Page parentInfo) { - return page.getDepth() == 0 || page.getDepth().equals(parentInfo.getDepth()); - } - /** * 获取文件夹深度 * From 1ae2be366666d5a4036a89eba1933b28c3b21bd4 Mon Sep 17 00:00:00 2001 From: zjc <1569294420@qq.com> Date: Wed, 2 Apr 2025 01:47:25 -0700 Subject: [PATCH 3/4] fix:fix blockgroup issues --- .../it/config/context/DefaultLoginUserContext.java | 3 +++ .../com/tinyengine/it/common/context/LoginUserContext.java | 2 ++ .../tinyengine/it/common/handler/MyMetaObjectHandler.java | 2 ++ .../com/tinyengine/it/controller/BlockGroupController.java | 6 ++++-- .../tinyengine/it/service/material/BlockGroupService.java | 2 +- .../it/service/material/impl/BlockGroupServiceImpl.java | 6 +++--- .../com/tinyengine/it/common/handler/MockUserContext.java | 3 +++ .../tinyengine/it/controller/BlockGroupControllerTest.java | 4 ++-- .../it/service/material/impl/BlockGroupServiceImplTest.java | 2 +- 9 files changed, 21 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/com/tinyengine/it/config/context/DefaultLoginUserContext.java b/app/src/main/java/com/tinyengine/it/config/context/DefaultLoginUserContext.java index b5add8e6..d0494f7b 100644 --- a/app/src/main/java/com/tinyengine/it/config/context/DefaultLoginUserContext.java +++ b/app/src/main/java/com/tinyengine/it/config/context/DefaultLoginUserContext.java @@ -43,4 +43,7 @@ public int getAppId() { public int getPlatformId() { return 1; } + + @Override + public String getSiteId() { return "1"; } } diff --git a/base/src/main/java/com/tinyengine/it/common/context/LoginUserContext.java b/base/src/main/java/com/tinyengine/it/common/context/LoginUserContext.java index 6f8bde93..a0e8adbd 100644 --- a/base/src/main/java/com/tinyengine/it/common/context/LoginUserContext.java +++ b/base/src/main/java/com/tinyengine/it/common/context/LoginUserContext.java @@ -45,4 +45,6 @@ public interface LoginUserContext { * @return 设计器ID */ public int getPlatformId(); + + public String getSiteId(); } 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 b3673728..b1b2e701 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 @@ -42,6 +42,8 @@ public void insertFill(MetaObject metaObject) { this.setFieldValByName("lastUpdatedBy", loginUserContext.getLoginUserId(), metaObject); this.setFieldValByName("tenantId", loginUserContext.getTenantId(), metaObject); this.setFieldValByName("renterId", loginUserContext.getRenterId(), metaObject); + this.setFieldValByName("siteId", loginUserContext.getSiteId(), metaObject); + this.setFieldValByName("platformId", loginUserContext.getPlatformId(), metaObject); } @Override diff --git a/base/src/main/java/com/tinyengine/it/controller/BlockGroupController.java b/base/src/main/java/com/tinyengine/it/controller/BlockGroupController.java index 32fd1c6f..12f7dd70 100644 --- a/base/src/main/java/com/tinyengine/it/controller/BlockGroupController.java +++ b/base/src/main/java/com/tinyengine/it/controller/BlockGroupController.java @@ -13,6 +13,7 @@ package com.tinyengine.it.controller; import com.tinyengine.it.common.base.Result; +import com.tinyengine.it.common.context.LoginUserContext; import com.tinyengine.it.common.exception.ExceptionEnum; import com.tinyengine.it.common.exception.ServiceException; import com.tinyengine.it.common.log.SystemControllerLog; @@ -59,6 +60,8 @@ public class BlockGroupController { private BlockGroupService blockGroupService; @Autowired private BlockGroupMapper blockGroupMapper; + @Autowired + private LoginUserContext loginUserContext; /** * 获取区块分组 @@ -111,8 +114,7 @@ public Result> getAllBlockGroups( ) @SystemControllerLog(description = "创建区块分组") @PostMapping("/block-groups/create") - public Result> createBlockGroups(@Valid @RequestBody BlockGroup blockGroup) { - blockGroup.setPlatformId(1); + public Result createBlockGroups(@Valid @RequestBody BlockGroup blockGroup) { return blockGroupService.createBlockGroup(blockGroup); } diff --git a/base/src/main/java/com/tinyengine/it/service/material/BlockGroupService.java b/base/src/main/java/com/tinyengine/it/service/material/BlockGroupService.java index b4d40294..bf6d321c 100644 --- a/base/src/main/java/com/tinyengine/it/service/material/BlockGroupService.java +++ b/base/src/main/java/com/tinyengine/it/service/material/BlockGroupService.java @@ -71,7 +71,7 @@ public interface BlockGroupService { * @param blockGroup the block group * @return the result */ - Result> createBlockGroup(BlockGroup blockGroup); + Result createBlockGroup(BlockGroup blockGroup); /** * 根据ids或者appId获取区块信息 diff --git a/base/src/main/java/com/tinyengine/it/service/material/impl/BlockGroupServiceImpl.java b/base/src/main/java/com/tinyengine/it/service/material/impl/BlockGroupServiceImpl.java index 3f6bb081..aa06da42 100644 --- a/base/src/main/java/com/tinyengine/it/service/material/impl/BlockGroupServiceImpl.java +++ b/base/src/main/java/com/tinyengine/it/service/material/impl/BlockGroupServiceImpl.java @@ -164,7 +164,7 @@ public Integer updateBlockGroupById(BlockGroup blockGroup) { * @return insert number */ @Override - public Result> createBlockGroup(BlockGroup blockGroup) { + public Result createBlockGroup(BlockGroup blockGroup) { List blockGroupsList = blockGroupMapper.queryBlockGroupByCondition(blockGroup); if (blockGroupsList.isEmpty()) { blockGroupMapper.createBlockGroup(blockGroup); @@ -173,7 +173,7 @@ public Result> createBlockGroup(BlockGroup blockGroup) { } // 页面返回数据显示 BlockGroup blockGroupResult = findBlockGroupById(blockGroup.getId()); - return Result.success(Collections.singletonList(blockGroupResult)); + return Result.success(blockGroupResult); } /** @@ -213,7 +213,7 @@ public List getBlockGroupByIdsOrAppId(List ids, Integer app for (Block block : blockGroupTemp.getBlocks()) { BlockCarriersRelation queryParam = new BlockCarriersRelation(); queryParam.setBlockId(block.getId()); - queryParam.setHostId(blockGroup.getId()); + queryParam.setHostId(blockGroupTemp.getId()); queryParam.setHostType(Enums.BlockGroup.BLOCK_GROUP.getValue()); List blockCarriersRelations = blockCarriersRelationMapper.queryBlockCarriersRelationByCondition(queryParam); if (blockCarriersRelations.isEmpty()) { diff --git a/base/src/test/java/com/tinyengine/it/common/handler/MockUserContext.java b/base/src/test/java/com/tinyengine/it/common/handler/MockUserContext.java index e39eebcf..de554cd5 100644 --- a/base/src/test/java/com/tinyengine/it/common/handler/MockUserContext.java +++ b/base/src/test/java/com/tinyengine/it/common/handler/MockUserContext.java @@ -41,4 +41,7 @@ public int getAppId() { public int getPlatformId() { return 1; } + + @Override + public String getSiteId() { return "1"; } } diff --git a/base/src/test/java/com/tinyengine/it/controller/BlockGroupControllerTest.java b/base/src/test/java/com/tinyengine/it/controller/BlockGroupControllerTest.java index 535be04f..41ebf37c 100644 --- a/base/src/test/java/com/tinyengine/it/controller/BlockGroupControllerTest.java +++ b/base/src/test/java/com/tinyengine/it/controller/BlockGroupControllerTest.java @@ -63,9 +63,9 @@ void testGetAllBlockGroups() { @Test void testCreateBlockGroups() { - when(blockGroupService.createBlockGroup(any(BlockGroup.class))).thenReturn(new Result>()); + when(blockGroupService.createBlockGroup(any(BlockGroup.class))).thenReturn(new Result()); - Result> result = blockGroupController.createBlockGroups(new BlockGroup()); + Result result = blockGroupController.createBlockGroups(new BlockGroup()); Assertions.assertEquals(new Result>(), result); } diff --git a/base/src/test/java/com/tinyengine/it/service/material/impl/BlockGroupServiceImplTest.java b/base/src/test/java/com/tinyengine/it/service/material/impl/BlockGroupServiceImplTest.java index 24059616..00592696 100644 --- a/base/src/test/java/com/tinyengine/it/service/material/impl/BlockGroupServiceImplTest.java +++ b/base/src/test/java/com/tinyengine/it/service/material/impl/BlockGroupServiceImplTest.java @@ -111,7 +111,7 @@ void testCreateBlockGroup() { when(loginUserContext.getLoginUserId()).thenReturn("1"); BlockGroup blockGroupParam = new BlockGroup(); blockGroupParam.setId(1); - Result> result = blockGroupServiceImpl.createBlockGroup(blockGroupParam); + Result result = blockGroupServiceImpl.createBlockGroup(blockGroupParam); Assertions.assertNotNull(result.getData()); } From efbd8be38e060b44ef6c05c61cb6beda018ced50 Mon Sep 17 00:00:00 2001 From: zjc <1569294420@qq.com> Date: Wed, 2 Apr 2025 01:55:31 -0700 Subject: [PATCH 4/4] fix:fix issues --- .../com/tinyengine/it/controller/BlockGroupControllerTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/src/test/java/com/tinyengine/it/controller/BlockGroupControllerTest.java b/base/src/test/java/com/tinyengine/it/controller/BlockGroupControllerTest.java index 41ebf37c..8461b4aa 100644 --- a/base/src/test/java/com/tinyengine/it/controller/BlockGroupControllerTest.java +++ b/base/src/test/java/com/tinyengine/it/controller/BlockGroupControllerTest.java @@ -66,7 +66,7 @@ void testCreateBlockGroups() { when(blockGroupService.createBlockGroup(any(BlockGroup.class))).thenReturn(new Result()); Result result = blockGroupController.createBlockGroups(new BlockGroup()); - Assertions.assertEquals(new Result>(), result); + Assertions.assertEquals(new Result(), result); } @Test