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 index 0573163e..5dfa2ecf 100644 --- 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 @@ -12,6 +12,8 @@ */ package vip.xiaonuo.mobile.api; +import java.util.List; + /** * 移动端按钮API * @@ -20,4 +22,12 @@ package vip.xiaonuo.mobile.api; **/ public interface MobileButtonApi { + /** + * 根据键获取值 + * + * @param idList + * @author 每天一点 + * @date 2023/2/5 13:26 + **/ + List listByIds(List idList); } 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 index b61dce31..4477af57 100644 --- 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 @@ -12,8 +12,15 @@ */ package vip.xiaonuo.mobile.modular.resource.provider; +import cn.hutool.core.util.ObjectUtil; import org.springframework.stereotype.Service; import vip.xiaonuo.mobile.api.MobileButtonApi; +import vip.xiaonuo.mobile.modular.resource.entity.MobileButton; +import vip.xiaonuo.mobile.modular.resource.service.MobileButtonService; + +import javax.annotation.Resource; +import java.util.List; +import java.util.stream.Collectors; /** * 移动端按钮API接口提供者 @@ -24,4 +31,14 @@ import vip.xiaonuo.mobile.api.MobileButtonApi; @Service public class MobileButtonApiProvider implements MobileButtonApi { + @Resource + private MobileButtonService mobileButtonService; + + @Override + public List listByIds(List buttonIdList) { + if (ObjectUtil.isEmpty(buttonIdList)) { + return null; + } + return mobileButtonService.listByIds(buttonIdList).stream().map(MobileButton::getCode).collect(Collectors.toList()); + } } 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 8a5685ab..459b3439 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 @@ -24,6 +24,7 @@ import cn.hutool.core.convert.Convert; import cn.hutool.core.date.DateTime; import cn.hutool.core.img.ImgUtil; import cn.hutool.core.io.FileUtil; +import cn.hutool.core.lang.Console; import cn.hutool.core.lang.tree.Tree; import cn.hutool.core.lang.tree.TreeNode; import cn.hutool.core.lang.tree.TreeNodeConfig; @@ -56,6 +57,7 @@ import vip.xiaonuo.dev.api.DevConfigApi; import vip.xiaonuo.dev.api.DevEmailApi; import vip.xiaonuo.dev.api.DevMessageApi; import vip.xiaonuo.dev.api.DevSmsApi; +import vip.xiaonuo.mobile.api.MobileButtonApi; import vip.xiaonuo.mobile.api.MobileMenuApi; import vip.xiaonuo.sys.core.enums.SysBuildInEnum; import vip.xiaonuo.sys.modular.org.entity.SysOrg; @@ -146,6 +148,9 @@ public class SysUserServiceImpl extends ServiceImpl impl @Resource private SysRelationService sysRelationService; + @Resource + private MobileButtonApi mobileButtonApi; + @Override public SysLoginUser getUserById(String id) { SysUser sysUser = this.getById(id); @@ -817,9 +822,7 @@ public class SysUserServiceImpl extends ServiceImpl impl 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 mobileButtonApi.listByIds(buttonIdList); } return CollectionUtil.newArrayList(); }