diff --git a/tyr-api/src/main/java/cn/axzo/tyr/client/feign/PermissionPointApplyApi.java b/tyr-api/src/main/java/cn/axzo/tyr/client/feign/PermissionPointApplyApi.java index f7062eef..d703c7eb 100644 --- a/tyr-api/src/main/java/cn/axzo/tyr/client/feign/PermissionPointApplyApi.java +++ b/tyr-api/src/main/java/cn/axzo/tyr/client/feign/PermissionPointApplyApi.java @@ -7,7 +7,6 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import cn.axzo.framework.domain.web.result.ApiResult; -import cn.axzo.tyr.client.model.vo.PermissionPointApplyDetailUpdateVO; import cn.axzo.tyr.client.model.vo.UpdatePermissionPointApplyVO; /** @@ -18,9 +17,6 @@ import cn.axzo.tyr.client.model.vo.UpdatePermissionPointApplyVO; **/ @FeignClient(name = "tyr", url = "${axzo.service.tyr:http://tyr:8080}") public interface PermissionPointApplyApi { - @PostMapping(value = "/api/v1/permissionPoint/apply/update") - ApiResult updateApply(@RequestBody@Valid UpdatePermissionPointApplyVO permissionPointApply); - @PostMapping(value = "/api/v1/permissionPoint/apply/update-detail") - ApiResult updateDetail(@RequestBody@Valid PermissionPointApplyDetailUpdateVO updateDetail); + ApiResult updateDetail(@RequestBody@Valid UpdatePermissionPointApplyVO updateDetail); } \ No newline at end of file diff --git a/tyr-api/src/main/java/cn/axzo/tyr/client/model/vo/PermissionPointApplyDetailUpdateVO.java b/tyr-api/src/main/java/cn/axzo/tyr/client/model/vo/PermissionPointApplyDetailUpdateVO.java deleted file mode 100644 index 626af0f4..00000000 --- a/tyr-api/src/main/java/cn/axzo/tyr/client/model/vo/PermissionPointApplyDetailUpdateVO.java +++ /dev/null @@ -1,113 +0,0 @@ -package cn.axzo.tyr.client.model.vo; - -import java.util.List; - -import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; - -import lombok.Data; - -/** - * PermissionPointApplySubmitReq 完成配置 - * - * @author yangsong - * @version 2023/09/25 14:51 - **/ -@Data -public class PermissionPointApplyDetailUpdateVO { - /** - * 申请id - */ - @NotNull - private Long applyId; - /** - * 权限点信息, 平铺结构 - */ - @NotEmpty - @Valid - private List permissionPoints; - - /** - * 权限点 - */ - @Data - public static class PermissionPointInfoVO{ - @NotNull - private Long id; - /** - * 元素code - */ - private String featureCode; - - /** - * 菜单icon - */ - private String icon; - /** - * 页面路由 - */ - private String linkUrl; - - /** - * 适用终端 1:PC 2:UNI 4:APP - */ - private Integer linkType; - - /** - * 扩展字段 - APP适配参数 - */ - private String linkExt; - - /** - * 小程序AppID - */ - private String microAppItemId; - - /** - * 元素类别 0.菜单 1.页面 3按钮 - */ - private Integer featureType; - -// /** -// * 0:查看 1:操作 -// */ -// private Integer operateType; - - - /** - * 适用单位类型 1:总包 2:建设单位 4:监理单位 8:劳务分包 16:专业分包 32-班组 - */ - private List fitOuTypeList; - - /** - * 适用节点类型 1:部门 2:班组 4:小组 - */ - private List fitOuNodeTypeList; - - /** - * 所属应用 - */ - private String appName; - - /** - * 功能URL - */ - private String featureUrl; - -// /** -// * 是否认证 0:无需要认证 1:需要认证 -// */ -// private Boolean needCert; -// -// /** -// * 是否授权 0:无需要授权 1:需要授权 -// */ -// private Boolean needAuth; - - /** - * 授权策略类型，允许为空 1-平台授权型 2-客户授权型 3-免授权型 - */ - private Integer delegatedType; - } -} \ No newline at end of file diff --git a/tyr-api/src/main/java/cn/axzo/tyr/client/model/vo/UpdatePermissionPointApplyDetailVO.java b/tyr-api/src/main/java/cn/axzo/tyr/client/model/vo/UpdatePermissionPointApplyDetailVO.java new file mode 100644 index 00000000..3d816a17 --- /dev/null +++ b/tyr-api/src/main/java/cn/axzo/tyr/client/model/vo/UpdatePermissionPointApplyDetailVO.java @@ -0,0 +1,92 @@ +package cn.axzo.tyr.client.model.vo; + +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * UpdatePermissionPointApplyDetailVO 修改权限点申请明细 + * + * @author yangsong + * @version 2023/09/25 20:28 + **/ +@Data +public class UpdatePermissionPointApplyDetailVO { + @NotNull + private Long id; + /** + * 元素code + */ + private String featureCode; + + /** + * 菜单icon + */ + private String icon; + /** + * 页面路由 + */ + private String linkUrl; + + /** + * 适用终端 1:PC 2:UNI 4:APP + */ + private Integer linkType; + + /** + * 扩展字段 - APP适配参数 + */ + private String linkExt; + + /** + * 小程序AppID + */ + private String microAppItemId; + + /** + * 元素类别 0.菜单 1.页面 3按钮 + */ + private Integer featureType; + +// /** +// * 0:查看 1:操作 +// */ +// private Integer operateType; + + + /** + * 适用单位类型 1:总包 2:建设单位 4:监理单位 8:劳务分包 16:专业分包 32-班组 + */ + private List fitOuTypeList; + + /** + * 适用节点类型 1:部门 2:班组 4:小组 + */ + private List fitOuNodeTypeList; + + /** + * 所属应用 + */ + private String appName; + + /** + * 功能URL + */ + private String featureUrl; + +// /** +// * 是否认证 0:无需要认证 1:需要认证 +// */ +// private Boolean needCert; +// +// /** +// * 是否授权 0:无需要授权 1:需要授权 +// */ +// private Boolean needAuth; + + /** + * 授权策略类型，允许为空 1-平台授权型 2-客户授权型 3-免授权型 + */ + private Integer delegatedType; +} \ No newline at end of file diff --git a/tyr-api/src/main/java/cn/axzo/tyr/client/model/vo/UpdatePermissionPointApplyVO.java b/tyr-api/src/main/java/cn/axzo/tyr/client/model/vo/UpdatePermissionPointApplyVO.java index 101ded64..9c206aae 100644 --- a/tyr-api/src/main/java/cn/axzo/tyr/client/model/vo/UpdatePermissionPointApplyVO.java +++ b/tyr-api/src/main/java/cn/axzo/tyr/client/model/vo/UpdatePermissionPointApplyVO.java @@ -1,31 +1,31 @@ package cn.axzo.tyr.client.model.vo; +import java.util.List; + +import javax.validation.Valid; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; + import lombok.Data; -import javax.validation.constraints.NotNull; - /** - * SaveOrUpdatePermissionPointApplyVO 新增或者修改权限点申请 + * PermissionPointApplySubmitReq 完成配置 * * @author yangsong - * @version 2023/09/25 16:27 + * @version 2023/09/25 14:51 **/ @Data public class UpdatePermissionPointApplyVO { + /** + * 申请id + */ @NotNull - private Long id; + private Long applyId; /** - * 业务分两类id, 不修改留空 + * 权限点信息, 平铺结构 */ - private Long businessTypeId; - /** - * 流程实例id, 不修改留空 - */ - private Long workflowInstantceId; - /** - * 状态 0:初始化 1:权限配置 2:已发布dev 3:已发布test 4:已发布pre 5:已发布生产 6:产品已验收名称 - * 不修改留空 - * @see cn.axzo.tyr.client.model.enums.PermissionPointApplyStatus - */ - private Integer status; + @NotEmpty + @Valid + private List permissionPoints; + } \ No newline at end of file