Browse Source

Pull request #15125: REPORT-130954 fix: 设计器启动屏蔽不支持的功能

Merge in DESIGN/design from ~ANNER/design:fbp/release to fbp/release

* commit '377245fadabd2cb85ba0e446b4123c189af48d7a':
  REPORT-130954 fix: 设计器启动屏蔽不支持的功能
fbp/release
Anner-王敬松 1 month ago
parent
commit
891c1952d1
  1. 62
      designer-realize/src/main/java/com/fanruan/boot/adaptation/DesignServerSupportModule.java
  2. 5
      designer-realize/src/main/java/com/fanruan/boot/adaptation/ReportAdaptationComponent.java

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

@ -0,0 +1,62 @@
package com.fanruan.boot.adaptation;
import com.fanruan.portal.module.PortalModuleManager;
import com.fr.third.guava.collect.Sets;
import java.util.Optional;
import java.util.Set;
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.MAP_ID;
import static com.fanruan.portal.authority.PortalAuthorityItems.PORTAL_MANAGEMENT_ID;
import static com.fanruan.portal.authority.PortalAuthorityItems.SECURITY_ID;
/**
* 内置服务器支持展示的模块预期调用顺序在业务模块之后
*
* @author Anner
* @since 11.0
* Created on 2024/10/15
*/
public class DesignServerSupportModule {
private final static Set<String> SUPPORT_MODULE = Sets.newHashSet(
// 系统管理
PORTAL_MANAGEMENT_ID,
// 企业设置
ENTERPRISE_ID,
// 企业设置 - 通用设置
ENTERPRISE_GENERAL_ID,
// 安全管理
SECURITY_ID,
// 地图管理
MAP_ID
);
/**
* 注册一下支持展示的模块
*
* @param moduleName name
*/
public static void register(String moduleName) {
Optional.of(moduleName).ifPresent(SUPPORT_MODULE::add);
}
/**
* 取消注册展示的模块
*
* @param moduleName name
*/
public static void unregister(String moduleName) {
Optional.of(moduleName).ifPresent(SUPPORT_MODULE::remove);
}
/**
* 启动入口重建一下展示的module
*/
public static void rebuild() {
PortalModuleManager.allModules().keySet().stream()
.filter(m -> !SUPPORT_MODULE.contains(m))
.forEach(PortalModuleManager::unregister);
}
}

5
designer-realize/src/main/java/com/fanruan/boot/adaptation/ReportAdaptationComponent.java

@ -1,6 +1,7 @@
package com.fanruan.boot.adaptation; package com.fanruan.boot.adaptation;
import com.fanruan.carina.Carina; import com.fanruan.carina.Carina;
import com.fanruan.carina.annotions.DependsOn;
import com.fanruan.carina.annotions.FineComponent; import com.fanruan.carina.annotions.FineComponent;
import com.fanruan.carina.annotions.Start; import com.fanruan.carina.annotions.Start;
import com.fanruan.plugins.resource.PluginResourceHelper; import com.fanruan.plugins.resource.PluginResourceHelper;
@ -57,8 +58,8 @@ import java.util.TreeSet;
* Created on 2024/6/24 * Created on 2024/6/24
*/ */
@FineComponent(name = "fine_report_adaptation") @FineComponent(name = "fine_report_adaptation")
@DependsOn(dependencies = {"fine_report"})
public class ReportAdaptationComponent { public class ReportAdaptationComponent {
/** /**
* 启动 * 启动
*/ */
@ -74,6 +75,8 @@ public class ReportAdaptationComponent {
// 插件controller注册 // 插件controller注册
PluginControllerManager.getInstance().init(); PluginControllerManager.getInstance().init();
// 过滤掉内置服务器不支持的模块
DesignServerSupportModule.rebuild();
} }
private void listenEmbedServletFilter(ServletContext servletContext) { private void listenEmbedServletFilter(ServletContext servletContext) {

Loading…
Cancel
Save