【fix sonar】NgAlainServiceImpl.java 文件
This commit is contained in:
+13
-11
@@ -21,6 +21,7 @@ public class NgAlainServiceImpl implements NgAlainService {
|
||||
private ISysPermissionService sysPermissionService;
|
||||
@Autowired
|
||||
private SysDictMapper mapper;
|
||||
private static String CHILDREN ="children";
|
||||
@Override
|
||||
public JSONArray getMenu(String id) throws Exception {
|
||||
return getJeroMenu(id);
|
||||
@@ -34,7 +35,7 @@ public class NgAlainServiceImpl implements NgAlainService {
|
||||
JSONObject menu = new JSONObject();
|
||||
menu.put("text", "jero菜单");
|
||||
menu.put("group",true);
|
||||
menu.put("children", menulist);
|
||||
menu.put(CHILDREN, menulist);
|
||||
JSONArray jeroMenuList=new JSONArray();
|
||||
jeroMenuList.add(menu);
|
||||
return jeroMenuList;
|
||||
@@ -54,9 +55,9 @@ public class NgAlainServiceImpl implements NgAlainService {
|
||||
JSONObject menu=new JSONObject();
|
||||
menu.put("text",meta.get("title"));
|
||||
menu.put("reuse",true);
|
||||
if (jsonObject.get("children")!=null){
|
||||
JSONArray child= parseNgAlain((JSONArray) jsonObject.get("children"));
|
||||
menu.put("children",child);
|
||||
if (jsonObject.get(CHILDREN)!=null){
|
||||
JSONArray child= parseNgAlain((JSONArray) jsonObject.get(CHILDREN));
|
||||
menu.put(CHILDREN,child);
|
||||
JSONObject icon=new JSONObject();
|
||||
icon.put("type", "icon");
|
||||
icon.put("value", meta.get("icon"));
|
||||
@@ -88,23 +89,24 @@ public class NgAlainServiceImpl implements NgAlainService {
|
||||
getPermissionJsonArray(jsonArray, metaList, json);
|
||||
}
|
||||
}else if(parentJson!=null && oConvertUtils.isNotEmpty(tempPid) && tempPid.equals(parentJson.getString("id"))){
|
||||
String PERMISSIONLIST = "permissionList";
|
||||
if(permission.getMenuType()==0) {
|
||||
JSONObject metaJson = parentJson.getJSONObject("meta");
|
||||
if(metaJson.containsKey("permissionList")) {
|
||||
metaJson.getJSONArray("permissionList").add(json);
|
||||
if(metaJson.containsKey(PERMISSIONLIST)) {
|
||||
metaJson.getJSONArray(PERMISSIONLIST).add(json);
|
||||
}else {
|
||||
JSONArray permissionList = new JSONArray();
|
||||
permissionList.add(json);
|
||||
metaJson.put("permissionList", permissionList);
|
||||
metaJson.put(PERMISSIONLIST, permissionList);
|
||||
}
|
||||
|
||||
}else if(permission.getMenuType()==1) {
|
||||
if(parentJson.containsKey("children")) {
|
||||
parentJson.getJSONArray("children").add(json);
|
||||
if(parentJson.containsKey(CHILDREN)) {
|
||||
parentJson.getJSONArray(CHILDREN).add(json);
|
||||
}else {
|
||||
JSONArray children = new JSONArray();
|
||||
children.add(json);
|
||||
parentJson.put("children", children);
|
||||
parentJson.put(CHILDREN, children);
|
||||
}
|
||||
|
||||
if(!permission.isLeaf()) {
|
||||
@@ -126,7 +128,7 @@ public class NgAlainServiceImpl implements NgAlainService {
|
||||
json.put("id", permission.getId());
|
||||
if(permission.getUrl()!=null&&(permission.getUrl().startsWith("http://")||permission.getUrl().startsWith("https://"))) {
|
||||
String url= new String(Base64.getUrlEncoder().encode(permission.getUrl().getBytes()));
|
||||
json.put("path", "/sys/link/" +url.replaceAll("=",""));
|
||||
json.put("path", "/sys/link/" +url.replace("=",""));
|
||||
}else {
|
||||
json.put("path", permission.getUrl());
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user