admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug修改

Browse Source
This commit is contained in:
GUO 2024-06-06 21:15:22 +08:00
parent 4eb0efd056
commit f70c020d52
3 changed files with 67 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/BaseMenuController.java
View File

@ -14,10 +14,7 @@ import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.MapUtils; import org.apache.commons.collections.MapUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -161,4 +158,11 @@ public class BaseMenuController {
public Result<Map<String,Object>> getDefaultProjectMenu() { public Result<Map<String,Object>> getDefaultProjectMenu() {
return Result.success(baseMenuService.getDefaultProjectMenu()); return Result.success(baseMenuService.getDefaultProjectMenu());
}*/ }*/
@ApiOperation(value = "解决项目子账号的菜单按钮无法分配", notes = "解决项目子账号的菜单按钮无法分配", httpMethod="GET")
@GetMapping(value = "/fixAuthDistribute")
public Result fixAuthDistribute() {
baseMenuService.fixAuthDistribute();
return Result.ok();
}
} }

3
src/main/java/com/zhgd/xmgl/modules/basicdata/service/IBaseMenuService.java
View File

@ -50,4 +50,7 @@ public interface IBaseMenuService extends IService<BaseMenu> {
List<EntityMap> getSupplierMenuList(Map<String, Object> param); List<EntityMap> getSupplierMenuList(Map<String, Object> param);
List<EntityMap> getSupplierActionList(Map<String, Object> param); List<EntityMap> getSupplierActionList(Map<String, Object> param);
void fixAuthDistribute();
} }

94
src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseMenuServiceImpl.java
View File

