diff --git a/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/Portal.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/Portal.java index d71f3db..b33e50e 100644 --- a/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/Portal.java +++ b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/Portal.java @@ -3,11 +3,11 @@ package cn.fateverse.query.entity; import cn.fateverse.common.core.annotaion.EnableAutoField; import cn.fateverse.common.core.entity.BaseEntity; import cn.fateverse.query.enums.PortalEnum; +import cn.fateverse.query.enums.PortalPremEnum; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import org.springframework.web.bind.annotation.RequestMethod; /** @@ -44,9 +44,9 @@ public class Portal extends BaseEntity { private String portalName; /** - * 是否匿名 + * 权限类型 */ - private Boolean anonymity; + private PortalPremEnum permissionType; /** * 接口类型 diff --git a/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/dto/PortalDto.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/dto/PortalDto.java index 864cd8c..9665506 100644 --- a/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/dto/PortalDto.java +++ b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/dto/PortalDto.java @@ -3,7 +3,9 @@ package cn.fateverse.query.entity.dto; import cn.fateverse.common.core.utils.ObjectUtils; import cn.fateverse.query.entity.Portal; import cn.fateverse.query.entity.PortalMapping; +import cn.fateverse.query.enums.DataAdapterType; import cn.fateverse.query.enums.PortalEnum; +import cn.fateverse.query.enums.PortalPremEnum; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -49,11 +51,11 @@ public class PortalDto { private String portalName; /** - * 是否匿名 + * 权限类型 */ - @ApiModelProperty("是否匿名") - @NotNull(message = "是否匿名不能为空") - private Boolean anonymity; + @ApiModelProperty("权限类型") + @NotNull(message = "权限类型不能为空") + private PortalPremEnum permissionType; /** * 接口类型 @@ -101,10 +103,8 @@ public class PortalDto { @ApiModelProperty("备注") private String remark; - - @ApiModelProperty("数据适配器信息") - private DataAdapterDto dataAdapter; - + @ApiModelProperty("适配器代码类型") + private DataAdapterType adapterCodeType; @ApiModelProperty("映射关系") private List mappings; @@ -115,7 +115,7 @@ public class PortalDto { .queryId(queryId) .adapterId(adapterId) .portalName(portalName) - .anonymity(anonymity) + .permissionType(permissionType) .createDataAdapter(createDataAdapter) .requestMethod(requestMethod) .page(page) diff --git a/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/query/PortalQuery.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/query/PortalQuery.java index 5d5465b..b407291 100644 --- a/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/query/PortalQuery.java +++ b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/query/PortalQuery.java @@ -1,6 +1,7 @@ package cn.fateverse.query.entity.query; import cn.fateverse.query.enums.PortalEnum; +import cn.fateverse.query.enums.PortalPremEnum; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; @@ -26,10 +27,10 @@ public class PortalQuery { private String portalName; /** - * 是否匿名 + * 权限类型 */ - @ApiModelProperty("是否匿名") - private Boolean anonymity; + @ApiModelProperty("权限类型") + private PortalPremEnum permissionType; /** * 接口类型 diff --git a/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/vo/SimplePortalVo.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/vo/SimplePortalVo.java index b75566d..940ac16 100644 --- a/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/vo/SimplePortalVo.java +++ b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/vo/SimplePortalVo.java @@ -3,7 +3,9 @@ package cn.fateverse.query.entity.vo; import cn.fateverse.common.core.annotaion.Excel; import cn.fateverse.common.decrypt.annotation.EncryptField; import cn.fateverse.query.entity.Portal; +import cn.fateverse.query.enums.DataAdapterType; import cn.fateverse.query.enums.PortalEnum; +import cn.fateverse.query.enums.PortalPremEnum; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; @@ -67,18 +69,18 @@ public class SimplePortalVo { */ @ApiModelProperty("数据适配器类型") @Excel("数据适配器类型") - private String adapterCodeType; + private DataAdapterType adapterCodeType; private Boolean createDataAdapter; /** - * 是否匿名 + * 权限类型 */ - @ApiModelProperty("是否匿名") - @Excel("是否匿名") - private Boolean anonymity; + @ApiModelProperty("权限类型") + @Excel("权限类型") + private PortalPremEnum permissionType; /** * 接口类型 @@ -126,7 +128,7 @@ public class SimplePortalVo { SimplePortalVo portalVo = SimplePortalVo.builder() .portalId(String.valueOf(portal.getPortalId())) .portalName(portal.getPortalName()) - .anonymity(portal.getAnonymity()) + .permissionType(portal.getPermissionType()) .queryId(portal.getQueryId()) .adapterId(portal.getAdapterId()) .createDataAdapter(portal.getCreateDataAdapter()) diff --git a/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/enums/PortalPremEnum.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/enums/PortalPremEnum.java new file mode 100644 index 0000000..0791556 --- /dev/null +++ b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/enums/PortalPremEnum.java @@ -0,0 +1,14 @@ +package cn.fateverse.query.enums; + +/** + * @author Clay + * @date 2024/4/15 11:23 + */ +public enum PortalPremEnum { + + ANONYMITY, + EXTERNAL, + LOCAL + ; + +} diff --git a/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/impl/PortalServiceImpl.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/impl/PortalServiceImpl.java index 4cddbb1..fbe6974 100644 --- a/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/impl/PortalServiceImpl.java +++ b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/impl/PortalServiceImpl.java @@ -9,6 +9,7 @@ import cn.fateverse.query.entity.dto.DataAdapterCodeDto; import cn.fateverse.query.entity.dto.MockParam; import cn.fateverse.query.entity.vo.DataAdapterVo; import cn.fateverse.query.entity.vo.PortalIdWrapper; +import cn.fateverse.query.enums.DataAdapterType; import cn.fateverse.query.handler.reader.DataAdapterHandlerReader; import cn.fateverse.query.portal.service.HandlerMethodService; import cn.fateverse.query.constant.QueryConstant; @@ -125,7 +126,7 @@ public class PortalServiceImpl implements PortalService { if (portal.getCreateDataAdapter()) { DataAdapter dataAdapter = adapterMapper.selectById(portal.getAdapterId()); if (!ObjectUtils.isEmpty(dataAdapter)) { - portalVo.setAdapterCodeType(dataAdapter.getType().name()); + portalVo.setAdapterCodeType(dataAdapter.getType()); } } portalVo.setMappings(portalMappings); @@ -172,11 +173,11 @@ public class PortalServiceImpl implements PortalService { } } //映射数据适配器名称 - Map adapterMap = new HashMap<>(); + Map adapterMap = new HashMap<>(); if (!ObjectUtils.isEmpty(adapterIds)) { List adapterList = adapterMapper.selectListByIds(adapterIds); for (DataAdapter adapter : adapterList) { - adapterMap.put(adapter.getAdapterId(), adapter.getType().name()); + adapterMap.put(adapter.getAdapterId(), adapter.getType()); } } //映射重组 @@ -367,11 +368,11 @@ public class PortalServiceImpl implements PortalService { * @param portal 接口信息 */ private void createDataAdapter(PortalDto portalDto, Portal portal) { - DataAdapterDto dataAdapterDto = portalDto.getDataAdapter(); - if (ObjectUtils.isEmpty(dataAdapterDto)) { + if (ObjectUtils.isEmpty(portalDto.getAdapterCodeType())) { throw new CustomException("数据适配器为空!"); } - DataAdapter dataAdapter = dataAdapterDto.toDataAdapter(); + DataAdapter dataAdapter = new DataAdapter(); + dataAdapter.setType(portalDto.getAdapterCodeType()); if (ObjectUtils.isEmpty(dataAdapter.getType())) { throw new CustomException("请选择数据适配器类型!"); } diff --git a/custom-query/custom-query-biz/src/main/resources/mapper/PortalMapper.xml b/custom-query/custom-query-biz/src/main/resources/mapper/PortalMapper.xml index 3fe99ba..d1e89c4 100644 --- a/custom-query/custom-query-biz/src/main/resources/mapper/PortalMapper.xml +++ b/custom-query/custom-query-biz/src/main/resources/mapper/PortalMapper.xml @@ -9,7 +9,7 @@ query_id, adapter_id, portal_name, - anonymity, + permission_type, type, request_method, create_data_adapter, @@ -33,7 +33,7 @@ and portal_name like concat('%', #{portalName}, '%') - and anonymity = #{anonymity} + and permission_type = #{permissionType} and type = #{type} and state = #{state} and path like concat('%', #{path}, '%') @@ -51,7 +51,7 @@ query_id, adapter_id, portal_name, - anonymity, + permission_type, type, page, request_method, @@ -66,7 +66,7 @@ #{queryId}, #{adapterId}, #{portalName}, - #{anonymity}, + #{permissionType}, #{type}, #{page}, #{requestMethod}, @@ -85,7 +85,7 @@ query_id = #{queryId}, adapter_id = #{adapterId}, portal_name = #{portalName}, - anonymity = #{anonymity}, + permission_type = #{permissionType}, type = #{type}, type = #{page}, request_method = #{requestMethod},