From e711c834aec2293c53b07efe53e81e3573c289b6 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期三, 01 四月 2026 11:42:44 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java | 34 ++++++++++++++++++++++++----------
1 files changed, 24 insertions(+), 10 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 99f0a4d..9f14c2d 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
@@ -21,6 +21,7 @@
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.mapper.*;
import com.vincent.rsf.server.manager.service.*;
+import com.vincent.rsf.server.manager.service.impl.BasStationServiceImpl;
import com.vincent.rsf.server.system.constant.CodeRes;
import com.vincent.rsf.server.system.constant.GlobalConfigCode;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
@@ -38,8 +39,8 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletRequest;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -129,6 +130,9 @@
private WarehouseRoleMenuService warehouseRoleMenuService;
@Autowired
private BasContainerService basContainerService;
+ @Resource
+ private UserRoleService userRoleService;
+ private BasStationServiceImpl basStationService;
/**
* @return
@@ -157,6 +161,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 +1038,7 @@
.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()));
@@ -1066,7 +1078,7 @@
.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()));
@@ -1170,11 +1182,12 @@
*/
@Override
public R getDeviceSites() {
- List<DeviceSite> sites = deviceSiteMapper.selectList(new LambdaQueryWrapper<DeviceSite>()
- .select(DeviceSite::getId, DeviceSite::getSite, DeviceSite::getName)
- .eq(DeviceSite::getStatus, 1)
- .groupBy(DeviceSite::getSite, DeviceSite::getId, DeviceSite::getName));
- return R.ok(sites);
+// List<DeviceSite> sites = deviceSiteMapper.selectList(new LambdaQueryWrapper<DeviceSite>()
+// .select(DeviceSite::getId, DeviceSite::getSite, DeviceSite::getName)
+// .eq(DeviceSite::getStatus, 1)
+// .groupBy(DeviceSite::getSite, DeviceSite::getId, DeviceSite::getName));
+ List<BasStation> basStationList = basStationService.list(new LambdaQueryWrapper<BasStation>().eq(BasStation::getStatus, 1));
+ return R.ok(basStationList);
}
/**
@@ -1204,7 +1217,7 @@
}
GenerateTaskParams taskParams = new GenerateTaskParams();
taskParams.setWaitPakins(waitPakins)
- .setSiteId(Long.parseLong(map.get("site").toString()))
+ .setSiteNo(map.get("siteNo").toString())
.setLocCode(map.get("locCode").toString());
return R.ok(taskService.generateTasks(taskParams, loginUserId));
@@ -1279,3 +1292,4 @@
}
}
+
--
Gitblit v1.9.1