@ -2,8 +2,10 @@ package com.zhgd.xmgl.modules.basicdata.service.impl;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zhgd.jeecg.common.execption.OpenAlertException; import com.zhgd.jeecg.common.execption.OpenAlertException;
import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.jeecg.common.mybatis.EntityMap;
import com.zhgd.xmgl.modules.basicdata.entity.BaseAction;
import com.zhgd.xmgl.modules.basicdata.entity.BaseMenu; import com.zhgd.xmgl.modules.basicdata.entity.BaseMenu;
import com.zhgd.xmgl.modules.basicdata.entity.BaseModule; import com.zhgd.xmgl.modules.basicdata.entity.BaseModule;
import com.zhgd.xmgl.modules.basicdata.entity.CompanyConfig; import com.zhgd.xmgl.modules.basicdata.entity.CompanyConfig;
@ -19,21 +21,24 @@ import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.util.*; import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/** /**
* @Description: 系统菜单 * @Description: 系统菜单
* @author： pds * @author： pds
* @date： 2020-10-12 * @date： 2020-10-12
* @version： V1.0 * @version： V1.0
*/ */
@Service @Service
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public class BaseMenuServiceImpl extends ServiceImpl<BaseMenuMapper, BaseMenu> implements IBaseMenuService { public class BaseMenuServiceImpl extends ServiceImpl<BaseMenuMapper, BaseMenu> implements IBaseMenuService {
@Autowired
BaseActionServiceImpl baseActionService;
@Autowired @Autowired
private BaseMenuMapper baseMenuMapper; private BaseMenuMapper baseMenuMapper;
@Autowired @Autowired
@ -67,6 +72,19 @@ public class BaseMenuServiceImpl extends ServiceImpl<BaseMenuMapper, BaseMenu> i
return baseMenuMapper.getSupplierActionList(param); return baseMenuMapper.getSupplierActionList(param);
} }
@Override
public void fixAuthDistribute() {
List<BaseMenu> baseMenus = baseMenuMapper.selectList(null);
for (BaseMenu baseMenu : baseMenus) {
editBaseMenu(baseMenu);
}
List<BaseAction> baseActions = baseActionMapper.selectList(null);
for (BaseAction baseAction : baseActions) {
baseActionService.editBaseAction(baseAction);
}
}
@Override @Override
public Map<String, Object> getProjectModuleAndMenu(Map<String, Object> map) { public Map<String, Object> getProjectModuleAndMenu(Map<String, Object> map) {
map.put("styleType", getStyleType(MapUtils.getString(map, "projectSn"))); map.put("styleType", getStyleType(MapUtils.getString(map, "projectSn")));
@ -125,18 +143,18 @@ public class BaseMenuServiceImpl extends ServiceImpl<BaseMenuMapper, BaseMenu> i
} }
@Override @Override
public List<EntityMap> groupMenu(List<EntityMap> list,List<EntityMap> actionList){ public List<EntityMap> groupMenu(List<EntityMap> list, List<EntityMap> actionList) {
List<EntityMap> tempList=new ArrayList<>(); List<EntityMap> tempList = new ArrayList<>();
List<EntityMap> childList=new ArrayList<>(); List<EntityMap> childList = new ArrayList<>();
if(list!=null&&list.size()>0){ if (list != null && list.size() > 0) {
for (EntityMap menu:list){ for (EntityMap menu : list) {
if("0".equals(MapUtils.getString(menu,"parentId"))){ if ("0".equals(MapUtils.getString(menu, "parentId"))) {
tempList.add(menu); tempList.add(menu);
}else{ } else {
childList.add(menu); childList.add(menu);
} }
} }
tempList=groupList(tempList,childList,actionList); tempList = groupList(tempList, childList, actionList);
} }
return tempList; return tempList;
} }
@ -184,12 +202,12 @@ public class BaseMenuServiceImpl extends ServiceImpl<BaseMenuMapper, BaseMenu> i
} }
private List<BaseModule> groupModuleMenu(List<BaseModule> moduleList,List<EntityMap> menuList){ private List<BaseModule> groupModuleMenu(List<BaseModule> moduleList, List<EntityMap> menuList) {
if(menuList!=null&&menuList.size()>0){ if (menuList != null && menuList.size() > 0) {
for (BaseModule module:moduleList){ for (BaseModule module : moduleList) {
List<EntityMap> tempList=new ArrayList<>(); List<EntityMap> tempList = new ArrayList<>();
for (EntityMap menu:menuList){ for (EntityMap menu : menuList) {
if(MapUtils.getString(menu,"moduleId").equals(String.valueOf(module.getModuleId()))){ if (MapUtils.getString(menu, "moduleId").equals(String.valueOf(module.getModuleId()))) {
tempList.add(menu); tempList.add(menu);
} }
} }
@ -199,40 +217,40 @@ public class BaseMenuServiceImpl extends ServiceImpl<BaseMenuMapper, BaseMenu> i
return moduleList; return moduleList;
} }
private List<EntityMap> groupList(List<EntityMap> list, List<EntityMap> childList,List<EntityMap> actionList){ private List<EntityMap> groupList(List<EntityMap> list, List<EntityMap> childList, List<EntityMap> actionList) {
for(EntityMap menu:list){ for (EntityMap menu : list) {
List<EntityMap> tempList=new ArrayList<>(); List<EntityMap> tempList = new ArrayList<>();
List<EntityMap> List2=new ArrayList<>(); List<EntityMap> List2 = new ArrayList<>();
for(EntityMap childMenu:childList){ for (EntityMap childMenu : childList) {
if(MapUtils.getString(menu,"menuId").equals(MapUtils.getString(childMenu,"parentId"))){ if (MapUtils.getString(menu, "menuId").equals(MapUtils.getString(childMenu, "parentId"))) {
tempList.add(childMenu); tempList.add(childMenu);
}else{ } else {
List2.add(childMenu); List2.add(childMenu);
} }
} }
if(List2.size()>0) { if (List2.size() > 0) {
tempList = groupList(tempList, List2,actionList); tempList = groupList(tempList, List2, actionList);
} }
if(tempList.size()>0){ if (tempList.size() > 0) {
menu.put("menu_list",tempList); menu.put("menu_list", tempList);
}else{ } else {
List<EntityMap> tempActionList=new ArrayList<>(); List<EntityMap> tempActionList = new ArrayList<>();
for(EntityMap actionMenu:actionList){ for (EntityMap actionMenu : actionList) {
if(MapUtils.getString(menu,"menuId").equals(MapUtils.getString(actionMenu,"menuId"))){ if (MapUtils.getString(menu, "menuId").equals(MapUtils.getString(actionMenu, "menuId"))) {
tempActionList.add(actionMenu); tempActionList.add(actionMenu);
} }
} }
menu.put("menu_list",tempActionList); menu.put("menu_list", tempActionList);
} }
} }
return list; return list;
} }
private Integer getStyleType(String projectSn){ private Integer getStyleType(String projectSn) {
CompanyConfig companyConfig=companyConfigMapper.selectConfigByProject(projectSn); CompanyConfig companyConfig = companyConfigMapper.selectConfigByProject(projectSn);
if(companyConfig!=null&&companyConfig.getStyleType()!=null){ if (companyConfig != null && companyConfig.getStyleType() != null) {
return companyConfig.getStyleType(); return companyConfig.getStyleType();
}else{ } else {
return 1; return 1;
} }
} }