purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化登录接口中按钮权限的格式，将id换为url

Browse Source
This commit is contained in:
季圣华
2022-01-09 20:27:17 +08:00
parent b7ef95ab0c
commit e36d2c5ded
1 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
jshERP-boot/src/main/java/com/jsh/erp/service/user/UserService.java
View File

@@ -1,6 +1,7 @@
package com.jsh.erp.service.user; package com.jsh.erp.service.user;
import com.jsh.erp.datasource.entities.*; import com.jsh.erp.datasource.entities.*;
import com.jsh.erp.service.functions.FunctionService;
import com.jsh.erp.service.redis.RedisService; import com.jsh.erp.service.redis.RedisService;
import com.jsh.erp.service.role.RoleService; import com.jsh.erp.service.role.RoleService;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
@@ -31,10 +32,7 @@ import org.springframework.web.context.request.ServletRequestAttributes;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
import java.util.ArrayList; import java.util.*;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@Service @Service
public class UserService { public class UserService {
@@ -63,6 +61,8 @@ public class UserService {
@Resource @Resource
private RoleService roleService; private RoleService roleService;
@Resource @Resource
private FunctionService functionService;
@Resource
private RedisService redisService; private RedisService redisService;
public User getUser(long id)throws Exception { public User getUser(long id)throws Exception {
@@ -797,7 +797,24 @@ public class UserService {
} }
} }
} }
return btnStrArr; //将数组中的funId转为url
JSONArray btnStrWithUrlArr = new JSONArray();
if(btnStrArr.size()>0) {
List<Function> functionList = functionService.getFunction();
Map<Long, String> functionMap = new HashMap<>();
for (Function function: functionList) {
functionMap.put(function.getId(), function.getUrl());
}
for (Object obj : btnStrArr) {
JSONObject btnStrObj = JSONObject.parseObject(obj.toString());
Long funId = btnStrObj.getLong("funId");
JSONObject btnStrWithUrlObj = new JSONObject();
btnStrWithUrlObj.put("url", functionMap.get(funId));
btnStrWithUrlObj.put("btnStr", btnStrObj.getString("btnStr"));
btnStrWithUrlArr.add(btnStrWithUrlObj);
}
}
return btnStrWithUrlArr;
} }
@Transactional(value = "transactionManager", rollbackFor = Exception.class) @Transactional(value = "transactionManager", rollbackFor = Exception.class)