From 5a4419d146e4ac48fd0e3ed89ab64e64cad192d1 Mon Sep 17 00:00:00 2001
From: lbq <1065079612@qq.com>
Date: 星期二, 10 二月 2026 10:54:59 +0800
Subject: [PATCH] 补充登录角色
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 51 insertions(+), 1 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
index bdaf340..4fc2165 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
+++ b/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()));
--
Gitblit v1.9.1