diff --git a/tyr-api/src/main/java/cn/axzo/tyr/client/model/enums/PageLinkType.java b/tyr-api/src/main/java/cn/axzo/tyr/client/model/enums/PageLinkType.java new file mode 100644 index 00000000..02be3d58 --- /dev/null +++ b/tyr-api/src/main/java/cn/axzo/tyr/client/model/enums/PageLinkType.java @@ -0,0 +1,37 @@ +package cn.axzo.tyr.client.model.enums; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +import java.util.HashMap; +import java.util.Map; + +/** + * 页面适用终端 + * + * @version V1.0 + * @author: ZhanSiHu + * @date: 2023/9/12 11:52 + */ +@Getter +@AllArgsConstructor +public enum PageLinkType { + PC(1, "PC"), + UNI(2, "UNI"), + APP(4, "APP"), + ; + + private Integer code; + private String desc; + + private static final Map MAPPING = new HashMap<>(); + static { + for (PageLinkType type : PageLinkType.values()) { + MAPPING.put(type.code, type); + } + } + + public static PageLinkType apply(Integer code) { + return code == null ? null :MAPPING.get(code); + } +} diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/entity/SaasFeature.java b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/entity/SaasFeature.java index 54d5265a..3f04f6fc 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/entity/SaasFeature.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/entity/SaasFeature.java @@ -141,12 +141,12 @@ public class SaasFeature extends BaseEntity implements Serializable private String featureUrl; /** - * 网关专属字段,是否认证 0:无需要认证 1:需要认证 + * 网关专属字段,是否认证 0:无需要认证 1:需要认证 - 登录-默认1 */ private Boolean needCert; /** - * 网关专属字段,是否授权 0:无需要授权 1:需要授权 + * 网关专属字段,是否授权 0:无需要授权 1:需要授权 - 权限-默认1 */ private Boolean needAuth; diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionPointServiceImpl.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionPointServiceImpl.java index 969a4342..001fe90f 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionPointServiceImpl.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionPointServiceImpl.java @@ -90,7 +90,9 @@ public class PermissionPointServiceImpl implements PermissionPointService { Map> mappingNode = nodesResult.stream() .collect(Collectors.groupingBy(PermissionPointTreeNode::getTerminal)); //构建workspace-terminal工作台层级 - List dictList = saasBasicDictService.getBasicDictNodeTree(BasicDictQueryReq.builder().type(DictTypeFiledEnum.TERMINAL).build()).getData(); + List dictList = saasBasicDictService.getBasicDictNodeTree(BasicDictQueryReq.builder() + .type(DictTypeFiledEnum.TERMINAL).build()) + .getData(); //遍历所有workspace和terminal-构建顶层两级 List result = new ArrayList<>(); for (BasicDictTreeResp workspace : dictList) { @@ -102,6 +104,7 @@ public class PermissionPointServiceImpl implements PermissionPointService { if (CollectionUtil.isNotEmpty(childrenNodes)) { PermissionPointTreeNode terminalTree = new PermissionPointTreeNode(); terminalTree.setPermissionName(terminal.getName()); + terminalTree.setTerminal(terminal.getCode()); terminalTree.setCode(terminal.getCode()); terminalTree.setChildren(childrenNodes); if (workspaceNode == null) {