diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysRoleService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysRoleService.java index b8bdedd..aed67fa 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysRoleService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysRoleService.java @@ -106,4 +106,6 @@ public interface ISysRoleService extends ICrudService { */ @ApiOperation(value = "新增角色菜单权限变更日志") SysLogRoleMenuChange insertSysLogRoleMenuChange(SysLogRoleMenuChange sysLogRoleMenuChange); + + List setLanguageSysMenuName(String languageCode, List menuList); } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoController.java index 3554460..f26fb1c 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoController.java @@ -1,20 +1,27 @@ package cn.estsh.i3plus.core.apiservice.controller; +import cn.estsh.i3plus.core.api.iservice.busi.IPersonnelService; import cn.estsh.i3plus.core.api.iservice.busi.ISysPojoVersionPlanService; +import cn.estsh.i3plus.platform.common.tool.StringTool; import cn.estsh.i3plus.platform.common.util.CommonConstWords; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; +import cn.estsh.i3plus.pojo.platform.bean.SysPojoVersion; +import cn.estsh.i3plus.pojo.platform.bean.SysUser; import cn.estsh.i3plus.pojo.platform.repository.SysLogUserLoginRepository; import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.util.ImppRedis; import cn.estsh.impp.framework.boot.util.ResultBean; +import com.alibaba.fastjson.JSON; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -42,6 +49,8 @@ public class DemoController extends CoreBaseController { @Autowired private ISysPojoVersionPlanService pojoVersionPlanService; + @Autowired + private IPersonnelService personnelService; @GetMapping(value = "/redis/update") @ApiOperation(value = "添加操作日志", notes = "添加操作日志,可用于国际化") @@ -70,6 +79,18 @@ public class DemoController extends CoreBaseController { return ImppExceptionBuilder.newInstance().buildExceptionResult(e); } } + @PostMapping(value = "lacjob/rabbit") + @ApiOperation(value = "空载具单据生成") + public void rabbit() { + + try { + + // checkUserModel(model); + personnelService.refreshRefSysUserRole(1564859495220891648l, new Long[]{200001l}); + } catch (Exception e) { + e.printStackTrace(); + } + } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysRoleController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysRoleController.java index 64bdae8..c308910 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysRoleController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysRoleController.java @@ -514,6 +514,9 @@ public class SysRoleController extends CrudBaseController { List sysRefRoleMenuList = sysRoleService.findSysRefRoleMenuByRoleId(roleId, softType); + sysRefRoleMenuList = sysRoleService.setLanguageSysMenuName(AuthUtil.getSessionUser().getLanguageCode(), sysRefRoleMenuList); + + return ResultBean.success("操作成功") .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) .setResultList(sysRefRoleMenuList); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuService.java index e73aa55..13dd6b9 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuService.java @@ -45,7 +45,7 @@ public class SysMenuService extends CrudService implements ISysMenuServ /** * 功能权限国际化 */ - private final static Map> MEM_CACHE_LANGAGE = new HashMap<>(); + public final static Map> MEM_CACHE_LANGAGE = new HashMap<>(); @Autowired private SysMenuRepository sysMenuRDao; diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysRoleService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysRoleService.java index 05048c0..4a278c4 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysRoleService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysRoleService.java @@ -6,6 +6,7 @@ import cn.estsh.i3plus.core.api.iservice.busi.ISysRoleService; import cn.estsh.i3plus.core.apiservice.dao.IUserPermissionDao; import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; +import cn.estsh.i3plus.platform.common.tool.SerializeTool; import cn.estsh.i3plus.platform.common.util.CommonConstWords; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.bean.ListPager; @@ -39,7 +40,9 @@ import org.springframework.util.ObjectUtils; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import java.util.Map; +import static cn.estsh.i3plus.platform.common.util.CommonConstWords.RESOURCE_PREFIX_MENU; import static cn.estsh.i3plus.platform.common.util.PlatformConstWords.IMPP_REQUEST_ID; import static cn.estsh.i3plus.platform.common.util.PlatformConstWords.SQL_SERVER_PARAM_MAX_MUM; @@ -464,7 +467,27 @@ public class SysRoleService extends CrudService implements ISysRoleServ LOGGER.debug("平台角色菜单权限变更操作记录 SysLogRoleOperate sysLogRoleOperate:{}", sysLogRoleMenuChange); return sysLogRoleMenuChangeRDao.insert(sysLogRoleMenuChange); } + @Override + public List setLanguageSysMenuName(String languageCode, List menuList) { + languageCode = StringUtils.isNotBlank(languageCode) ? languageCode : CommonConstWords.DEFAULT_LANGUAGE; + Map localeResourceMap = SysMenuService.MEM_CACHE_LANGAGE.get(languageCode); + + if (menuList != null && localeResourceMap != null) { + List resultList = (List) SerializeTool.copyObject(menuList); + + for (SysRefRoleMenu menu : resultList) { + if (menu != null) { + if (StringUtils.isNotBlank(menu.getMenuNameRdd())) { + String menuName = localeResourceMap.get(RESOURCE_PREFIX_MENU + menu.getMenuNameRdd()); + menu.setMenuNameRdd(StringUtils.isNotBlank(menuName) ? menuName : menu.getMenuNameRdd()); + } + } + } + return resultList; + } + return menuList; + } // @Override // public void packAfterRefreshCache() {