diff --git a/snowy-plugin-api/snowy-plugin-auth-api/src/main/java/vip/xiaonuo/auth/api/SaBaseLoginUserApi.java b/snowy-plugin-api/snowy-plugin-auth-api/src/main/java/vip/xiaonuo/auth/api/SaBaseLoginUserApi.java index c72fcb81..626c7399 100644 --- a/snowy-plugin-api/snowy-plugin-auth-api/src/main/java/vip/xiaonuo/auth/api/SaBaseLoginUserApi.java +++ b/snowy-plugin-api/snowy-plugin-auth-api/src/main/java/vip/xiaonuo/auth/api/SaBaseLoginUserApi.java @@ -98,6 +98,14 @@ public interface SaBaseLoginUserApi { */ List getButtonCodeListListByUserId(String userId); + /** + * 根据用户id获取移动端按钮码集合 + * + * @author xuyuxiang + * @date 2022/4/27 22:54 + */ + List getMobileButtonCodeListListByUserId(String userId); + /** * 根据用户id获取权限集合 * diff --git a/snowy-plugin-api/snowy-plugin-auth-api/src/main/java/vip/xiaonuo/auth/core/pojo/SaBaseClientLoginUser.java b/snowy-plugin-api/snowy-plugin-auth-api/src/main/java/vip/xiaonuo/auth/core/pojo/SaBaseClientLoginUser.java index 21b03107..5b238b4d 100644 --- a/snowy-plugin-api/snowy-plugin-auth-api/src/main/java/vip/xiaonuo/auth/core/pojo/SaBaseClientLoginUser.java +++ b/snowy-plugin-api/snowy-plugin-auth-api/src/main/java/vip/xiaonuo/auth/core/pojo/SaBaseClientLoginUser.java @@ -189,20 +189,24 @@ public abstract class SaBaseClientLoginUser { @ApiModelProperty(value = "按钮码集合", position = 40) private List buttonCodeList; + /** 移动端按钮码集合 */ + @ApiModelProperty(value = "移动端按钮码集合", position = 41) + private List mobileButtonCodeList; + /** 权限码集合 */ - @ApiModelProperty(value = "权限码集合", position = 41, hidden = true) + @ApiModelProperty(value = "权限码集合", position = 42, hidden = true) private List permissionCodeList; /** 角色码集合 */ - @ApiModelProperty(value = "角色码集合", position = 42, hidden = true) + @ApiModelProperty(value = "角色码集合", position = 43, hidden = true) private List roleCodeList; /** 数据范围集合 */ - @ApiModelProperty(value = "数据范围集合", position = 43, hidden = true) - private List dataScopeList; + @ApiModelProperty(value = "数据范围集合", position = 44, hidden = true) + private List dataScopeList; /** 用户密码hash值 */ - @ApiModelProperty(value = "用户密码hash值", position = 44) + @ApiModelProperty(value = "用户密码hash值", position = 45) private String password; /** 是否可登录，由继承类实现 */ diff --git a/snowy-plugin-api/snowy-plugin-auth-api/src/main/java/vip/xiaonuo/auth/core/pojo/SaBaseLoginUser.java b/snowy-plugin-api/snowy-plugin-auth-api/src/main/java/vip/xiaonuo/auth/core/pojo/SaBaseLoginUser.java index 89af40e3..3b3f9b7e 100644 --- a/snowy-plugin-api/snowy-plugin-auth-api/src/main/java/vip/xiaonuo/auth/core/pojo/SaBaseLoginUser.java +++ b/snowy-plugin-api/snowy-plugin-auth-api/src/main/java/vip/xiaonuo/auth/core/pojo/SaBaseLoginUser.java @@ -225,20 +225,24 @@ public abstract class SaBaseLoginUser { @ApiModelProperty(value = "按钮码集合", position = 50) private List buttonCodeList; + /** 移动端按钮码集合 */ + @ApiModelProperty(value = "移动端按钮码集合", position = 51) + private List mobileButtonCodeList; + /** 权限码集合 */ - @ApiModelProperty(value = "权限码集合", position = 51, hidden = true) + @ApiModelProperty(value = "权限码集合", position = 52, hidden = true) private List permissionCodeList; /** 角色码集合 */ - @ApiModelProperty(value = "角色码集合", position = 52, hidden = true) + @ApiModelProperty(value = "角色码集合", position = 53, hidden = true) private List roleCodeList; /** 数据范围集合 */ - @ApiModelProperty(value = "数据范围集合", position = 53, hidden = true) + @ApiModelProperty(value = "数据范围集合", position = 54, hidden = true) private List dataScopeList; /** 用户密码hash值 */ - @ApiModelProperty(value = "用户密码hash值", position = 54) + @ApiModelProperty(value = "用户密码hash值", position = 55) private String password; /** 是否可登录，由继承类实现 */ diff --git a/snowy-plugin-api/snowy-plugin-mobile-api/src/main/java/vip/xiaonuo/mobile/api/MobileButtonApi.java b/snowy-plugin-api/snowy-plugin-mobile-api/src/main/java/vip/xiaonuo/mobile/api/MobileButtonApi.java new file mode 100644 index 00000000..0573163e --- /dev/null +++ b/snowy-plugin-api/snowy-plugin-mobile-api/src/main/java/vip/xiaonuo/mobile/api/MobileButtonApi.java @@ -0,0 +1,23 @@ +/* + * Copyright [2022] [https://www.xiaonuo.vip] + * + * Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点： + * + * 1.请不要删除和修改根目录下的LICENSE文件。 + * 2.请不要删除和修改Snowy源码头部的版权声明。 + * 3.本项目代码可免费商业使用，商业使用请保留源码和相关描述文件的项目出处，作者声明等。 + * 4.分发源码时候，请注明软件出处 https://www.xiaonuo.vip + * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。 + * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip + */ +package vip.xiaonuo.mobile.api; + +/** + * 移动端按钮API + * + * @author xuyuxiang + * @date 2023/2/1 9:52 + **/ +public interface MobileButtonApi { + +} diff --git a/snowy-plugin-api/snowy-plugin-sys-api/src/main/java/vip/xiaonuo/sys/api/SysRelationApi.java b/snowy-plugin-api/snowy-plugin-sys-api/src/main/java/vip/xiaonuo/sys/api/SysRelationApi.java index b424d22f..fbe2fc2d 100644 --- a/snowy-plugin-api/snowy-plugin-sys-api/src/main/java/vip/xiaonuo/sys/api/SysRelationApi.java +++ b/snowy-plugin-api/snowy-plugin-sys-api/src/main/java/vip/xiaonuo/sys/api/SysRelationApi.java @@ -36,5 +36,13 @@ public interface SysRelationApi { * @author xuyuxiang * @date 2023/1/31 9:54 **/ - void removeRoleHasMobileMenuRelationByMenuIdList(List targetIdList); + void removeRoleHasMobileMenuRelation(List targetIdList); + + /** + * 清除对应的角色与移动端菜单信息中的【授权的移动端按钮信息】 + * + * @author xuyuxiang + * @date 2023/1/31 9:54 + **/ + void removeRoleHasMobileButtonRelation(List targetIdList, List buttonIdList); } diff --git a/snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/login/service/impl/AuthServiceImpl.java b/snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/login/service/impl/AuthServiceImpl.java index 7ac27587..00d43755 100644 --- a/snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/login/service/impl/AuthServiceImpl.java +++ b/snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/login/service/impl/AuthServiceImpl.java @@ -284,6 +284,8 @@ public class AuthServiceImpl implements AuthService { StpUtil.login(saBaseLoginUser.getId(), new SaLoginModel().setDevice(device)); // 获取按钮码 saBaseLoginUser.setButtonCodeList(loginUserApi.getButtonCodeListListByUserId(saBaseLoginUser.getId())); + // 获取移动端按钮码 + saBaseLoginUser.setMobileButtonCodeList(loginUserApi.getMobileButtonCodeListListByUserId(saBaseLoginUser.getId())); // 获取数据范围 saBaseLoginUser.setDataScopeList(Convert.toList(SaBaseLoginUser.DataScope.class, loginUserApi.getPermissionListByUserId(saBaseLoginUser.getId(), saBaseLoginUser.getOrgId()))); @@ -313,6 +315,8 @@ public class AuthServiceImpl implements AuthService { StpClientUtil.login(saBaseClientLoginUser.getId(), new SaLoginModel().setDevice(device)); // 获取按钮码 saBaseClientLoginUser.setButtonCodeList(clientLoginUserApi.getButtonCodeListListByUserId(saBaseClientLoginUser.getId())); + // 获取移动端按钮码 + saBaseClientLoginUser.setMobileButtonCodeList(clientLoginUserApi.getMobileButtonCodeListListByUserId(saBaseClientLoginUser.getId())); // 获取数据范围 saBaseClientLoginUser.setDataScopeList(Convert.toList(SaBaseClientLoginUser.DataScope.class, clientLoginUserApi.getPermissionListByUserId(saBaseClientLoginUser.getId(), null))); diff --git a/snowy-plugin/snowy-plugin-client/src/main/java/vip/xiaonuo/client/modular/user/provider/ClientLoginUserApiProvider.java b/snowy-plugin/snowy-plugin-client/src/main/java/vip/xiaonuo/client/modular/user/provider/ClientLoginUserApiProvider.java index b8e45891..0f616e4f 100644 --- a/snowy-plugin/snowy-plugin-client/src/main/java/vip/xiaonuo/client/modular/user/provider/ClientLoginUserApiProvider.java +++ b/snowy-plugin/snowy-plugin-client/src/main/java/vip/xiaonuo/client/modular/user/provider/ClientLoginUserApiProvider.java @@ -139,6 +139,18 @@ public class ClientLoginUserApiProvider implements SaBaseLoginUserApi { return CollectionUtil.newArrayList(); } + /** + * 根据用户id获取移动端按钮码集合 + * + * @author xuyuxiang + * @date 2022/4/27 22:54 + */ + @Override + public List getMobileButtonCodeListListByUserId(String userId) { + // TODO C端用户暂无移动端按钮码 + return CollectionUtil.newArrayList(); + } + /** * 根据用户id获取权限集合 * diff --git a/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/controller/MobileButtonController.java b/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/controller/MobileButtonController.java new file mode 100644 index 00000000..8184a2cc --- /dev/null +++ b/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/controller/MobileButtonController.java @@ -0,0 +1,123 @@ +/* + * Copyright [2022] [https://www.xiaonuo.vip] + * + * Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点： + * + * 1.请不要删除和修改根目录下的LICENSE文件。 + * 2.请不要删除和修改Snowy源码头部的版权声明。 + * 3.本项目代码可免费商业使用，商业使用请保留源码和相关描述文件的项目出处，作者声明等。 + * 4.分发源码时候，请注明软件出处 https://www.xiaonuo.vip + * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。 + * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip + */ +package vip.xiaonuo.mobile.modular.resource.controller; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.github.xiaoymin.knife4j.annotations.ApiSupport; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; +import vip.xiaonuo.common.annotation.CommonLog; +import vip.xiaonuo.common.pojo.CommonResult; +import vip.xiaonuo.mobile.modular.resource.entity.MobileButton; +import vip.xiaonuo.mobile.modular.resource.param.button.MobileButtonAddParam; +import vip.xiaonuo.mobile.modular.resource.param.button.MobileButtonEditParam; +import vip.xiaonuo.mobile.modular.resource.param.button.MobileButtonIdParam; +import vip.xiaonuo.mobile.modular.resource.param.button.MobileButtonPageParam; +import vip.xiaonuo.mobile.modular.resource.service.MobileButtonService; + +import javax.annotation.Resource; +import javax.validation.Valid; +import java.util.List; + +/** + * 移动端按钮控制器 + * + * @author xuyuxiang + * @date 2022/6/27 13:56 + **/ +@Api(tags = "移动端按钮控制器") +@ApiSupport(author = "SNOWY_TEAM", order = 3) +@RestController +@Validated +public class MobileButtonController { + + @Resource + private MobileButtonService mobileButtonService; + + /** + * 获取移动端按钮分页 + * + * @author xuyuxiang + * @date 2022/4/24 20:00 + */ + @ApiOperationSupport(order = 1) + @ApiOperation("获取移动端按钮分页") + @GetMapping("/mobile/button/page") + public CommonResult> page(MobileButtonPageParam mobileButtonPageParam) { + return CommonResult.data(mobileButtonService.page(mobileButtonPageParam)); + } + + /** + * 添加移动端按钮 + * + * @author xuyuxiang + * @date 2022/4/24 20:47 + */ + @ApiOperationSupport(order = 2) + @ApiOperation("添加移动端按钮") + @CommonLog("添加移动端按钮") + @PostMapping("/mobile/button/add") + public CommonResult add(@RequestBody @Valid MobileButtonAddParam mobileButtonAddParam) { + mobileButtonService.add(mobileButtonAddParam); + return CommonResult.ok(); + } + + /** + * 编辑移动端按钮 + * + * @author xuyuxiang + * @date 2022/4/24 20:47 + */ + @ApiOperationSupport(order = 3) + @ApiOperation("编辑移动端按钮") + @CommonLog("编辑移动端按钮") + @PostMapping("/mobile/button/edit") + public CommonResult edit(@RequestBody @Valid MobileButtonEditParam mobileButtonEditParam) { + mobileButtonService.edit(mobileButtonEditParam); + return CommonResult.ok(); + } + + /** + * 删除移动端按钮 + * + * @author xuyuxiang + * @date 2022/4/24 20:00 + */ + @ApiOperationSupport(order = 4) + @ApiOperation("删除移动端按钮") + @CommonLog("删除移动端按钮") + @PostMapping("/mobile/button/delete") + public CommonResult delete(@RequestBody @Valid List mobileButtonIdParamList) { + mobileButtonService.delete(mobileButtonIdParamList); + return CommonResult.ok(); + } + + /** + * 获取移动端按钮详情 + * + * @author xuyuxiang + * @date 2022/4/24 20:00 + */ + @ApiOperationSupport(order = 5) + @ApiOperation("获取移动端按钮详情") + @GetMapping("/mobile/button/detail") + public CommonResult detail(@Valid MobileButtonIdParam mobileButtonIdParam) { + return CommonResult.data(mobileButtonService.detail(mobileButtonIdParam)); + } +} diff --git a/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/entity/MobileButton.java b/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/entity/MobileButton.java new file mode 100644 index 00000000..1ae49c47 --- /dev/null +++ b/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/entity/MobileButton.java @@ -0,0 +1,62 @@ +/* + * Copyright [2022] [https://www.xiaonuo.vip] + * + * Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点： + * + * 1.请不要删除和修改根目录下的LICENSE文件。 + * 2.请不要删除和修改Snowy源码头部的版权声明。 + * 3.本项目代码可免费商业使用，商业使用请保留源码和相关描述文件的项目出处，作者声明等。 + * 4.分发源码时候，请注明软件出处 https://www.xiaonuo.vip + * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。 + * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip + */ +package vip.xiaonuo.mobile.modular.resource.entity; + +import com.baomidou.mybatisplus.annotation.FieldStrategy; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; +import vip.xiaonuo.common.pojo.CommonEntity; + +/** + * 移动端按钮实体 + * + * @author xuyuxiang + * @date 2022/7/27 18:25 + **/ +@Getter +@Setter +@TableName("MOBILE_RESOURCE") +public class MobileButton extends CommonEntity { + + /** id */ + @ApiModelProperty(value = "id", position = 1) + private String id; + + /** 父id */ + @ApiModelProperty(value = "父id", position = 2) + private String parentId; + + /** 标题 */ + @ApiModelProperty(value = "标题", position = 3) + private String title; + + /** 编码 */ + @ApiModelProperty(value = "编码", position = 4) + private String code; + + /** 分类 */ + @ApiModelProperty(value = "分类", position = 5) + private String category; + + /** 排序码 */ + @ApiModelProperty(value = "排序码", position = 6) + private Integer sortCode; + + /** 扩展信息 */ + @ApiModelProperty(value = "扩展信息", position = 7) + @TableField(insertStrategy = FieldStrategy.IGNORED, updateStrategy = FieldStrategy.IGNORED) + private String extJson; +} diff --git a/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/enums/MobileResourceCategoryEnum.java b/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/enums/MobileResourceCategoryEnum.java index 7ac8004d..dfa68c46 100644 --- a/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/enums/MobileResourceCategoryEnum.java +++ b/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/enums/MobileResourceCategoryEnum.java @@ -28,7 +28,10 @@ public enum MobileResourceCategoryEnum { MODULE("MODULE"), /** 菜单 */ - MENU("MENU"); + MENU("MENU"), + + /** 按钮 */ + BUTTON("BUTTON"); private final String value; diff --git a/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/mapper/MobileButtonMapper.java b/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/mapper/MobileButtonMapper.java new file mode 100644 index 00000000..384ea479 --- /dev/null +++ b/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/mapper/MobileButtonMapper.java @@ -0,0 +1,25 @@ +/* + * Copyright [2022] [https://www.xiaonuo.vip] + * + * Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点： + * + * 1.请不要删除和修改根目录下的LICENSE文件。 + * 2.请不要删除和修改Snowy源码头部的版权声明。 + * 3.本项目代码可免费商业使用，商业使用请保留源码和相关描述文件的项目出处，作者声明等。 + * 4.分发源码时候，请注明软件出处 https://www.xiaonuo.vip + * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。 + * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip + */ +package vip.xiaonuo.mobile.modular.resource.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import vip.xiaonuo.mobile.modular.resource.entity.MobileButton; + +/** + * 移动端按钮Mapper接口 + * + * @author xuyuxiang + * @date 2022/4/21 18:37 + **/ +public interface MobileButtonMapper extends BaseMapper { +} diff --git a/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/mapper/mapping/MobileButtonMapper.xml b/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/mapper/mapping/MobileButtonMapper.xml new file mode 100644 index 00000000..de99599a --- /dev/null +++ b/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/mapper/mapping/MobileButtonMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/mapper/mapping/MobileModuleMapper.xml b/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/mapper/mapping/MobileModuleMapper.xml index 3b51d5a3..1dbdfb93 100644 --- a/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/mapper/mapping/MobileModuleMapper.xml +++ b/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/mapper/mapping/MobileModuleMapper.xml @@ -2,5 +2,4 @@ - \ No newline at end of file diff --git a/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/param/button/MobileButtonAddParam.java b/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/param/button/MobileButtonAddParam.java new file mode 100644 index 00000000..7ab71bc6 --- /dev/null +++ b/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/param/button/MobileButtonAddParam.java @@ -0,0 +1,55 @@ +/* + * Copyright [2022] [https://www.xiaonuo.vip] + * + * Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点： + * + * 1.请不要删除和修改根目录下的LICENSE文件。 + * 2.请不要删除和修改Snowy源码头部的版权声明。 + * 3.本项目代码可免费商业使用，商业使用请保留源码和相关描述文件的项目出处，作者声明等。 + * 4.分发源码时候，请注明软件出处 https://www.xiaonuo.vip + * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。 + * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip + */ +package vip.xiaonuo.mobile.modular.resource.param.button; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + +/** + * 移动端按钮添加参数 + * + * @author xuyuxiang + * @date 2022/7/27 18:40 + **/ +@Getter +@Setter +public class MobileButtonAddParam { + + /** 父id */ + @ApiModelProperty(value = "父id", required = true, position = 1) + @NotBlank(message = "parentId不能为空") + private String parentId; + + /** 标题 */ + @ApiModelProperty(value = "标题", required = true, position = 2) + @NotBlank(message = "title不能为空") + private String title; + + /** 编码 */ + @ApiModelProperty(value = "编码", required = true, position = 3) + @NotBlank(message = "code不能为空") + private String code; + + /** 排序码 */ + @ApiModelProperty(value = "排序码", required = true, position = 4) + @NotNull(message = "sortCode不能为空") + private Integer sortCode; + + /** 扩展JSON */ + @ApiModelProperty(value = "扩展JSON", position = 5) + private String extJson; +} diff --git a/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/param/button/MobileButtonEditParam.java b/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/param/button/MobileButtonEditParam.java new file mode 100644 index 00000000..247515b6 --- /dev/null +++ b/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/param/button/MobileButtonEditParam.java @@ -0,0 +1,60 @@ +/* + * Copyright [2022] [https://www.xiaonuo.vip] + * + * Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点： + * + * 1.请不要删除和修改根目录下的LICENSE文件。 + * 2.请不要删除和修改Snowy源码头部的版权声明。 + * 3.本项目代码可免费商业使用，商业使用请保留源码和相关描述文件的项目出处，作者声明等。 + * 4.分发源码时候，请注明软件出处 https://www.xiaonuo.vip + * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。 + * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip + */ +package vip.xiaonuo.mobile.modular.resource.param.button; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + +/** + * 移动端按钮编辑参数 + * + * @author xuyuxiang + * @date 2022/7/27 18:40 + **/ +@Getter +@Setter +public class MobileButtonEditParam { + + /** id */ + @ApiModelProperty(value = "id", required = true, position = 1) + @NotBlank(message = "id不能为空") + private String id; + + /** 父id */ + @ApiModelProperty(value = "父id", required = true, position = 2) + @NotBlank(message = "parentId不能为空") + private String parentId; + + /** 标题 */ + @ApiModelProperty(value = "标题", required = true, position = 3) + @NotBlank(message = "title不能为空") + private String title; + + /** 编码 */ + @ApiModelProperty(value = "编码", required = true, position = 4) + @NotBlank(message = "code不能为空") + private String code; + + /** 排序码 */ + @ApiModelProperty(value = "排序码", required = true, position = 5) + @NotNull(message = "sortCode不能为空") + private Integer sortCode; + + /** 扩展JSON */ + @ApiModelProperty(value = "扩展JSON", position = 6) + private String extJson; +} diff --git a/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/param/button/MobileButtonIdParam.java b/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/param/button/MobileButtonIdParam.java new file mode 100644 index 00000000..facf6ae0 --- /dev/null +++ b/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/param/button/MobileButtonIdParam.java @@ -0,0 +1,35 @@ +/* + * Copyright [2022] [https://www.xiaonuo.vip] + * + * Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点： + * + * 1.请不要删除和修改根目录下的LICENSE文件。 + * 2.请不要删除和修改Snowy源码头部的版权声明。 + * 3.本项目代码可免费商业使用，商业使用请保留源码和相关描述文件的项目出处，作者声明等。 + * 4.分发源码时候，请注明软件出处 https://www.xiaonuo.vip + * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。 + * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip + */ +package vip.xiaonuo.mobile.modular.resource.param.button; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; + +import javax.validation.constraints.NotBlank; + +/** + * 移动端按钮Id参数 + * + * @author xuyuxiang + * @date 2022/7/27 18:40 + **/ +@Getter +@Setter +public class MobileButtonIdParam { + + /** id */ + @ApiModelProperty(value = "id", required = true) + @NotBlank(message = "id不能为空") + private String id; +} diff --git a/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/param/button/MobileButtonPageParam.java b/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/param/button/MobileButtonPageParam.java new file mode 100644 index 00000000..3fb69d48 --- /dev/null +++ b/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/param/button/MobileButtonPageParam.java @@ -0,0 +1,52 @@ +/* + * Copyright [2022] [https://www.xiaonuo.vip] + * + * Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点： + * + * 1.请不要删除和修改根目录下的LICENSE文件。 + * 2.请不要删除和修改Snowy源码头部的版权声明。 + * 3.本项目代码可免费商业使用，商业使用请保留源码和相关描述文件的项目出处，作者声明等。 + * 4.分发源码时候，请注明软件出处 https://www.xiaonuo.vip + * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。 + * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip + */ +package vip.xiaonuo.mobile.modular.resource.param.button; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; + +/** + * 移动端按钮查询参数 + * + * @author xuyuxiang + * @date 2022/7/27 18:40 + **/ +@Getter +@Setter +public class MobileButtonPageParam { + + /** 当前页 */ + @ApiModelProperty(value = "当前页码") + private Integer current; + + /** 每页条数 */ + @ApiModelProperty(value = "每页条数") + private Integer size; + + /** 排序字段 */ + @ApiModelProperty(value = "排序字段，字段驼峰名称，如：userName") + private String sortField; + + /** 排序方式 */ + @ApiModelProperty(value = "排序方式，升序：ASCEND；降序：DESCEND") + private String sortOrder; + + /** 父id */ + @ApiModelProperty(value = "父id") + private String parentId; + + /** 名称关键词 */ + @ApiModelProperty(value = "名称关键词") + private String searchKey; +} diff --git a/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/provider/MobileButtonApiProvider.java b/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/provider/MobileButtonApiProvider.java new file mode 100644 index 00000000..b61dce31 --- /dev/null +++ b/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/provider/MobileButtonApiProvider.java @@ -0,0 +1,27 @@ +/* + * Copyright [2022] [https://www.xiaonuo.vip] + * + * Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点： + * + * 1.请不要删除和修改根目录下的LICENSE文件。 + * 2.请不要删除和修改Snowy源码头部的版权声明。 + * 3.本项目代码可免费商业使用，商业使用请保留源码和相关描述文件的项目出处，作者声明等。 + * 4.分发源码时候，请注明软件出处 https://www.xiaonuo.vip + * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。 + * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip + */ +package vip.xiaonuo.mobile.modular.resource.provider; + +import org.springframework.stereotype.Service; +import vip.xiaonuo.mobile.api.MobileButtonApi; + +/** + * 移动端按钮API接口提供者 + * + * @author xuyuxiang + * @date 2023/1/31 10:12 + **/ +@Service +public class MobileButtonApiProvider implements MobileButtonApi { + +} diff --git a/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/service/MobileButtonService.java b/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/service/MobileButtonService.java new file mode 100644 index 00000000..60634ab6 --- /dev/null +++ b/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/service/MobileButtonService.java @@ -0,0 +1,80 @@ +/* + * Copyright [2022] [https://www.xiaonuo.vip] + * + * Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点： + * + * 1.请不要删除和修改根目录下的LICENSE文件。 + * 2.请不要删除和修改Snowy源码头部的版权声明。 + * 3.本项目代码可免费商业使用，商业使用请保留源码和相关描述文件的项目出处，作者声明等。 + * 4.分发源码时候，请注明软件出处 https://www.xiaonuo.vip + * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。 + * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip + */ +package vip.xiaonuo.mobile.modular.resource.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import vip.xiaonuo.mobile.modular.resource.entity.MobileButton; +import vip.xiaonuo.mobile.modular.resource.param.button.MobileButtonAddParam; +import vip.xiaonuo.mobile.modular.resource.param.button.MobileButtonEditParam; +import vip.xiaonuo.mobile.modular.resource.param.button.MobileButtonIdParam; +import vip.xiaonuo.mobile.modular.resource.param.button.MobileButtonPageParam; + +import java.util.List; + +/** + * 移动端按钮Service接口 + * + * @author xuyuxiang + * @date 2022/6/27 14:01 + **/ +public interface MobileButtonService extends IService { + + /** + * 获取移动端按钮分页 + * + * @author xuyuxiang + * @date 2022/4/24 20:08 + */ + Page page(MobileButtonPageParam mobileButtonPageParam); + + /** + * 添加移动端按钮 + * + * @author xuyuxiang + * @date 2022/4/24 20:48 + */ + void add(MobileButtonAddParam mobileButtonAddParam); + + /** + * 编辑移动端按钮 + * + * @author xuyuxiang + * @date 2022/4/24 21:13 + */ + void edit(MobileButtonEditParam mobileButtonEditParam); + + /** + * 删除移动端按钮 + * + * @author xuyuxiang + * @date 2022/4/24 21:18 + */ + void delete(List mobileButtonIdParamList); + + /** + * 获取移动端按钮详情 + * + * @author xuyuxiang + * @date 2022/4/24 21:18 + */ + MobileButton detail(MobileButtonIdParam mobileButtonIdParam); + + /** + * 获取移动端按钮详情 + * + * @author xuyuxiang + * @date 2022/4/24 21:18 + */ + MobileButton queryEntity(String id); +} diff --git a/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/service/impl/MobileButtonServiceImpl.java b/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/service/impl/MobileButtonServiceImpl.java new file mode 100644 index 00000000..e2dfee28 --- /dev/null +++ b/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/service/impl/MobileButtonServiceImpl.java @@ -0,0 +1,135 @@ +/* + * Copyright [2022] [https://www.xiaonuo.vip] + * + * Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点： + * + * 1.请不要删除和修改根目录下的LICENSE文件。 + * 2.请不要删除和修改Snowy源码头部的版权声明。 + * 3.本项目代码可免费商业使用，商业使用请保留源码和相关描述文件的项目出处，作者声明等。 + * 4.分发源码时候，请注明软件出处 https://www.xiaonuo.vip + * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。 + * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip + */ +package vip.xiaonuo.mobile.modular.resource.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollStreamUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; +import vip.xiaonuo.common.enums.CommonSortOrderEnum; +import vip.xiaonuo.common.exception.CommonException; +import vip.xiaonuo.common.page.CommonPageRequest; +import vip.xiaonuo.mobile.modular.resource.entity.MobileButton; +import vip.xiaonuo.mobile.modular.resource.entity.MobileMenu; +import vip.xiaonuo.mobile.modular.resource.enums.MobileResourceCategoryEnum; +import vip.xiaonuo.mobile.modular.resource.mapper.MobileButtonMapper; +import vip.xiaonuo.mobile.modular.resource.param.button.MobileButtonAddParam; +import vip.xiaonuo.mobile.modular.resource.param.button.MobileButtonEditParam; +import vip.xiaonuo.mobile.modular.resource.param.button.MobileButtonIdParam; +import vip.xiaonuo.mobile.modular.resource.param.button.MobileButtonPageParam; +import vip.xiaonuo.mobile.modular.resource.service.MobileButtonService; +import vip.xiaonuo.mobile.modular.resource.service.MobileMenuService; +import vip.xiaonuo.sys.api.SysRelationApi; + +import javax.annotation.Resource; +import java.util.List; +import java.util.stream.Collectors; + +/** + * 移动端按钮Service接口实现类 + * + * @author xuyuxiang + * @date 2022/6/27 14:25 + **/ +@Service +public class MobileButtonServiceImpl extends ServiceImpl implements MobileButtonService { + + @Resource + private SysRelationApi sysRelationApi; + + @Resource + private MobileMenuService mobileMenuService; + + @Override + public Page page(MobileButtonPageParam mobileButtonPageParam) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(MobileButton::getCategory, MobileResourceCategoryEnum.BUTTON.getValue()); + if(ObjectUtil.isNotEmpty(mobileButtonPageParam.getParentId())) { + queryWrapper.lambda().eq(MobileButton::getParentId, mobileButtonPageParam.getParentId()); + } + if(ObjectUtil.isNotEmpty(mobileButtonPageParam.getSearchKey())) { + queryWrapper.lambda().like(MobileButton::getTitle, mobileButtonPageParam.getSearchKey()); + } + if(ObjectUtil.isAllNotEmpty(mobileButtonPageParam.getSortField(), mobileButtonPageParam.getSortOrder())) { + CommonSortOrderEnum.validate(mobileButtonPageParam.getSortOrder()); + queryWrapper.orderBy(true, mobileButtonPageParam.getSortOrder().equals(CommonSortOrderEnum.ASC.getValue()), + StrUtil.toUnderlineCase(mobileButtonPageParam.getSortField())); + } else { + queryWrapper.lambda().orderByAsc(MobileButton::getSortCode); + } + return this.page(CommonPageRequest.defaultPage(), queryWrapper); + } + + @Override + public void add(MobileButtonAddParam mobileButtonAddParam) { + MobileButton mobileButton = BeanUtil.toBean(mobileButtonAddParam, MobileButton.class); + boolean repeatCode = this.count(new LambdaQueryWrapper() + .eq(MobileButton::getCategory, MobileResourceCategoryEnum.BUTTON.getValue()) + .eq(MobileButton::getCode, mobileButton.getCode())) > 0; + if(repeatCode) { + throw new CommonException("存在重复的移动端按钮，编码为：{}", mobileButton.getCode()); + } + mobileButton.setCategory(MobileResourceCategoryEnum.BUTTON.getValue()); + this.save(mobileButton); + } + + @Override + public void edit(MobileButtonEditParam mobileButtonEditParam) { + MobileButton mobileButton = this.queryEntity(mobileButtonEditParam.getId()); + BeanUtil.copyProperties(mobileButtonEditParam, mobileButton); + boolean repeatCode = this.count(new LambdaQueryWrapper() + .eq(MobileButton::getCategory, MobileResourceCategoryEnum.BUTTON.getValue()) + .eq(MobileButton::getCode, mobileButton.getCode()) + .ne(MobileButton::getId, mobileButtonEditParam.getId())) > 0; + if(repeatCode) { + throw new CommonException("存在重复的移动端按钮，编码为：{}", mobileButton.getCode()); + } + this.updateById(mobileButton); + } + + @Override + public void delete(List mobileButtonIdParamList) { + List buttonIdList = CollStreamUtil.toList(mobileButtonIdParamList, MobileButtonIdParam::getId); + if(ObjectUtil.isNotEmpty(buttonIdList)) { + // 获取移动端按钮的父菜单id集合 + List parentMenuIdList = mobileMenuService.list(new LambdaQueryWrapper().in(MobileMenu::getId, buttonIdList) + .eq(MobileMenu::getCategory, MobileResourceCategoryEnum.BUTTON.getValue())).stream().map(MobileMenu::getParentId) + .collect(Collectors.toList()); + if(ObjectUtil.isNotEmpty(parentMenuIdList)) { + // 清除对应的角色与移动端菜单信息中的【授权的移动端按钮信息】 + sysRelationApi.removeRoleHasMobileButtonRelation(parentMenuIdList, buttonIdList); + // 执行删除 + this.removeBatchByIds(buttonIdList); + } + } + } + + @Override + public MobileButton detail(MobileButtonIdParam mobileButtonIdParam) { + return this.queryEntity(mobileButtonIdParam.getId()); + } + + @Override + public MobileButton queryEntity(String id) { + MobileButton mobileButton = this.getById(id); + if(ObjectUtil.isEmpty(mobileButton)) { + throw new CommonException("移动端按钮不存在，id值为：{}", id); + } + return mobileButton; + } +} diff --git a/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/service/impl/MobileMenuServiceImpl.java b/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/service/impl/MobileMenuServiceImpl.java index ed228f74..69d08608 100644 --- a/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/service/impl/MobileMenuServiceImpl.java +++ b/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/service/impl/MobileMenuServiceImpl.java @@ -156,7 +156,7 @@ public class MobileMenuServiceImpl extends ServiceImpl allModuleAndMenuList = this.list(lambdaQueryWrapper); List mobileModuleList = CollectionUtil.newArrayList(); List mobileMenuList = CollectionUtil.newArrayList(); + List mobileButtonList = CollectionUtil.newArrayList(); allModuleAndMenuList.forEach(mobileMenu -> { if (mobileMenu.getCategory().equals(MobileResourceCategoryEnum.MODULE.getValue())) mobileModuleList.add(mobileMenu); if (mobileMenu.getCategory().equals(MobileResourceCategoryEnum.MENU.getValue())) mobileMenuList.add(mobileMenu); + if (mobileMenu.getCategory().equals(MobileResourceCategoryEnum.BUTTON.getValue())) mobileMenuList.add(mobileMenu); }); List leafMenuList = CollectionUtil.newArrayList(); MobileMenu rootMobileMenu = new MobileMenu(); @@ -243,6 +245,9 @@ public class MobileMenuServiceImpl extends ServiceImpl JSONUtil.createObj().set("id", sysMenuItem.getId()).set("title", sysMenuItem.getTitle())) + .collect(Collectors.toList())); leafMenuList.add(mobileRoleGrantResourceMenuResult); } }); diff --git a/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/service/impl/MobileModuleServiceImpl.java b/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/service/impl/MobileModuleServiceImpl.java index a4b51d8e..7731ab71 100644 --- a/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/service/impl/MobileModuleServiceImpl.java +++ b/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/service/impl/MobileModuleServiceImpl.java @@ -115,7 +115,7 @@ public class MobileModuleServiceImpl extends ServiceImpl targetIdList) { + public void removeRoleHasMobileMenuRelation(List targetIdList) { sysRelationService.remove(new LambdaQueryWrapper().in(SysRelation::getTargetId, targetIdList) .eq(SysRelation::getCategory, SysRelationCategoryEnum.SYS_ROLE_HAS_MOBILE_MENU.getValue())); } + + @Override + public void removeRoleHasMobileButtonRelation(List targetIdList, List buttonIdList) { + sysRelationService.list(new LambdaQueryWrapper().in(SysRelation::getTargetId, targetIdList) + .eq(SysRelation::getCategory, SysRelationCategoryEnum.SYS_ROLE_HAS_MOBILE_MENU.getValue()) + .isNotNull(SysRelation::getExtJson)).forEach(mobileRelation -> { + JSONObject extJsonObject = JSONUtil.parseObj(mobileRelation.getExtJson()); + List buttonInfoList = extJsonObject.getBeanList("buttonInfo", String.class); + if (ObjectUtil.isNotEmpty(buttonInfoList)) { + Set intersectionDistinct = CollectionUtil.intersectionDistinct(buttonIdList, buttonInfoList); + if(ObjectUtil.isNotEmpty(intersectionDistinct)) { + Collection disjunction = CollectionUtil.disjunction(buttonInfoList, intersectionDistinct); + extJsonObject.set("buttonInfo", disjunction); + } + } + // 清除对应的角色与移动端菜单信息中的【授权的移动端按钮信息】 + sysRelationService.update(new LambdaUpdateWrapper().eq(SysRelation::getId, mobileRelation.getId()) + .set(SysRelation::getExtJson, JSONUtil.toJsonStr(extJsonObject))); + }); + } } diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/role/param/SysRoleGrantMobileMenuParam.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/role/param/SysRoleGrantMobileMenuParam.java index 6ca05159..56b3b626 100644 --- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/role/param/SysRoleGrantMobileMenuParam.java +++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/role/param/SysRoleGrantMobileMenuParam.java @@ -56,5 +56,10 @@ public class SysRoleGrantMobileMenuParam { @ApiModelProperty(value = "菜单id", position = 1) @NotBlank(message = "menuId不能为空") private String menuId; + + /** 按钮id集合 */ + @ApiModelProperty(value = "按钮id集合", position = 2) + @NotNull(message = "buttonInfo不能为空") + private List buttonInfo; } } diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/role/result/SysRoleGrantMobileMenuTreeResult.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/role/result/SysRoleGrantMobileMenuTreeResult.java index 559ed1fa..d734125a 100644 --- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/role/result/SysRoleGrantMobileMenuTreeResult.java +++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/role/result/SysRoleGrantMobileMenuTreeResult.java @@ -40,19 +40,19 @@ public class SysRoleGrantMobileMenuTreeResult { @ApiModelProperty(value = "模块图标", position = 3) private String icon; - /** 模块下菜单集合*/ - @ApiModelProperty(value = "模块下菜单集合", position = 4) - private List menu; + /** 模块下移动端菜单集合*/ + @ApiModelProperty(value = "模块下移动端菜单集合", position = 4) + private List menu; /** - * 授权菜单类 + * 授权移动端菜单类 * * @author xuyuxiang * @date 2022/8/13 16:54 */ @Getter @Setter - public static class SysRoleGrantResourceMenuResult { + public static class SysRoleGrantMobileMenuResult { /** 菜单id */ @ApiModelProperty(value = "菜单id", position = 1) @@ -73,5 +73,28 @@ public class SysRoleGrantMobileMenuTreeResult { /** 模块 */ @ApiModelProperty(value = "菜单模块", position = 5) private String module; + + /** 菜单下按钮集合 */ + @ApiModelProperty(value = "菜单下按钮集合", position = 6) + private List button; + + /** + * 授权按钮类 + * + * @author xuyuxiang + * @date 2022/8/13 16:54 + */ + @Getter + @Setter + public static class SysRoleGrantMobileButtonResult { + + /** 按钮id */ + @ApiModelProperty(value = "按钮id", position = 1) + private String id; + + /** 标题 */ + @ApiModelProperty(value = "按钮标题", position = 2) + private String title; + } } } diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/role/result/SysRoleOwnMobileMenuResult.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/role/result/SysRoleOwnMobileMenuResult.java index d3e4174d..04186b28 100644 --- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/role/result/SysRoleOwnMobileMenuResult.java +++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/role/result/SysRoleOwnMobileMenuResult.java @@ -49,5 +49,9 @@ public class SysRoleOwnMobileMenuResult { /** 菜单id */ @ApiModelProperty(value = "菜单id", position = 1) private String menuId; + + /** 按钮id集合 */ + @ApiModelProperty(value = "按钮id集合", position = 2) + private List buttonInfo; } } diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/provider/SysLoginUserApiProvider.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/provider/SysLoginUserApiProvider.java index efdf4198..bfd8c3fc 100644 --- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/provider/SysLoginUserApiProvider.java +++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/provider/SysLoginUserApiProvider.java @@ -125,6 +125,17 @@ public class SysLoginUserApiProvider implements SaBaseLoginUserApi { return sysUserService.getButtonCodeList(userId); } + /** + * 根据用户id获取移动端按钮码集合 + * + * @author xuyuxiang + * @date 2022/4/27 22:54 + */ + @Override + public List getMobileButtonCodeListListByUserId(String userId) { + return sysUserService.getMobileButtonCodeListListByUserId(userId); + } + /** * 根据用户id获取权限集合 * diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/SysUserService.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/SysUserService.java index 1cfabe12..1f64c81d 100644 --- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/SysUserService.java +++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/SysUserService.java @@ -284,6 +284,14 @@ public interface SysUserService extends IService { **/ List getButtonCodeList(String userId); + /** + * 获取移动端按钮编码集合 + * + * @author xuyuxiang + * @date 2022/4/29 11:13 + **/ + List getMobileButtonCodeListListByUserId(String userId); + /** * 获取权限集合 * diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java index b7d4d558..e88fd8b1 100644 --- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java +++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java @@ -805,6 +805,25 @@ public class SysUserServiceImpl extends ServiceImpl impl return CollectionUtil.newArrayList(); } + @Override + public List getMobileButtonCodeListListByUserId(String userId) { + List roleIdList = sysRelationService.getRelationTargetIdListByObjectIdAndCategory(userId, + SysRelationCategoryEnum.SYS_USER_HAS_ROLE.getValue()); + if (ObjectUtil.isNotEmpty(roleIdList)) { + List buttonIdList = CollectionUtil.newArrayList(); + sysRelationService.getRelationListByObjectIdListAndCategory(roleIdList, + SysRelationCategoryEnum.SYS_ROLE_HAS_MOBILE_MENU.getValue()).forEach(sysRelation -> { + if (ObjectUtil.isNotEmpty(sysRelation.getExtJson())) { + buttonIdList.addAll(JSONUtil.parseObj(sysRelation.getExtJson()).getBeanList("buttonInfo", String.class)); + } + }); + if (ObjectUtil.isNotEmpty(buttonIdList)) { + return sysButtonService.listByIds(buttonIdList).stream().map(SysButton::getCode).collect(Collectors.toList()); + } + } + return CollectionUtil.newArrayList(); + } + @Override public List getPermissionList(String userId, String orgId) { if (ObjectUtil.isNotEmpty(orgId)) {