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/2] 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/2] 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()); - } - /** * 获取文件夹深度 *