补充登录角色

lbq

19 小时以前 5a4419d146e4ac48fd0e3ed89ab64e64cad192d1

 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java

@@ -129,6 +129,8 @@
    private WarehouseRoleMenuService warehouseRoleMenuService;
    @Autowired
    private BasContainerService basContainerService;
    @Resource
    private UserRoleService userRoleService;

    /**
     * @return
@@ -157,6 +159,14 @@
        if (!userService.comparePassword(user.getPassword(), param.getPassword())) {
            return R.parse(CodeRes.USER_10003);
        }

        List<Role> roles = userRoleService.listByUserId(user.getId());
        user.setRoles(roles);
        Long[] roleIds = new Long[roles.size()];
        for(int i = 0; i < roles.size(); i++) {
            roleIds[i] = roles.get(i).getId();
        }
        user.setRoleIds(roleIds);

        String accessToken = JwtUtil.buildToken(new JwtSubject(param.getUsername(), user.getTenantId()),
                configProperties.getTokenExpireTime(), configProperties.getTokenKey());
@@ -1026,7 +1036,47 @@
                        .map(WarehouseRoleMenu::getMenuId)
                        .collect(Collectors.toSet());
                // 获取 areaList 并转换为 Long 类型的 Set
                List<Integer> areaList = container.getAreas();
                List<Integer> areaList = container.getAreasIds();
                Set<Long> areaSet = new HashSet<>();
                if (areaList != null) {
                    areaList.forEach(area -> areaSet.add(area.longValue()));
                }
                // 求两个集合的交集
                menuIdSet.retainAll(areaSet);

                List<WarehouseAreas> areas = warehouseAreasService.list(new LambdaQueryWrapper<WarehouseAreas>()
                        .in(WarehouseAreas::getId, menuIdSet));
                return R.ok(areas);

            }
        }
        return R.ok(new ArrayList<>());
    }

    /**
     * @param
     * @param user
     * @return
     * @author Ryan
     * @description 通过容器获取组拖物料
     * @time 2025/4/9 16:57
     */
    @Override
    public R getItemByContainerArea(Map<String, Object> params, User user) {
        List<BasContainer> containers = basContainerService.list();
        for (BasContainer container : containers) {
            String codeType = container.getCodeType(); // 获取正则表达式
            if (params.get("barcode").toString().matches(codeType)) { // 判断条码是否符合这个正则
                List<WarehouseRoleMenu> warehouseRoleMenus = warehouseRoleMenuService
                        .list(new LambdaQueryWrapper<WarehouseRoleMenu>()
                                .in(WarehouseRoleMenu::getRoleId, Arrays.asList(user.getUserRoleIds())));
                Set<WarehouseRoleMenu> warehouseRoleMenusSet = new HashSet<>(warehouseRoleMenus);
                // 获取 menuId 集合
                Set<Long> menuIdSet = warehouseRoleMenusSet.stream()
                        .map(WarehouseRoleMenu::getMenuId)
                        .collect(Collectors.toSet());
                // 获取 areaList 并转换为 Long 类型的 Set
                List<Integer> areaList = container.getAreasIds();
                Set<Long> areaSet = new HashSet<>();
                if (areaList != null) {
                    areaList.forEach(area -> areaSet.add(area.longValue()));