Skip to content

fix:fix page bug #199

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
merged 2 commits into from
Apr 1, 2025
Merged

fix:fix page bug #199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab39d61
fix:fix page bug
zhangjuncao Apr 1, 2025
2ab1ef1
fix:modify issues
zhangjuncao Apr 1, 2025
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
2 changes: 2 additions & 0 deletions app/src/main/java/com/tinyengine/it/config/context/DefaultLoginUserContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
10 changes: 5 additions & 5 deletions base/src/main/java/com/tinyengine/it/model/entity/App.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,14 +86,14 @@ public class App extends BaseEntity {

@Schema(name = "config", description = "*设计预留字段*")
@TableField(typeHandler = MapTypeHandler.class)
private Map<String, Object> config = new HashMap<>();
private Map<String, Object> config;

@Schema(name = "constants", description = "*设计预留字段*")
private String constants;

@Schema(name = "dataHandler", description = "数据源的拦截器")
@TableField(typeHandler = MapTypeHandler.class)
private Map<String, Object> dataHandler = new HashMap<>();
private Map<String, Object> dataHandler;

@Schema(name = "description", description = "描述")
private String description;
Expand Down Expand Up @@ -134,14 +134,14 @@ public class App extends BaseEntity {
@Schema(name = "globalState", description = "应用全局状态")
@JsonProperty("global_state")
@TableField(typeHandler = ListTypeHandler.class)
private List<Map<String, Object>> globalState = new ArrayList<>();
private List<Map<String, Object>> globalState;

@Schema(name = "defaultLang", description = "默认语言")
private String defaultLang;

@Schema(name = "extendConfig", description = "应用扩展config")
@TableField(typeHandler = MapTypeHandler.class)
private Map<String, Object> extendConfig = new HashMap<>();
private Map<String, Object> extendConfig;

@Schema(name = "dataHash", description = "应用内容哈希值")
private String dataHash;
Expand All @@ -152,5 +152,5 @@ public class App extends BaseEntity {
@Schema(name = "dataSourceGlobal", description = "数据源全局配置")
@JsonProperty("data_source_global")
@TableField(typeHandler = MapTypeHandler.class)
private Map<String, Object> dataSourceGlobal = new HashMap<>();
private Map<String, Object> dataSourceGlobal;
}
37 changes: 24 additions & 13 deletions base/src/main/java/com/tinyengine/it/service/app/impl/PageServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,17 @@ public class PageServiceImpl implements PageService {
@Override
@SystemServiceLog(description = "通过appId查询page所有数据实现方法")
public List<Page> queryAllPage(Integer aid) {
return pageMapper.queryPageByApp(aid);
List<Page> pageList = pageMapper.queryPageByApp(aid);
if(pageList == null){
return null;
}
// 遍历数据给页面的ishome字段赋值
for (Page page:pageList) {
if(page.getIsPage()){
addIsHome(page);
}
}
return pageList;
}

/**
Expand Down Expand Up @@ -369,18 +379,8 @@ public Result<Page> update(Page page) {
}
page.setDepth(depthInfo.getData() + 1);
}
// 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);
}
return Result.failed(ExceptionEnum.CM002);
// 如果深度发生改变，执行更新
return performUpdate(page);
}

/**
Expand Down Expand Up @@ -419,6 +419,17 @@ public boolean setAppHomePage(int appId, int pageId) {
return result >= 1;
}

// 执行页面更新操作
private Result<Page> 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);
}

/**
* 获取文件夹深度
*
Expand Down
Loading