Browse Source

REPORT-138114 fix: 修复报表设置显示问题 & 规避服务注册的模块

fbp/master
Anner 2 months ago
parent
commit
b6f380c068
  1. 45
      designer-realize/src/main/java/com/fanruan/boot/adaptation/DesignServerSupportModule.java

45
designer-realize/src/main/java/com/fanruan/boot/adaptation/DesignServerSupportModule.java

@ -1,16 +1,32 @@
package com.fanruan.boot.adaptation; package com.fanruan.boot.adaptation;
import com.fanruan.carina.Carina;
import com.fanruan.carina.context.ContextListener;
import com.fanruan.portal.module.PortalModuleManager; import com.fanruan.portal.module.PortalModuleManager;
import com.fr.third.guava.collect.Sets; import com.fr.third.guava.collect.Sets;
import java.util.Optional; import java.util.Optional;
import java.util.Set; import java.util.Set;
import static com.fanruan.auth.authority.AuthAuthorityItems.USER_ADD_DEPARTMENT_ID;
import static com.fanruan.auth.authority.AuthAuthorityItems.USER_ADD_ID;
import static com.fanruan.auth.authority.AuthAuthorityItems.USER_ADD_ROLE_ID;
import static com.fanruan.auth.authority.AuthAuthorityItems.USER_DELETE_ID;
import static com.fanruan.auth.authority.AuthAuthorityItems.USER_DELETE_ROLE_ID;
import static com.fanruan.auth.authority.AuthAuthorityItems.USER_EDIT_DEP_ROLE_ID;
import static com.fanruan.auth.authority.AuthAuthorityItems.USER_EDIT_EDIT_INFO_ID;
import static com.fanruan.auth.authority.AuthAuthorityItems.USER_EDIT_ID;
import static com.fanruan.auth.authority.AuthAuthorityItems.USER_EDIT_RESET_PASSWORD_ID;
import static com.fanruan.auth.authority.AuthAuthorityItems.USER_FORBIDDEN_ID;
import static com.fanruan.auth.authority.AuthAuthorityItems.USER_ID;
import static com.fanruan.messenger.ums.authority.UMSAuthorityItems.PORTAL_MANAGEMENT_ENTERPRISE_UMS_ID;
import static com.fanruan.portal.authority.PortalAuthorityItems.ENTERPRISE_GENERAL_ID; import static com.fanruan.portal.authority.PortalAuthorityItems.ENTERPRISE_GENERAL_ID;
import static com.fanruan.portal.authority.PortalAuthorityItems.ENTERPRISE_ID; import static com.fanruan.portal.authority.PortalAuthorityItems.ENTERPRISE_ID;
import static com.fanruan.portal.authority.PortalAuthorityItems.MAP_ID; import static com.fanruan.portal.authority.PortalAuthorityItems.MAP_ID;
import static com.fanruan.portal.authority.PortalAuthorityItems.PORTAL_MANAGEMENT_ID; import static com.fanruan.portal.authority.PortalAuthorityItems.PORTAL_MANAGEMENT_ID;
import static com.fanruan.portal.authority.PortalAuthorityItems.SECURITY_ID; import static com.fanruan.portal.authority.PortalAuthorityItems.SECURITY_ID;
import static com.fr.decision.authority.base.constant.ReportAuthorityItems.ENTERPRISE_REPORT_BASE_SETTINGS_ID;
import static com.fr.decision.authority.base.constant.ReportAuthorityItems.ENTERPRISE_REPORT_ID;
/** /**
* 内置服务器支持展示的模块预期调用顺序在业务模块之后 * 内置服务器支持展示的模块预期调用顺序在业务模块之后
@ -23,10 +39,28 @@ public class DesignServerSupportModule {
private final static Set<String> SUPPORT_MODULE = Sets.newHashSet( private final static Set<String> SUPPORT_MODULE = Sets.newHashSet(
// 系统管理 // 系统管理
PORTAL_MANAGEMENT_ID, PORTAL_MANAGEMENT_ID,
// 用户管理
USER_ID,
USER_ADD_ROLE_ID,
USER_ADD_DEPARTMENT_ID,
USER_ADD_ID,
USER_EDIT_ID,
USER_EDIT_RESET_PASSWORD_ID,
USER_EDIT_EDIT_INFO_ID,
USER_EDIT_DEP_ROLE_ID,
USER_DELETE_ID,
USER_DELETE_ROLE_ID,
USER_FORBIDDEN_ID,
// 企业设置 // 企业设置
ENTERPRISE_ID, ENTERPRISE_ID,
// 企业设置 - 通知中心
PORTAL_MANAGEMENT_ENTERPRISE_UMS_ID,
// 企业设置 - 通用设置 // 企业设置 - 通用设置
ENTERPRISE_GENERAL_ID, ENTERPRISE_GENERAL_ID,
// 报表设置
ENTERPRISE_REPORT_ID,
// 报表设置 - 基础设置
ENTERPRISE_REPORT_BASE_SETTINGS_ID,
// 安全管理 // 安全管理
SECURITY_ID, SECURITY_ID,
// 地图管理 // 地图管理
@ -55,8 +89,13 @@ public class DesignServerSupportModule {
* 启动入口重建一下展示的module * 启动入口重建一下展示的module
*/ */
public static void rebuild() { public static void rebuild() {
PortalModuleManager.allModules().keySet().stream() Carina.getApplicationContext().addListener(new ContextListener() {
.filter(m -> !SUPPORT_MODULE.contains(m)) @Override
.forEach(PortalModuleManager::unregister); public void onStart() {
PortalModuleManager.allModules().keySet().stream()
.filter(m -> !SUPPORT_MODULE.contains(m))
.forEach(PortalModuleManager::unregister);
}
});
} }
} }

Loading…
Cancel
Save